RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-05 22:52:18 +00:00
Code Issues Releases Wiki Activity

demux: report 0s readahead time as fallback in some situations

Browse Source 
If no packets are queued, the readahead time is obviously 0.

If the end time is smaller than the start time, the problem is probably
that audio and video start at slightly different times - report 0 in
this case too.

Do this because seeing "???" as readahead time is a bit annoying.
This commit is contained in:
wm4 2014-11-05 03:03:27 +01:00
parent a7686e86ff
commit a821e72b81
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demux/demux.c
View File

@ -1218,6 +1218,7 @@ static int cached_demux_control(struct demux_internal *in, int cmd, void *arg)
.ts_range = {MP_NOPTS_VALUE, MP_NOPTS_VALUE}, .ts_range = {MP_NOPTS_VALUE, MP_NOPTS_VALUE},
.ts_duration = -1, .ts_duration = -1,
}; };
int num_packets = 0;
for (int n = 0; n < in->d_user->num_streams; n++) { for (int n = 0; n < in->d_user->num_streams; n++) {
struct demux_stream *ds = in->d_user->streams[n]->ds; struct demux_stream *ds = in->d_user->streams[n]->ds;
if (ds->active) { if (ds->active) {
@ -1226,12 +1227,15 @@ static int cached_demux_control(struct demux_internal *in, int cmd, void *arg)
r->ts_range[0] = MP_PTS_MAX(r->ts_range[0], ds->base_ts); r->ts_range[0] = MP_PTS_MAX(r->ts_range[0], ds->base_ts);
r->ts_range[1] = MP_PTS_MIN(r->ts_range[1], ds->last_ts); r->ts_range[1] = MP_PTS_MIN(r->ts_range[1], ds->last_ts);
} }
num_packets += ds->packs;
} }
} }
r->idle = (in->idle && !r->underrun) || r->eof; r->idle = (in->idle && !r->underrun) || r->eof;
r->underrun &= !r->idle; r->underrun &= !r->idle;
if (r->ts_range[0] != MP_NOPTS_VALUE && r->ts_range[1] != MP_NOPTS_VALUE) 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]; r->ts_duration = MPMAX(0, r->ts_range[1] - r->ts_range[0]);
if (!num_packets || in->seeking)
r->ts_duration = 0;
return DEMUXER_CTRL_OK; return DEMUXER_CTRL_OK;
} }
} }