From d92395d205dc9638c354c4bc7e58a969f889ebec Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 17 Nov 2019 01:39:54 +0100 Subject: player: remove some unnecessary coverart special cases These should not be needed, since video is in EOF mode in this case anyway. Not too sure about the video.c case to be honest, well, here goes nothing. --- player/audio.c | 3 +-- player/playloop.c | 1 - player/video.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/player/audio.c b/player/audio.c index 529902b535..e8e129dc49 100644 --- a/player/audio.c +++ b/player/audio.c @@ -626,8 +626,7 @@ static bool get_sync_samples(struct MPContext *mpctx, int *skip) !mp_audio_buffer_samples(mpctx->ao_chain->ao_buffer)) return false; // no audio read yet - bool sync_to_video = mpctx->vo_chain && !mpctx->vo_chain->is_coverart && - mpctx->video_status != STATUS_EOF; + bool sync_to_video = mpctx->vo_chain && mpctx->video_status != STATUS_EOF; double sync_pts = MP_NOPTS_VALUE; if (sync_to_video) { diff --git a/player/playloop.c b/player/playloop.c index 03bb771ad9..ab98fb1a60 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -1055,7 +1055,6 @@ static void handle_dummy_ticks(struct MPContext *mpctx) static void handle_playback_time(struct MPContext *mpctx) { if (mpctx->vo_chain && - !mpctx->vo_chain->is_coverart && !mpctx->vo_chain->is_sparse && mpctx->video_status >= STATUS_PLAYING && mpctx->video_status < STATUS_EOF) diff --git a/player/video.c b/player/video.c index 337865f1eb..e0353700f0 100644 --- a/player/video.c +++ b/player/video.c @@ -560,7 +560,7 @@ static void update_avsync_before_frame(struct MPContext *mpctx) struct MPOpts *opts = mpctx->opts; struct vo *vo = mpctx->video_out; - if (mpctx->vo_chain->is_coverart || mpctx->video_status < STATUS_READY) { + if (mpctx->video_status < STATUS_READY) { mpctx->time_frame = 0; } else if (mpctx->display_sync_active || opts->video_sync == VS_NONE) { // don't touch the timing -- cgit v1.2.3