Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH 04/11] tools/target_enc_fuzzer: A64MULTI encoder is very slow, check and adjust threshold
Date: Mon,  1 Jul 2024 01:12:43 +0200
Message-ID: <20240630231306.3779027-4-michael@niedermayer.cc> (raw)
In-Reply-To: <20240630231306.3779027-1-michael@niedermayer.cc>

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 <michael@niedermayer.cc>
---
 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);
 
-- 
2.45.2

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

  parent reply	other threads:[~2024-06-30 23:13 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-30 23:12 [FFmpeg-devel] [PATCH 01/11] MAINTAINERS: Add Timo Rothenpieler to server admins Michael Niedermayer
2024-06-30 23:12 ` [FFmpeg-devel] [PATCH 02/11] avcodec/vvc/dec: Check ff_init_cabac_decoder() for failure Michael Niedermayer
2024-07-01 12:54   ` Nuo Mi
2024-07-01 23:51     ` Michael Niedermayer
2024-06-30 23:12 ` [FFmpeg-devel] [PATCH 03/11] avcodec/aac/aacdec: Check if frame is allocated in frame_configure_elements() Michael Niedermayer
2024-06-30 23:12 ` Michael Niedermayer [this message]
2024-06-30 23:12 ` [FFmpeg-devel] [PATCH 05/11] tools/target_enc_fuzzer: A64MULTI5 encoder is very slow, check and adjust threshold Michael Niedermayer
2024-06-30 23:12 ` [FFmpeg-devel] [PATCH 06/11] doc/examples/mux: remove nop Michael Niedermayer
2024-07-10 19:51   ` Michael Niedermayer
2024-06-30 23:12 ` [FFmpeg-devel] [PATCH 07/11] doc/examples/vaapi_encode: Try to check fwrite() for failure Michael Niedermayer
2024-07-01  7:53   ` Rémi Denis-Courmont
2024-06-30 23:12 ` [FFmpeg-devel] [PATCH 08/11] fftools/ffmpeg: Check read() " Michael Niedermayer
2024-07-01 11:09   ` Anton Khirnov
2024-06-30 23:12 ` [FFmpeg-devel] [PATCH 09/11] avcodec/aac/aacdec_lpd: Remove dead code Michael Niedermayer
2024-06-30 23:12 ` [FFmpeg-devel] [PATCH 10/11] avcodec/aac/aacdec_usac: Avoid doing the same thing twice each iteration Michael Niedermayer
2024-07-21 13:56   ` Michael Niedermayer
2024-08-11 10:44     ` Michael Niedermayer
2024-06-30 23:12 ` [FFmpeg-devel] [PATCH 11/11] avcodec/aac/aacdec_usac: Remove check for impossible sbr_ratio Michael Niedermayer
2024-07-03  0:49   ` Lynne via ffmpeg-devel
2024-07-05 20:08     ` Michael Niedermayer
2024-07-01 11:07 ` [FFmpeg-devel] [PATCH 01/11] MAINTAINERS: Add Timo Rothenpieler to server admins Anton Khirnov
2024-07-01 14:07   ` Michael Niedermayer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240630231306.3779027-4-michael@niedermayer.cc \
    --to=michael@niedermayer.cc \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git