revamp stream handling in demuxers