diff options
author | wm4 <wm4@nowhere> | 2014-08-22 15:28:05 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-08-22 15:36:48 +0200 |
commit | 4c25b000b5e521c67608284cf23972e2f651e9d3 (patch) | |
tree | 6c46376827fb68320777f7529855141e8699b1aa /player/core.h | |
parent | 75005ec06d13655340439450cd4663bdf7978411 (diff) | |
download | mpv-4c25b000b5e521c67608284cf23972e2f651e9d3.tar.bz2 mpv-4c25b000b5e521c67608284cf23972e2f651e9d3.tar.xz |
player: fix recent speed change regression
Commit 5afc025c broke this. The reason is that mpctx->delay is updated
when a new video frame is added. This value is also needed to resync
audio, but it will be for the wrong PTS. They must be consistent with
each other, and if they aren't, initial sync will be off by N video
frames, which results at least in worse user experience.
This can be reproduced by for example heavily switching between normal
and 2x speed, or similar.
Fix by readding the video_next_pts field (keeping its use minimal,
instead of reverting the commit that removed it).
Diffstat (limited to 'player/core.h')
-rw-r--r-- | player/core.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/player/core.h b/player/core.h index 6c69e5e261..2c5328df38 100644 --- a/player/core.h +++ b/player/core.h @@ -275,6 +275,8 @@ typedef struct MPContext { * (or at least queued to be flipped by VO) */ double video_pts; double last_seek_pts; + // Mostly unused; for proper audio resync on speed changes. + double video_next_pts; // As video_pts, but is not reset when seeking away. (For the very short // period of time until a new frame is decoded and shown.) double last_vo_pts; |