From patchwork Sun Jun 30 23:12:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50232 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1460034vqv; Sun, 30 Jun 2024 16:13:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVSn8NWVR+o0yjcxlA1r8PYILR97GjGNcVsTiprj6CkquvGTZzo3HVKox43siI++MZ91cwojKerjgK+2LesQFA5yLO18e0vDayzNQ== X-Google-Smtp-Source: AGHT+IEEQvKfxy8ddPKAiporZYOOBjud4gyBws9i4rJB2i6YUtW5T5GRtLgd66CC47VeoaP3HeiW X-Received: by 2002:a17:906:5ce:b0:a73:e52c:2aa4 with SMTP id a640c23a62f3a-a75144fb3afmr226525366b.1.1719789229659; Sun, 30 Jun 2024 16:13:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719789229; cv=none; d=google.com; s=arc-20160816; b=m6FMThWa6gWb8lbNCFCKGgTZ+FPGCzvrWfBlFrejTBqdeEhocXkEmnFb/9RDLmWi6y JCiAWTkgY/wx7dHB/eJM8D1N8s7CznZDY2SaIsUwyZvK6gvLL8RQk56BWeBTNdSInrnw 5m7Ufgd/ryyAttdV3h8v+Qa+kGrSSwDFGOQqBJNWjO/BNirMBllY/ohPq8pkxWlq9n6R Xh+o2r0Y05PL54v2wu3wH8wZYXZqtcbztpPmP8q5m2qwyI9cR8Ca7HzSOLQ1xKwy45OP 5joueklF1W8SM/5ZG2vJl0p8kKkqvLAPcWNUKBg/EKoQttV8cir0tyV1lX2XiL/da2/l tG7A== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=AjLSaTbPuOpv5/LC3hrjifuNWVwsYwg28+Y4o1ipoGc=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=l1fdQmkYsiQ4lYOnWpVMgK7cGCB2Nw7g1eS+uB9q34DyGa5StAXk9rpSPIWY6u0R5p nPTOlSwwrpnLSbBde7adgOaNmPgY5z28wYIhDbn2r+ZJBYUuDBlwLp5OydOk6hSBZXlk cwyFt0yplIID3JQLu3qlwPrHLGbZZMotyqsUKqgFvJVjb0R45vU6INyPE3ndapAe4+yS JMeoNET98IsXp5m+Gr1Wtnxqq2GNop+Ab5LA/IF3xhxosy0OuU9Xopyf4ZmYeGNJXGRK OSgDuX0IX50z+EJz/YLD6diUpjMFte5OBYk8H2sd2XqUh9aoDfAoILfkkidTzaGrdR1o yxyw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="NaDofCP/"; 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 a640c23a62f3a-a72ab04b87dsi309173266b.393.2024.06.30.16.13.49; Sun, 30 Jun 2024 16:13:49 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="NaDofCP/"; 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 3D5B868D6CC; Mon, 1 Jul 2024 02:13:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7BA0368CC21 for ; Mon, 1 Jul 2024 02:13:11 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id D71541C0005 for ; Sun, 30 Jun 2024 23:13:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719789191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Crcvpofb7cyXHsZaQtK1eGXgTUQB/0Ba0iKanjJN6BU=; b=NaDofCP/Bs9gzIkdeOORoVDDowBGhHaDRuxuR9EEJKE5pD4cA4NcGk+tlcOQHS/7ltumF/ eKA9eElSnwNPSP2Hwpn7F3OHvbCYOoiSpTQ7A+9/JFgS2/7I7MnrISdRoQeFCrvGIKKCYQ pmiu4twhW2S3CHRzunH5F5ieeUcmF+JO+f+lozy/SF1imatocpZkUHn+RT95D/XMXx3Q4G 91yboUGiWeQfJDhAZrLrrCPkqF1cLUvjX9+K1yRuwM7oQ0u8TQAm/yeX77z6AW9IhXc59v 0JhKLkGY2Rdj1i2Xaso/ZSY8KhT1z9/3QDEx3Ut5yIYeoRG3L41WAGXb4207NA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Jul 2024 01:12:43 +0200 Message-ID: <20240630231306.3779027-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630231306.3779027-1-michael@niedermayer.cc> References: <20240630231306.3779027-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 04/11] tools/target_enc_fuzzer: A64MULTI encoder is very slow, check and adjust threshold X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: xOntajivDM8i Fixes: Timeout Fixes: 69097/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_A64MULTI_fuzzer-5062757287264256 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- tools/target_enc_fuzzer.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/target_enc_fuzzer.c b/tools/target_enc_fuzzer.c index 0345595ada7..c4c2df93a9b 100644 --- a/tools/target_enc_fuzzer.c +++ b/tools/target_enc_fuzzer.c @@ -78,6 +78,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { uint32_t it = 0; uint64_t nb_samples = 0; AVDictionary *opts = NULL; + uint64_t ec_pixels = 0; if (!c) { #define ENCODER_SYMBOL0(CODEC) ff_##CODEC##_encoder @@ -93,6 +94,9 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { return 0; maxpixels = maxpixels_per_frame * maxiteration; + switch (c->p.id) { + case AV_CODEC_ID_A64_MULTI: maxpixels /= 65536; break; + } maxpixels_per_frame = FFMIN(maxpixels_per_frame , maxpixels); @@ -168,6 +172,10 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { frame->height = ctx->height; while (data < end && it < maxiteration) { + ec_pixels += (ctx->width + 32LL) * (ctx->height + 32LL); + if (ec_pixels > maxpixels) + goto maximums_reached; + res = av_frame_get_buffer(frame, 0); if (res < 0) error("Failed av_frame_get_buffer"); @@ -192,7 +200,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { av_packet_unref(avpkt); } - +maximums_reached: encode(ctx, NULL, avpkt); av_packet_unref(avpkt);