summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-10-27 20:56:58 +0100
committerwm4 <wm4@nowhere>2015-10-27 20:56:58 +0100
commit70aa3b04f8cdde164fbf3b9f0535cc4609b65453 (patch)
treef3fa3627547d4544a1f702e01c70e821f28ed83f
parentc24921d56b08116965ac6aed4d334342eb6b30d1 (diff)
downloadmpv-70aa3b04f8cdde164fbf3b9f0535cc4609b65453.tar.bz2
mpv-70aa3b04f8cdde164fbf3b9f0535cc4609b65453.tar.xz
player: disable total-avsync-change update in display-sync mode
The total-avsync-change property made no sense in display-sync mode (in addition to making not all that much sense in general).
-rw-r--r--player/video.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/player/video.c b/player/video.c
index f4affbd51d..5f85c7bab3 100644
--- a/player/video.c
+++ b/player/video.c
@@ -550,6 +550,9 @@ static void adjust_sync(struct MPContext *mpctx, double v_pts, double frame_time
change = max_change;
mpctx->delay += change;
mpctx->total_avsync_change += change;
+
+ if (mpctx->display_sync_active)
+ mpctx->total_avsync_change = 0;
}
// Make the frame at position 0 "known" to the playback logic. This must happen
@@ -1038,6 +1041,7 @@ static void handle_display_sync_frame(struct MPContext *mpctx,
// for the sake of the video sync calculations we pretend it's perfect.
mpctx->time_frame -= mpctx->display_sync_error;
mpctx->time_frame /= opts->playback_speed * video_speed_correction;
+ mpctx->total_avsync_change = 0;
mpctx->speed_factor_v = video_speed_correction;