From patchwork Mon Aug 12 19:17:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 14450 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 78352449C0F for ; Mon, 12 Aug 2019 22:19:07 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 64AED68ABAC; Mon, 12 Aug 2019 22:19:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe07-3.mx.upcmail.net (vie01a-dmta-pe07-3.mx.upcmail.net [84.116.36.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C90568A7D8 for ; Mon, 12 Aug 2019 22:18:56 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1hxFqK-0000Nf-7E for ffmpeg-devel@ffmpeg.org; Mon, 12 Aug 2019 21:18:56 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id xFpLh83GHwlysxFpMhCBvt; Mon, 12 Aug 2019 21:17:56 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=E5OzWpVl c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=huxnrVqJXFykjllwOWgA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 12 Aug 2019 21:17:08 +0200 Message-Id: <20190812191708.22608-8-michael@niedermayer.cc> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190812191708.22608-1-michael@niedermayer.cc> References: <20190812191708.22608-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfAyqOjshRBH7m+hgrk0zpQUjnAR/H1pRT1yrpkC1dQz63sOGGt02XtHOhxxKAfyAy0ZTSN2oIsF8u3qboRybAF0JfltZr1nVWqz9sR4HNpc8YLR5K4kJ VH4ErdxoBjarjphpHD7XOaqnpmb0tAzJh+m/cpybdnD2t65sVvqZksMi Subject: [FFmpeg-devel] [PATCH 8/8] avcodec/nuv: Avoid duplicating frames X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: Timeout (14sec -> 133ms) Fixes: 14843/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_NUV_fuzzer-5661969614372864 Fixes: 16257/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_NUV_fuzzer-5769175464673280 (35sec ->0.5sec) Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/nuv.c | 37 ++++++++++++++++++++++++++++++++++--- tests/ref/fate/nuv-rtjpeg | 1 - 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 75b14bce5b..0952b537b7 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -42,6 +42,8 @@ typedef struct NuvContext { unsigned char *decomp_buf; uint32_t lq[64], cq[64]; RTJpegContext rtj; + int need_flush; + AVPacket flush_pkt; } NuvContext; static const uint8_t fallback_lquant[] = { @@ -66,6 +68,12 @@ static const uint8_t fallback_cquant[] = { 99, 99, 99, 99, 99, 99, 99, 99 }; +static void decode_flush(AVCodecContext *avctx){ + NuvContext *s = avctx->priv_data; + + s->need_flush = 0; +} + /** * @brief copy frame data from buffer to AVFrame, handling stride. * @param f destination AVFrame @@ -172,6 +180,26 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, NUV_COPY_LAST = 'L' } comptype; + if (!avpkt->data) { + if (c->need_flush) { + c->need_flush = 0; + if ((ret = ff_reget_buffer(avctx, c->pic)) < 0) + return ret; + c->pic->pkt_pos = c->flush_pkt.pos; + c->pic->pkt_duration = c->flush_pkt.duration; + c->pic->pkt_dts = c->flush_pkt.dts; + c->pic->pkt_pts = + c->pic->pts = c->flush_pkt.pts; + if ((ret = av_frame_ref(data, c->pic)) < 0) + return ret; + *got_frame = 1; + } + return 0; + } + c->flush_pkt = *avpkt; + c->pic->pkt_dts = c->flush_pkt.dts; + + if (buf_size < 12) { av_log(avctx, AV_LOG_ERROR, "coded frame too small\n"); return AVERROR_INVALIDDATA; @@ -204,8 +232,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, } break; case NUV_COPY_LAST: - keyframe = 0; - break; + c->need_flush = 1; + return buf_size; default: keyframe = 1; break; @@ -313,6 +341,7 @@ retry: if ((result = av_frame_ref(picture, c->pic)) < 0) return result; + c->need_flush = 0; *got_frame = 1; return orig_size; } @@ -364,6 +393,8 @@ AVCodec ff_nuv_decoder = { .init = decode_init, .close = decode_end, .decode = decode_frame, - .capabilities = AV_CODEC_CAP_DR1, + .flush = decode_flush, + .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/tests/ref/fate/nuv-rtjpeg b/tests/ref/fate/nuv-rtjpeg index b6f3b080dc..0914b985ec 100644 --- a/tests/ref/fate/nuv-rtjpeg +++ b/tests/ref/fate/nuv-rtjpeg @@ -6,7 +6,6 @@ 0, 118, 118, 0, 460800, 0x54aedafe 0, 152, 152, 0, 460800, 0xb7aa8b56 0, 177, 177, 0, 460800, 0x283ea3b5 -0, 202, 202, 0, 460800, 0x283ea3b5 0, 235, 235, 0, 460800, 0x10e577de 0, 269, 269, 0, 460800, 0x4e091ee2 0, 302, 302, 0, 460800, 0x2ea88828