RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "player: allow seeking audio between video frames" 

This reverts commit 7b3feecbc2.

It's broken, hr-seek never ends at a video position before seek pts.
Not sure what I was thinking, although it did work anyway when
artificially forcing a video frame to display before seek pts.
This commit is contained in:
wm4 2015-01-30 23:30:08 +01:00
parent 12d822ce44
commit 3813c3804f
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
player/video.c
View File

@ -588,16 +588,8 @@ static int video_output_image(struct MPContext *mpctx, double endpts)
frame_time = 0;
}
mpctx->video_next_pts = pts;
if (mpctx->d_audio) {
if (mpctx->d_audio)
mpctx->delay -= frame_time;
// When resuming after a hr-seek, let audio advance the position to
// the actual seek target.
if (mpctx->video_status == STATUS_SYNCING && mpctx->hrseek_active &&
pts != MP_NOPTS_VALUE)
{
mpctx->delay -= mpctx->hrseek_pts - pts;
}
}
if (mpctx->video_status >= STATUS_READY) {
mpctx->time_frame += frame_time / mpctx->opts->playback_speed;
adjust_sync(mpctx, pts, frame_time);