From 344d44681efaf180e7bd2e523f2add547b451bec Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 2 Dec 2015 14:38:47 +0100 Subject: video: readd codec delay estimation Approximately reverts commit 3ccac74d. This failed with some avi files, which do pseudo-VFR by sending packets with empty frames (or repeat frames, depending on point of view). Specifically, these packets are not 0 bytes, so they don't get skipped by libavformat, as with the usual VFR avi hack. Instead, the packet contains a VOP with vop_coded=0, so libavcodec will just return no frame. We could probably distinguish such skipped frames and delayed frames by explicitly measuring the codec delay by counting how long it takes to get the very first frame (and then treat skips as explicit drops), but we may as well simply reinstate the old code. To appease to at least one semi-broken case, do not enable this logic on the RPI, as the FFmpeg MMAL wrapper has arbitrary buffering (and MMAL itself is asynchronous). --- video/decode/dec_video.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'video/decode/dec_video.c') diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c index af55c66811..509daf7cd8 100644 --- a/video/decode/dec_video.c +++ b/video/decode/dec_video.c @@ -211,6 +211,10 @@ bool video_init_best_codec(struct dec_video *d_video, char* video_decoders) static void add_avi_pts(struct dec_video *d_video, double pts) { if (pts != MP_NOPTS_VALUE) { + int delay = -1; + video_vd_control(d_video, VDCTRL_QUERY_UNSEEN_FRAMES, &delay); + if (delay >= 0 && delay < d_video->num_buffered_pts) + d_video->num_buffered_pts = delay; if (d_video->num_buffered_pts == MP_ARRAY_SIZE(d_video->buffered_pts)) { MP_ERR(d_video, "Too many buffered pts\n"); } else { -- cgit v1.2.3