From c10ca137a871c0cebbfa84d802e28e5eddd8705c Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 28 Feb 2020 20:13:32 +0100 Subject: player: remove delayed audio seek thing This was a hack that attempted to line up external audio tracks with video. The problem is that if you do a keyframe seek backwards, video will usually seek much farther back than audio (due to much higher keyframe aka seek point distances). The hack somehow made seeking a 2 step process. This existed in 4 different forms in the history of this code base, and it was always very cumbersome. We mostly needed this for ytdl_hook (I think?), which uses the 4th form, which is nicely confined to demux_timeline and is unrelated to the "external" audio tracks in the high level player. Since this is (probably) not really widely needed anymore, get rid of it. Better do this now, than when somehow rewriting all the seeking code (which might happen in this decade or the next or so) and when it wouldn't be easily revertable anymore in case we find we "really" need it unlike expected. There is no issue if hr-seeks are used. Also, you can still use edl files to "bundle" multiple streams as if it was a single stream (this is what ytdl_hook does now). --- player/core.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'player/core.h') diff --git a/player/core.h b/player/core.h index a6606af91c..a4ffc34b68 100644 --- a/player/core.h +++ b/player/core.h @@ -408,10 +408,6 @@ typedef struct MPContext { struct seek_params seek; - // Can be temporarily set to an external audio track after seeks. Then it - // must be seeked to the video position once video is done seeking. - struct track *seek_slave; - /* Heuristic for relative chapter seeks: keep track which chapter * the user wanted to go to, even if we aren't exactly within the * boundaries of that chapter due to an inaccurate seek. */ -- cgit v1.2.3