path: root/player/video.c
diff options
authorwm4 <wm4@nowhere>2016-01-29 22:43:59 +0100
committerwm4 <wm4@nowhere>2016-01-29 22:43:59 +0100
commit340deb4e6eb1cf09c19cef5bd19c7eab51d6862b (patch)
tree5536838b6fec62dd7217df68bf24522c20c3e1e2 /player/video.c
parentd980fd0856c3773d488f4649d77d44cd8c1baf0e (diff)
player: fix initial audio sync in certain cases
Regression caused by commit 3b95dd47. Also see commit 4c25b000. We can either use video_next_pts and add "delay", or we just use video_pts. Any other combination breaks. The reason why the assumption that delay==0 at this point was wrong exactly because after displaying the first video frame (usually done before audio resync) a new frame might be "added" immediately, resulting in a new video_next_pts and "delay", which will still amount to video_pts. Fixes #2770. (The reason why display-sync was blamed in this issue is because enabling display-sync in the options forces a prefetch by 2 instead of 1 frames for seeks/playback restart, which triggers the issue, even if display-sync is not actually enabled. In this case, display-sync is never enabled because the frames have a unusually high frame duration. This is also what exposed the initial desync issue.)
Diffstat (limited to 'player/video.c')
1 files changed, 0 insertions, 2 deletions
diff --git a/player/video.c b/player/video.c
index bee6cd5cb0..1b30b398d8 100644
--- a/player/video.c
+++ b/player/video.c
@@ -254,7 +254,6 @@ void reset_video_state(struct MPContext *mpctx)
mpctx->delay = 0;
mpctx->time_frame = 0;
mpctx->video_pts = MP_NOPTS_VALUE;
- mpctx->video_next_pts = MP_NOPTS_VALUE;
mpctx->num_past_frames = 0;
mpctx->total_avsync_change = 0;
mpctx->last_av_difference = 0;
@@ -632,7 +631,6 @@ static void handle_new_frame(struct MPContext *mpctx)
frame_time = 0;
- mpctx->video_next_pts = pts;
mpctx->delay -= frame_time;
if (mpctx->video_status >= STATUS_PLAYING) {
mpctx->time_frame += frame_time / mpctx->video_speed;