From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id CBEE747A3C for ; Wed, 26 Jun 2024 13:35:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7A2F868D3BB; Wed, 26 Jun 2024 16:35:22 +0300 (EEST) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 872DE68CEEE for ; Wed, 26 Jun 2024 16:35:16 +0300 (EEST) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-706680d3a25so3121563b3a.0 for ; Wed, 26 Jun 2024 06:35:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719408914; x=1720013714; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=oh1+0MTtsTbqFpEWT+TxWf4xEzpiv/NovqSOqRKTeik=; b=iekSV0BofOBafiBZ7X/rNoca/uK5xWClbGMO54glILqFRrfmgYKcf9azhZeYs52NE3 dZ3+y4gAmh4PdSH+wyehByqXhA1Hzx0kyQDW2/8SNKvpdQTEI3VpQbObVrAsSreQ87tM fqcQaA3NXFgeDWaqO5TFr4xLmc7FbnHJtWEyOubqjXg6l9+CjnvUwCTXAJx6X4I5Wcsj RL9Byvmis6Oy77G/KMQTQVoJbd/kHvKcujpur7v1EEZv4mcY5pUyvqr/JOgXHEU7wFwr uigpYnv494nQjCcORl8KOsq5jGFhLKy1SUlRboi8GiknNN+VmPwrJplforPNIV+wRmu/ nkiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719408914; x=1720013714; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oh1+0MTtsTbqFpEWT+TxWf4xEzpiv/NovqSOqRKTeik=; b=WELbGoh9LQchx5SMrbTjU3motATJnV6JL08ks/JH6oA0xuOB9DIYi69X5xGOG7QTzi hfn2IRH6kFvWKyHz8OK3uDN0KecYSiF7NDyNur5OHhE1WsJgqunW0Nx5BsFSS1WCty2r AYbhSan+E632Pg0v8yEG+ii3ZLn1gUlyKLpdS49UD/H1I7dr95hxsMbmeZ5lehNNuXEO /fur9aPqmBoGLOSzWCky1PkrbK4fMEqcTdbb3W4orcirKhj86braDd2jQQ9XPvWt1Ft+ bl5fMfeqd7XKrqSH7a+jTscI9k+vHAyM+1q6sEkaMTYIhr4oE9rNTQ4tO6meUH1CG89c SEPg== X-Gm-Message-State: AOJu0YxyzxQ3sda4OKBRMSiCbnRY6zUgiDXKNQ/1htx2LOUHoobEjpjX BrDs9B+PREWKD7nbN6ZEp6mlHdEkkyw7NgpJZarFKg5UEhx9r0CZterGoQ== X-Google-Smtp-Source: AGHT+IESS1K3Fqkpv+5EknBicaE3L+p/m1tGp9k46v3PPbtIuGFAxxbSNvrCc+EM796CawYEVR2TnQ== X-Received: by 2002:a05:6a00:69b7:b0:702:38ff:4a59 with SMTP id d2e1a72fcca58-70670e79d03mr11068736b3a.6.1719408913689; Wed, 26 Jun 2024 06:35:13 -0700 (PDT) Received: from [192.168.0.16] ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7068ca5a67esm5024975b3a.108.2024.06.26.06.35.12 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Jun 2024 06:35:13 -0700 (PDT) Message-ID: <1352e042-9fc6-4c10-b7e8-2a643759b249@gmail.com> Date: Wed, 26 Jun 2024 10:35:32 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240626114053.230503-1-michael@niedermayer.cc> Content-Language: en-US From: James Almer In-Reply-To: <20240626114053.230503-1-michael@niedermayer.cc> Subject: Re: [FFmpeg-devel] [PATCH] add tools/target_swr_fuzzer 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 6/26/2024 8:40 AM, Michael Niedermayer wrote: > Signed-off-by: Michael Niedermayer > --- > Makefile | 2 + > tools/Makefile | 3 + > tools/target_swr_fuzzer.c | 161 ++++++++++++++++++++++++++++++++++++++ > 3 files changed, 166 insertions(+) > create mode 100644 tools/target_swr_fuzzer.c > > diff --git a/Makefile b/Makefile > index 4c3af09fec4..b350d7748f5 100644 > --- a/Makefile > +++ b/Makefile > @@ -70,6 +70,8 @@ tools/target_io_dem_fuzzer$(EXESUF): tools/target_io_dem_fuzzer.o $(FF_DEP_LIBS) > tools/target_sws_fuzzer$(EXESUF): tools/target_sws_fuzzer.o $(FF_DEP_LIBS) > $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH) > > +tools/target_swr_fuzzer$(EXESUF): tools/target_swr_fuzzer.o $(FF_DEP_LIBS) > + $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH) > > tools/enum_options$(EXESUF): ELIBS = $(FF_EXTRALIBS) > tools/enum_options$(EXESUF): $(FF_DEP_LIBS) > diff --git a/tools/Makefile b/tools/Makefile > index 2a11fa0ae62..7ae6e3cb75d 100644 > --- a/tools/Makefile > +++ b/tools/Makefile > @@ -23,6 +23,9 @@ tools/target_io_dem_fuzzer.o: tools/target_dem_fuzzer.c > tools/target_sws_fuzzer.o: tools/target_sws_fuzzer.c > $(COMPILE_C) > > +tools/target_swr_fuzzer.o: tools/target_swr_fuzzer.c > + $(COMPILE_C) > + > tools/enc_recon_frame_test$(EXESUF): tools/decode_simple.o > tools/venc_data_dump$(EXESUF): tools/decode_simple.o > tools/scale_slice_test$(EXESUF): tools/decode_simple.o > diff --git a/tools/target_swr_fuzzer.c b/tools/target_swr_fuzzer.c > new file mode 100644 > index 00000000000..f235b5453ec > --- /dev/null > +++ b/tools/target_swr_fuzzer.c > @@ -0,0 +1,161 @@ > +/* > + * Copyright (c) 2024 Michael Niedermayer > + * > + * This file is part of FFmpeg. > + * > + * FFmpeg is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * FFmpeg is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with FFmpeg; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > + */ > + > +#include "config.h" > +#include "libavutil/avassert.h" > +#include "libavutil/avstring.h" > +#include "libavutil/cpu.h" > +#include "libavutil/imgutils.h" > +#include "libavutil/intreadwrite.h" > +#include "libavutil/mem.h" > +#include "libavutil/opt.h" > + > +#include "libavcodec/bytestream.h" > + > +#include "libswresample/swresample.h" > + > +#define SWR_CH_MAX 32 > + > +int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size); > + > +static const enum AVSampleFormat formats[] = { > + AV_SAMPLE_FMT_U8, > + AV_SAMPLE_FMT_U8P, > + AV_SAMPLE_FMT_S16, > + AV_SAMPLE_FMT_S16P, > + AV_SAMPLE_FMT_S32, > + AV_SAMPLE_FMT_S32P, > + AV_SAMPLE_FMT_FLT, > + AV_SAMPLE_FMT_FLTP, > + AV_SAMPLE_FMT_DBL, > + AV_SAMPLE_FMT_DBLP, > +}; > + > +static const AVChannelLayout layouts[]={ Dunno if it matters to save space, but since these are all native layouts you could store the masks here as an array of uint64_t, and use av_channel_layout_from_mask() instead of av_channel_layout_copy() below. > + AV_CHANNEL_LAYOUT_MONO , > + AV_CHANNEL_LAYOUT_STEREO , > + AV_CHANNEL_LAYOUT_2_1 , > + AV_CHANNEL_LAYOUT_SURROUND , > + AV_CHANNEL_LAYOUT_4POINT0 , > + AV_CHANNEL_LAYOUT_2_2 , > + AV_CHANNEL_LAYOUT_QUAD , > + AV_CHANNEL_LAYOUT_5POINT0 , > + AV_CHANNEL_LAYOUT_5POINT1 , > + AV_CHANNEL_LAYOUT_5POINT0_BACK , > + AV_CHANNEL_LAYOUT_5POINT1_BACK , > + AV_CHANNEL_LAYOUT_7POINT0 , > + AV_CHANNEL_LAYOUT_7POINT1 , > + AV_CHANNEL_LAYOUT_7POINT1_WIDE , Add AV_CHANNEL_LAYOUT_22POINT2 too, which is processed as a 9 channels layout. And AV_CHANNEL_LAYOUT_5POINT1POINT2_BACK to test the top channels rematrix code. > +}; > + > +static void setup_array(uint8_t *out[SWR_CH_MAX], uint8_t *in, enum AVSampleFormat format, int samples){ > + if(av_sample_fmt_is_planar(format)){ > + int i; > + int plane_size= av_get_bytes_per_sample(format&0xFF)*samples; > + format&=0xFF; > + for(i=0; i + out[i]= in + i*plane_size; > + } > + }else{ > + out[0]= in; > + } > +} > + > +int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { > + const uint8_t *end = data + size; > + struct SwrContext * swr= NULL; > + AVChannelLayout in_ch_layout = { 0 }, out_ch_layout = { 0 }; > + enum AVSampleFormat in_sample_fmt = AV_SAMPLE_FMT_S16P; > + enum AVSampleFormat out_sample_fmt = AV_SAMPLE_FMT_S16P; > + int in_sample_rate = 44100; > + int out_sample_rate = 44100; > + int in_ch_count, out_ch_count; > + char in_layout_string[256]; > + char out_layout_string[256]; > + uint8_t * ain[SWR_CH_MAX]; > + uint8_t *aout[SWR_CH_MAX]; > + uint8_t *out_data; > + int in_sample_nb; > + int out_sample_nb = size; > + int count; > + > + if (size > 128) { > + GetByteContext gbc; > + int64_t flags64; > + > + size -= 128; > + bytestream2_init(&gbc, data + size, 128); > + in_sample_rate = bytestream2_get_le16(&gbc) + 1; > + out_sample_rate = bytestream2_get_le16(&gbc) + 1; > + in_sample_fmt = formats[bytestream2_get_byte(&gbc) % FF_ARRAY_ELEMS(formats)]; > + out_sample_fmt = formats[bytestream2_get_byte(&gbc) % FF_ARRAY_ELEMS(formats)]; > + av_channel_layout_copy(& in_ch_layout, &layouts[bytestream2_get_byte(&gbc) % FF_ARRAY_ELEMS(layouts)]); > + av_channel_layout_copy(&out_ch_layout, &layouts[bytestream2_get_byte(&gbc) % FF_ARRAY_ELEMS(layouts)]); > + > + out_sample_nb = bytestream2_get_le32(&gbc); > + > + flags64 = bytestream2_get_le64(&gbc); > + if (flags64 & 0x10) > + av_force_cpu_flags(0); > + } else { > + av_channel_layout_copy(& in_ch_layout, &layouts[0]); > + av_channel_layout_copy(&out_ch_layout, &layouts[0]); > + } > + > + in_ch_count= in_ch_layout.nb_channels; > + out_ch_count= out_ch_layout.nb_channels; > + av_channel_layout_describe(& in_ch_layout, in_layout_string, sizeof( in_layout_string)); > + av_channel_layout_describe(&out_ch_layout, out_layout_string, sizeof(out_layout_string)); > + > + fprintf(stderr, "%s %d %s -> %s %d %s\n", > + av_get_sample_fmt_name( in_sample_fmt), in_sample_rate, in_layout_string, > + av_get_sample_fmt_name(out_sample_fmt), out_sample_rate, out_layout_string); > + > + if (swr_alloc_set_opts2(&swr, &out_ch_layout, out_sample_fmt, out_sample_rate, > + &in_ch_layout, in_sample_fmt, in_sample_rate, > + 0, 0) < 0) { > + fprintf(stderr, "Failed swr_alloc_set_opts2()\n"); > + goto end; > + } > + > + if(swr_init(swr) < 0) { > + fprintf(stderr, "Failed swr_init()\n"); > + goto end; > + } > + > + in_sample_nb = size / (in_ch_count * av_get_bytes_per_sample(in_sample_fmt)); > + out_sample_nb = out_sample_nb % (av_rescale(in_sample_nb, 2*out_sample_rate, in_sample_rate) + 1); > + > + out_data = av_malloc(out_sample_nb * out_ch_count * av_get_bytes_per_sample(out_sample_fmt)); > + if (!out_data) > + goto end; > + > + setup_array(ain , (uint8_t*)data, in_sample_fmt, in_sample_nb); > + setup_array(aout, out_data, out_sample_fmt, out_sample_nb); You could use av_samples_alloc() to fill both ain and aout. > + > + count = swr_convert(swr, aout, out_sample_nb, (const uint8_t **)ain, in_sample_nb); > + > + av_freep(&out_data); > + > +end: > + swr_free(&swr); > + > + return 0; > +} _______________________________________________ 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".