RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

demux: avoid seeking video streams for refresh seek 

940854c86f added this logic, but when the
demuxer contains a selected video stream, it causes a seek for the video
stream. This is unnecessary since the problems that commit fixed are only
relevant for external audio streams. For a demuxer with a video stream
selected, the synchronization is done by the demuxer implementation.
Add a check to prevent this.
This commit is contained in:
nanahi 2024-06-27 21:15:07 -04:00 committed by Dudemanguy
parent c461ea6cd1
commit 33e414fa5d
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
demux/demux.c
View File

@ -3973,6 +3973,17 @@ static void refresh_track(struct demux_internal *in, struct sh_stream *stream,
if (in->back_demuxing) if (in->back_demuxing)
ds->back_seek_pos = ref_pts; ds->back_seek_pos = ref_pts;
// Avoid refresh seek for video streams except when immediately after a seek
// to ensure a correct seek position.
bool avoid_refresh = false;
for (int n = 0; n < in->num_streams; n++) {
struct demux_stream *ds_n = in->streams[n]->ds;
if (ds_n->type == STREAM_VIDEO && ds_n->selected) {
avoid_refresh = true;
break;
}
}
avoid_refresh = avoid_refresh && !(in->after_seek && !in->after_seek_to_start);
// Allow refresh seek for non-video streams, even if no packets have // Allow refresh seek for non-video streams, even if no packets have
// ever been read yet or after seeking. This is necessary because: // ever been read yet or after seeking. This is necessary because:
// - A-V sync targets may come from different demuxers, so enabling an external // - A-V sync targets may come from different demuxers, so enabling an external
@ -3980,7 +3991,7 @@ static void refresh_track(struct demux_internal *in, struct sh_stream *stream,
// - If cache is enabled and a seek causes some new data to be cached, the demuxer // - If cache is enabled and a seek causes some new data to be cached, the demuxer
// is sought to the end of cache after cache joining. Switching track immediately // is sought to the end of cache after cache joining. Switching track immediately
// after this also causes the same problem. // after this also causes the same problem.
if (!in->after_seek || ds->type != STREAM_VIDEO) { if (!in->after_seek || (ds->type != STREAM_VIDEO && !avoid_refresh)) {
MP_VERBOSE(in, "refresh track %d (%s)\n", stream->index, MP_VERBOSE(in, "refresh track %d (%s)\n", stream->index,
stream_type_name(ds->type)); stream_type_name(ds->type));
initiate_refresh_seek(in, ds, ref_pts); initiate_refresh_seek(in, ds, ref_pts);