From c61f76829f26eee43f5f82a29c13b729d10a5232 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 26 Jan 2015 12:29:27 +0100 Subject: player: fix framestep over timeline segment boundaries This was subtly broken by commit a937ba20. Instead of framestepping over the timeline segment boundary, it would just unpause playback, because seeking now resets mpctx->step_frames. This was especially apparent when doing something like "mpv *.jpg --merge-files". Fix by restoring the step_frames field specifically if the seek is done for switching segment boundaries. Hopefully the number fields which need such an exception on seeking won't grow and turn this code into a mess. --- player/playloop.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/player/playloop.c b/player/playloop.c index 55ff59fa10..cba23b79d7 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -168,6 +168,7 @@ static int mp_seek(MPContext *mpctx, struct seek_params seek, { struct MPOpts *opts = mpctx->opts; uint64_t prev_seek_ts = mpctx->vo_pts_history_seek_ts; + int prev_step = mpctx->step_frames; if (!mpctx->demuxer) return -1; @@ -263,6 +264,7 @@ static int mp_seek(MPContext *mpctx, struct seek_params seek, if (timeline_fallthrough) { // Important if video reinit happens. mpctx->vo_pts_history_seek_ts = prev_seek_ts; + mpctx->step_frames = prev_step; } else { mpctx->vo_pts_history_seek_ts++; mpctx->backstep_active = false; -- cgit v1.2.3