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

dec_video: remove weird offset for VDCTRL_QUERY_UNSEEN_FRAMES 

The return value of get_current_video_decoder_lag() should be the same
before and after this change in all cases.
This commit is contained in:
wm4 2013-02-24 23:15:11 +01:00
parent 8884ac9f79
commit 281e10f05d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
video/decode/dec_video.c
View File

@ -172,10 +172,9 @@ int get_current_video_decoder_lag(sh_video_t *sh_video)
const struct vd_functions *vd = sh_video->vd_driver;
if (!vd)
return -1;
int ret = vd->control(sh_video, VDCTRL_QUERY_UNSEEN_FRAMES, NULL);
if (ret >= 10)
return ret - 10;
return -1;
int ret = -1;
vd->control(sh_video, VDCTRL_QUERY_UNSEEN_FRAMES, &ret);
return ret;
}
void uninit_video(sh_video_t *sh_video)

4
video/decode/vd_lavc.c
View File

@ -671,9 +671,11 @@ static int control(sh_video_t *sh, int cmd, void *arg)
return CONTROL_TRUE;
case VDCTRL_QUERY_UNSEEN_FRAMES:;
int delay = avctx->has_b_frames;
assert(delay >= 0);
if (avctx->active_thread_type & FF_THREAD_FRAME)
delay += avctx->thread_count - 1;
return delay + 10;
*(int *)arg = delay;
return CONTROL_TRUE;
case VDCTRL_RESET_ASPECT:
if (ctx->vo_initialized)
ctx->vo_initialized = false;