path: root/demux/demux.c
diff options
authorwm4 <wm4@nowhere>2014-08-27 22:51:06 +0200
committerwm4 <wm4@nowhere>2014-08-27 23:12:49 +0200
commitcb642e7c846be2540ec5c88c854682fc26d787f8 (patch)
tree2797a0d634b49c063f87eaa3e07c4dc85bf4fe53 /demux/demux.c
parent7bb1afb8eaa7482b43f9ac31b1b93b1bb55789e3 (diff)
player: slightly better cache underrun detection
Use the "native" underrun detection, instead of guessing by a low cache duration. The new underrun detection (which was added with the original commit) might have the problem that it's easy for the playloop to miss the underrun event. The underrun is actually not stored as state, so if the demuxer thread adds a new packet before the playloop happens to see the state, it's as if it never happened. On the other hand, this means that network was fast enough, so it should be just fine. Also, should it happen that we don't know the cached range (the ts_duration < 0 case), just wait until the demuxer goes idle (i.e. read_packet() decides to stop). This pretty much should affect broken or unusual files only, and there might be various things that could go wrong. But it's more robust in the normal case: this situation also happens when no packets have been read yet, and we don't want to consider this as reason to resume playback.
Diffstat (limited to 'demux/demux.c')
1 files changed, 1 insertions, 0 deletions
diff --git a/demux/demux.c b/demux/demux.c
index 8ddfd3f89c..6b4f25be51 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -1187,6 +1187,7 @@ static int cached_demux_control(struct demux_internal *in, int cmd, void *arg)
r->idle = (in->idle && !r->underrun) || r->eof;
+ r->underrun &= !r->idle;
if (r->ts_range[0] != MP_NOPTS_VALUE && r->ts_range[1] != MP_NOPTS_VALUE)
r->ts_duration = r->ts_range[1] - r->ts_range[0];