RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-01 23:00:41 +00:00
Code Issues Releases Wiki Activity

demux: redo backstep seek handling slightly again

Browse Source 
Backstepping still could get "stuck" if the demuxer didn't seek far back
enough. This commit fixes getting stuck if playing backwards from the
end, and audio has ended much earlier than the video.

In commit 4544fb0856, I claimed that the backward seek semantics
("snapping" backward in normal seeking, unrelated to backward playing)
would take care of this. Unfortunately, this is not always quite true.

In theory, a seek to any position (that does not use SEEK_FORWARD, i.e.
backward snapping) should return a packet for every stream. But I have a
mkv sample, where audio ends much earlier than video. Its mkvmerge
created index does not have entries for audio packets, so the video
index is used. This index has its last entry somewhere close after the
end of audio. So no audio packets will be returned. With a "too small"
back_seek_size, the demuxer will retry a seek target that ends up in
this place forever. (This does not happen if you use --index=recreate.
It also doesn't happen with libavformat, which always prefers its own
index, while mpv's internal mkv demuxer strictly prefers the index from
the file if it can be read.)

Fix this by adding the back_seek_size every time we fail to see enough
packets. This way the seek step can add up until it works.

To prevent that back_seek_pos just "runs away" towards negative infinity
by subtracting back_seek_size every time we back step to undo forward
reading (e.g. if --no-cache is used), readjust the back_seek_pos to the
lowest known resume position. (If the cache is active, kf_seek_pts can
be used, but to work in all situations, the code needs to grab the
minimum PTS in the keyframe range.)
This commit is contained in:
wm4 2019-05-24 15:20:07 +02:00
parent c66aa2b1a9
commit 2d0206df32
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
demux/demux.c
View File

@ -1255,8 +1255,6 @@ static void perform_backward_seek(struct demux_internal *in)
target = PTS_OR_DEF(target, in->d_thread->start_time);
target -= in->opts->back_seek_size;
MP_VERBOSE(in, "triggering backward seek to get more packets\n");
queue_seek(in, target, SEEK_SATAN | SEEK_HR, false);
in->reading = true;
@ -1389,6 +1387,15 @@ static void find_backward_restart_pos(struct demux_stream *ds)
assert(0); // target must be in list
}
double seek_pts = MP_NOPTS_VALUE;
for (struct demux_packet *cur = target; cur; cur = cur->next) {
seek_pts = MP_PTS_MIN(seek_pts, cur->pts);
if (cur->next && cur->next->keyframe)
break;
}
if (seek_pts != MP_NOPTS_VALUE)
ds->back_seek_pos = seek_pts;
ds->back_restarting = false;
ds->back_range_started = false;
ds->back_range_min = got_preroll + 1;
@ -1416,6 +1423,7 @@ resume_earlier:
}
}
ds->back_seek_pos -= in->opts->back_seek_size;
in->need_back_seek = true;
}