From 786f37ae1c77b46b34ed66b4a73c42ff64bfc9b8 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 23 Apr 2016 17:16:54 +0200 Subject: player: cleaner determination of current playback PTS In particular, this won't overwrite the playback PTS in coverart mode, which actually fixes relative seeks. --- player/playloop.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'player/playloop.c') diff --git a/player/playloop.c b/player/playloop.c index 71ecd7ee52..6eadcbc313 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -958,6 +958,17 @@ void run_playloop(struct MPContext *mpctx) fill_audio_out_buffers(mpctx); write_video(mpctx); + if (mpctx->vo_chain && !mpctx->vo_chain->is_coverart && + mpctx->video_status >= STATUS_PLAYING && + mpctx->video_status < STATUS_EOF) + { + mpctx->playback_pts = mpctx->video_pts; + } else if (mpctx->audio_status >= STATUS_PLAYING && + mpctx->audio_status < STATUS_EOF) + { + mpctx->playback_pts = playing_audio_pts(mpctx); + } + if (mpctx->lavfi) { if (lavfi_process(mpctx->lavfi)) mpctx->sleeptime = 0; @@ -967,14 +978,6 @@ void run_playloop(struct MPContext *mpctx) handle_playback_restart(mpctx); - // Use the audio timestamp if no video, or video is enabled, but has ended. - if (mpctx->video_status == STATUS_EOF && - mpctx->audio_status >= STATUS_PLAYING && - mpctx->audio_status < STATUS_EOF) - { - mpctx->playback_pts = playing_audio_pts(mpctx); - } - handle_dummy_ticks(mpctx); update_osd_msg(mpctx); -- cgit v1.2.3