diff options
author | wm4 <wm4@nowhere> | 2015-10-03 22:10:44 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-10-03 22:10:44 +0200 |
commit | 3ccac74de22bc79e3a228b52ffcb5bbb927772dd (patch) | |
tree | 10bab4396e1de745d51907febbe3a3555abbcec3 /video/decode/vd_lavc.c | |
parent | ee283843fab8b07d7a6e00e70efbb27a46e8a40d (diff) | |
download | mpv-3ccac74de22bc79e3a228b52ffcb5bbb927772dd.tar.bz2 mpv-3ccac74de22bc79e3a228b52ffcb5bbb927772dd.tar.xz |
video: remove codec delay estimation
This was used only by the timestamp sorting code, which is a fallback
for avi files (as well as avi-muxed mkv files). This was supposed to
prevent accumulating timestamps in case the decoder consumes more
packets than it outputs frames (i.e. frames are dropped). This didn't
work very well (timestamps could be off by a large amount), the
estimation of the delay was fragile, and the interdependencies with the
decoder were annoying, so kill it.
Diffstat (limited to 'video/decode/vd_lavc.c')
-rw-r--r-- | video/decode/vd_lavc.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index e5ce92addb..9cc73d033a 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -689,13 +689,6 @@ static int control(struct dec_video *vd, int cmd, void *arg) case VDCTRL_RESET: avcodec_flush_buffers(avctx); 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; - *(int *)arg = delay; - return CONTROL_TRUE; case VDCTRL_GET_HWDEC: { int hwdec = ctx->hwdec ? ctx->hwdec->type : 0; if (!ctx->software_fallback_decoder) |