From patchwork Wed Mar 15 03:12:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 2934 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp109548vsy; Tue, 14 Mar 2017 20:13:17 -0700 (PDT) X-Received: by 10.223.148.35 with SMTP id 32mr695795wrq.82.1489547597166; Tue, 14 Mar 2017 20:13:17 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u10si17707905wma.76.2017.03.14.20.13.16; Tue, 14 Mar 2017 20:13:17 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7653B6882CD; Wed, 15 Mar 2017 05:12:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-3.mx.upcmail.net (vie01a-dmta-pe03-3.mx.upcmail.net [62.179.121.162]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04AEE6806D4 for ; Wed, 15 Mar 2017 05:12:41 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cnzMu-0003Sa-55 for ffmpeg-devel@ffmpeg.org; Wed, 15 Mar 2017 04:12:56 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id w3Cr1u01K0S5wYM013Cs1U; Wed, 15 Mar 2017 04:12:53 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 15 Mar 2017 04:12:49 +0100 Message-Id: <20170315031251.22570-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/vp56: Require 1 undamaged frame for 5 damaged frames for concealment to be used 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes timeout with 847/clusterfuzz-testcase-5291877358108672 Fixes timeout with 850/clusterfuzz-testcase-5721296509861888 This likely will need to be tweaked Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vp56.c | 10 +++++++--- libavcodec/vp56.h | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index 9d4162bb96..b4ee760080 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -508,6 +508,7 @@ static int vp56_size_changed(VP56Context *s) s->plane_height[1] = s->plane_height[2] = avctx->coded_height/2; s->have_undamaged_frame = 0; + s->damaged_frame_count = 0; for (i=0; i<4; i++) s->stride[i] = s->flip * s->frames[VP56_FRAME_CURRENT]->linesize[i]; @@ -712,8 +713,9 @@ static int ff_vp56_decode_mbs(AVCodecContext *avctx, void *data, int ret = vp56_decode_mb(s, mb_row, mb_col, is_alpha); if (ret < 0) { damaged = 1; - if (!s->have_undamaged_frame) { + if (5*s->have_undamaged_frame <= s->damaged_frame_count) { s->discard_frame = 1; + s->damaged_frame_count ++; return AVERROR_INVALIDDATA; } } @@ -733,8 +735,10 @@ static int ff_vp56_decode_mbs(AVCodecContext *avctx, void *data, } } - if (!damaged) - s->have_undamaged_frame = 1; + if (!damaged) { + s->have_undamaged_frame ++; + } else + s->damaged_frame_count ++; next: if (p->key_frame || s->golden_frame) { diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h index c049399df8..37837d0c7b 100644 --- a/libavcodec/vp56.h +++ b/libavcodec/vp56.h @@ -206,6 +206,7 @@ struct vp56_context { int have_undamaged_frame; int discard_frame; + int damaged_frame_count; };