summaryrefslogtreecommitdiffstats
path: root/player/loadfile.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-08-04 11:26:57 +0200
committerwm4 <wm4@nowhere>2016-08-04 11:26:57 +0200
commit3c3361217c96337270b112e52f9eb6cc5931b390 (patch)
treeb1133f42294800b4da44730c6869db2ec589f80f /player/loadfile.c
parent356e703510170151a1678e9b1deab2ffdd5c92fb (diff)
downloadmpv-3c3361217c96337270b112e52f9eb6cc5931b390.tar.bz2
mpv-3c3361217c96337270b112e52f9eb6cc5931b390.tar.xz
player: offset demuxer on start/seek properly with audio/sub delay
Assume you use a large value like --audio-delay=20. Then until now the player would just have seeked normally to a "too late" position, and played silence for about 20 seconds until audio in the correct time range is coming again. Change this by offsetting seeks by the right amount. This works for both external and muxed files. If a seek isn't precise, then it works only for external files. This might cause issues with very large delay options. Hr-seek skipping could take a lot of time (especially because it affects video too), the demuxer queue could overflow, and other weird corner cases could appear. But we just try this on best-effort basis, and if the user uses extreme values we don't guarantee good behavior.
Diffstat (limited to 'player/loadfile.c')
-rw-r--r--player/loadfile.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index 94d0b2bd5d..3d04a3720d 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -208,6 +208,7 @@ void reselect_demux_stream(struct MPContext *mpctx, struct track *track)
double pts = get_current_time(mpctx);
if (pts == MP_NOPTS_VALUE)
pts = 0;
+ pts += get_track_seek_offset(mpctx, track);
demux_seek(track->demuxer, pts, 0);
}
}