Add improved relative seek mode

When the new mode is active relative seeks are converted to absolute
ones (current video pts + relative seek amount) and forward/backward
flag before being sent to the demuxer. This mode is used if the
demuxer has set the accurate_seek field in the demuxer struct and
there is a video stream. At the moment the mkv and lavf demuxers
enable the flag.

This change is useful for later Matroska ordered chapter support (and
for more general timelime editing), but also fixes problems in
existing functionality. The main problem with the old mode, where
relative seeks are passed directly to the demuxer, is that the user
wants to seek relative to the currently displayed position but the
demuxer does not know what that position is. There can be an arbitrary
amount of buffering between the demuxer read position and what is
displayed on the screen. In some situations this makes small seeks
fail to move backward at all (especially visible at high playback
speed, when audio needs to be demuxed and decoded further ahead to
fill the output buffers after resampling).

Some container formats that can be used with the lavf demuxer do not
always have reliable timestamps that could be used for unambiguous
absolute seeking. However I made the demuxer always enable the new
mode because it already converted all seeks to absolute ones before
sending them to libavformat, so cases without reliable absolute seeks
were failing already and this should only improve the working cases.

1 files changed, 10 insertions, 0 deletions

diff --git a/mplayer.c b/mplayer.c
index 1690f75ddb..a30fe21899 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2463,6 +2463,16 @@ static void edl_update(MPContext *mpctx)
 static int seek(MPContext *mpctx, double amount, int style)
 {
     current_module = "seek";
+    if (mpctx->demuxer->accurate_seek && mpctx->sh_video
+        && !(style & (SEEK_ABSOLUTE | SEEK_FACTOR))) {
+        style |= SEEK_ABSOLUTE;
+        if (amount > 0)
+            style |= SEEK_FORWARD;
+        else
+            style |= SEEK_BACKWARD;
+        amount += mpctx->sh_video->pts;
+    }
+
     if (demux_seek(mpctx->demuxer, amount, audio_delay, style) == 0)
 	return -1;