summaryrefslogtreecommitdiffstats
path: root/demux/stheader.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-10-20 22:30:59 +0200
committerwm4 <wm4@nowhere>2017-10-20 22:30:59 +0200
commit044af63d98b926fc6d4dd32068476707fd0bce88 (patch)
treeb14b5542cfffb3bce1e1a2ecce31b3ca6eb98d29 /demux/stheader.h
parentf57ff798670af4cbb1d8fc357b40adeaf90f9696 (diff)
downloadmpv-044af63d98b926fc6d4dd32068476707fd0bce88.tar.bz2
mpv-044af63d98b926fc6d4dd32068476707fd0bce88.tar.xz
demux: improvements to previous commits
More the ignore_eof field to the internal demux_stream struct. This is relatively messy, because the internal struct exists only once the stream is created, and after that setting the ignore_eof flag is a race condition. We could bother with adding demux_add_sh_stream() parameters for this, but let's not. So in theory a tiny race condition is introduced, which can never be triggered since all demux API functions are called by the playback thread only anyway. Fix that ts_offset is accessed without log (this was introduced much earlier by myself). Introduce an alternative way of avoiding the annoying EOF reached messages by not resetting the EOF flags for CC streams when a CC packet is added. This makes the second commit in the PR which added the original fix unnecessary. As another cosmetic change merge the check in cached_demux_control() into a single if(). In the future, the CC pseudo-stream should probably be replaced with an entire pseudo-demuxer or such, which would avoid some of the messiness (or maybe not, we don't know yet).
Diffstat (limited to 'demux/stheader.h')
-rw-r--r--demux/stheader.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/demux/stheader.h b/demux/stheader.h
index 319f56109b..a0820f55b7 100644
--- a/demux/stheader.h
+++ b/demux/stheader.h
@@ -56,7 +56,6 @@ struct sh_stream {
// Internal to demux.c
struct demux_stream *ds;
- bool ignore_eof; // ignore stream in underrun detection
};
struct mp_codec_params {