aboutsummaryrefslogtreecommitdiffhomepage
path: root/player
diff options
context:
space:
mode:
authorGravatar wm4 <wm4@nowhere>2016-04-23 17:16:54 +0200
committerGravatar wm4 <wm4@nowhere>2016-04-23 18:55:24 +0200
commit786f37ae1c77b46b34ed66b4a73c42ff64bfc9b8 (patch)
tree5e300caf595d8a0aa6796f578613bb28ea82caae /player
parentabb3f80998e46dad6e213b476a9de9796f21d9bf (diff)
player: cleaner determination of current playback PTS
In particular, this won't overwrite the playback PTS in coverart mode, which actually fixes relative seeks.
Diffstat (limited to 'player')
-rw-r--r--player/playloop.c19
-rw-r--r--player/video.c1
2 files changed, 11 insertions, 9 deletions
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);
diff --git a/player/video.c b/player/video.c
index 0af0b9065a..7610c120ea 100644
--- a/player/video.c
+++ b/player/video.c
@@ -1380,7 +1380,6 @@ void write_video(struct MPContext *mpctx)
mpctx->video_pts = mpctx->next_frames[0]->pts;
mpctx->last_vo_pts = mpctx->video_pts;
- mpctx->playback_pts = mpctx->video_pts;
shift_frames(mpctx);