From patchwork Sat Jan 25 23:56:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 17549 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6214:1865:0:0:0:0 with SMTP id eh5csp1179066qvb; Sat, 25 Jan 2020 16:06:12 -0800 (PST) X-Google-Smtp-Source: APXvYqy7kovYyp3HkKTbW1bxyd/IDyaoDrfF+GkHZcoCN+QrXTT1YIsVhBfECIQpNtQ3N38eQS/8 X-Received: by 2002:a17:906:248f:: with SMTP id e15mr8240447ejb.141.1579997172224; Sat, 25 Jan 2020 16:06:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579997172; cv=none; d=google.com; s=arc-20160816; b=QiMHJUcP3vpyzc4p2zKinaW4oc25PFtHRRNVVXyunfJTvr9GgiUS7ZekyYYbYQEfS3 rOxpCrHcEVdnQb6dAycB0EMtTnnljKrwaUX+05NmB1rE/FsCu+QfRj+vtRm2MoqarRdS mt1hixH8uNhvdyqZi6SNcHmDv2ADpY6NXp0GHgouBa1380tlAXreEy1FTH+JjZXVvIHV pF0+4nVdI0GxXqkXuAe36eL7tjqXBmrudpytUkpprhj4eMt9NqteZ7wFb4Jotxzbyi0C gmUylYuRwrE7Cuph8uRn6W3i8Uzk94ERwAExnstrRMDaECKD5ZuyNDsujQxG829s7iRS Owkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=sbe0Eh0EYuzmV+FIoyWnUtX/0symCTMvSrNf4Q/mHFk=; b=BrPlOE/dpC1DanLw//HAEJmXWFqxGBDlxTaDCvziJ4dwFQAohf8p7wY0wsc56QMO15 dpknkd3hxiaNBt8SlY7HHJH4hr9ugSDWPry4RsM2abeg9+zo09kfu+1Q22z/fjCcU/Ik 1Rvkn9qDG53H4T8wrmJTrLPDZyiKcBbOWkdLiNhxQ0Bi0IOOijN/lwzggbzG88g7ouBc 3DY+mLe/N8YUoQmHY6ij4J55olgCS86kfEuZ1hlwb64jJBQqhPp8d4v5HeUjBXFUhAEZ BD/Ms5vy+vTFZ68L30L6KAo3OasqFPz92AaiaGdgLFcipdVCFyUz59DHrOufYazOn2xF jezQ== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ly8si33189260ejb.205.2020.01.25.16.06.11; Sat, 25 Jan 2020 16:06:12 -0800 (PST) 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 3770E68A092; Sun, 26 Jan 2020 02:06:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-3.mx.upcmail.net (vie01a-dmta-pe01-3.mx.upcmail.net [62.179.121.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 893DD687F95 for ; Sun, 26 Jan 2020 02:05:56 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ivVLk-000A48-8c for ffmpeg-devel@ffmpeg.org; Sun, 26 Jan 2020 01:00:24 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id vVKlijTQkwlysvVKlivonT; Sun, 26 Jan 2020 00:59:23 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=E5OzWpVl c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=uKGnjqIq2gYYpuIkrFwA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 26 Jan 2020 00:56:25 +0100 Message-Id: <20200125235626.5786-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfPtQJYqHD9RDoMvB4azoP5QDoLyI4xkeCTViI22mCdhiHvkOn4/t7sg7/l2lVoNzwUyyykpnlJg7PLcdaA4hvSucl4oeYOSq7xk0okY+dsYBhllq+W+Q SuviAySRFaFAWfoygcyq86HioxPtlhkjHD5aoFKNcEgahvqPh+C47Bjk Subject: [FFmpeg-devel] [PATCH 1/2] tools/target_dec_fuzzer: Sort threshold list alphabetically 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" X-TUID: pU2A7TCYDE96 Content-Length: 5747 This also removes the comments as they are hard to maintain together with sorted lists Signed-off-by: Michael Niedermayer --- tools/target_dec_fuzzer.c | 54 ++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index a3d784a019..79d8dab1b9 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -136,36 +136,32 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { maxpixels = maxpixels_per_frame * maxiteration; maxsamples = maxsamples_per_frame * maxiteration; switch (c->id) { - // Allows a small input to generate gigantic output - case AV_CODEC_ID_BINKVIDEO: maxpixels /= 32; break; - case AV_CODEC_ID_CFHD: maxpixels /= 128; break; - case AV_CODEC_ID_DIRAC: maxpixels /= 8192; break; - case AV_CODEC_ID_DST: maxsamples /= 8192; break; - case AV_CODEC_ID_DXV: maxpixels /= 32; break; + case AV_CODEC_ID_BINKVIDEO: maxpixels /= 32; break; + case AV_CODEC_ID_CFHD: maxpixels /= 128; break; + case AV_CODEC_ID_DIRAC: maxpixels /= 8192; break; + case AV_CODEC_ID_DST: maxsamples /= 8192; break; + case AV_CODEC_ID_DXV: maxpixels /= 32; break; case AV_CODEC_ID_FFWAVESYNTH: maxsamples /= 16384; break; - case AV_CODEC_ID_MSRLE: maxpixels /= 16; break; - case AV_CODEC_ID_QTRLE: maxpixels /= 16; break; - case AV_CODEC_ID_RASC: maxpixels /= 16; break; - case AV_CODEC_ID_SANM: maxpixels /= 16; break; - case AV_CODEC_ID_G2M: maxpixels /= 64; break; - case AV_CODEC_ID_GIF: maxpixels /= 16; break; - // Performs slow frame rescaling in C - case AV_CODEC_ID_GDV: maxpixels /= 512; break; - // Postprocessing in C - case AV_CODEC_ID_HNM4_VIDEO:maxpixels /= 128; break; - // Cliping in C, generally slow even with small input - case AV_CODEC_ID_INDEO4: maxpixels /= 128; break; - case AV_CODEC_ID_LSCR: maxpixels /= 16; break; - case AV_CODEC_ID_MOTIONPIXELS:maxpixels /= 256; break; - case AV_CODEC_ID_MSS2: maxpixels /= 16384; break; - case AV_CODEC_ID_MSZH: maxpixels /= 128; break; - case AV_CODEC_ID_SCPR: maxpixels /= 32; break; - case AV_CODEC_ID_SMACKVIDEO: maxpixels /= 64; break; - case AV_CODEC_ID_SNOW: maxpixels /= 128; break; - case AV_CODEC_ID_TGV: maxpixels /= 32; break; - case AV_CODEC_ID_TRUEMOTION2: maxpixels /= 1024; break; - case AV_CODEC_ID_VP7: maxpixels /= 256; break; - case AV_CODEC_ID_VP9: maxpixels /= 4096; break; + case AV_CODEC_ID_G2M: maxpixels /= 64; break; + case AV_CODEC_ID_GDV: maxpixels /= 512; break; + case AV_CODEC_ID_GIF: maxpixels /= 16; break; + case AV_CODEC_ID_HNM4_VIDEO: maxpixels /= 128; break; + case AV_CODEC_ID_INDEO4: maxpixels /= 128; break; + case AV_CODEC_ID_LSCR: maxpixels /= 16; break; + case AV_CODEC_ID_MOTIONPIXELS:maxpixels /= 256; break; + case AV_CODEC_ID_MSRLE: maxpixels /= 16; break; + case AV_CODEC_ID_MSS2: maxpixels /= 16384; break; + case AV_CODEC_ID_MSZH: maxpixels /= 128; break; + case AV_CODEC_ID_QTRLE: maxpixels /= 16; break; + case AV_CODEC_ID_RASC: maxpixels /= 16; break; + case AV_CODEC_ID_SANM: maxpixels /= 16; break; + case AV_CODEC_ID_SCPR: maxpixels /= 32; break; + case AV_CODEC_ID_SMACKVIDEO: maxpixels /= 64; break; + case AV_CODEC_ID_SNOW: maxpixels /= 128; break; + case AV_CODEC_ID_TGV: maxpixels /= 32; break; + case AV_CODEC_ID_TRUEMOTION2: maxpixels /= 1024; break; + case AV_CODEC_ID_VP7: maxpixels /= 256; break; + case AV_CODEC_ID_VP9: maxpixels /= 4096; break; } From patchwork Sat Jan 25 23:56:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 17544 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 0BA9F44BD09 for ; Sun, 26 Jan 2020 02:06:00 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DCBAC688000; Sun, 26 Jan 2020 02:05:59 +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 D6905687F95 for ; Sun, 26 Jan 2020 02:05:53 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ivVLk-0001nt-8c for ffmpeg-devel@ffmpeg.org; Sun, 26 Jan 2020 01:00:24 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id vVKmijTSBwlysvVKmivong; Sun, 26 Jan 2020 00:59:24 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=E5OzWpVl c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=4WQVb1LGwl7BpcomyKEA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 26 Jan 2020 00:56:26 +0100 Message-Id: <20200125235626.5786-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200125235626.5786-1-michael@niedermayer.cc> References: <20200125235626.5786-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfPtQJYqHD9RDoMvB4azoP5QDoLyI4xkeCTViI22mCdhiHvkOn4/t7sg7/l2lVoNzwUyyykpnlJg7PLcdaA4hvSucl4oeYOSq7xk0okY+dsYBhllq+W+Q SuviAySRFaFAWfoygcyq86HioxPtlhkjHD5aoFKNcEgahvqPh+C47Bjk Subject: [FFmpeg-devel] [PATCH 2/2] tools/target_dec_fuzzer: Add threshold for ALS 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 (253sec -> 16sec) Fixes: 18668/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ALS_fuzzer-6227155369590784 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- tools/target_dec_fuzzer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index 79d8dab1b9..ba72e5a65e 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -149,6 +149,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_INDEO4: maxpixels /= 128; break; case AV_CODEC_ID_LSCR: maxpixels /= 16; break; case AV_CODEC_ID_MOTIONPIXELS:maxpixels /= 256; break; + case AV_CODEC_ID_MP4ALS: maxsamples /= 65536; break; case AV_CODEC_ID_MSRLE: maxpixels /= 16; break; case AV_CODEC_ID_MSS2: maxpixels /= 16384; break; case AV_CODEC_ID_MSZH: maxpixels /= 128; break;