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 9BD3F4C885 for ; Wed, 7 Aug 2024 17:13:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1C65E68DB45; Wed, 7 Aug 2024 20:13:51 +0300 (EEST) Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7FE8268DA47 for ; Wed, 7 Aug 2024 20:13:44 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id CB4DE20002 for ; Wed, 7 Aug 2024 17:13:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1723050824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=n4EBQeUh4UzStttYGWfERBG4a6VrpiVQS5dKi/Wre9w=; b=SSV/9crfXX0TUtgaIuhkUIXrbb03jNpLdHGxdzr8Ow8X6rncZyqmxLGxEb6CvUzy9jBWF+ UaBJQlPafKdhp2O9JyGGg97LkPfXoS5eD8ej4Bq58lpYDG6e6hIyzjjdc8sJusNxFnOICB WfsYH56ZPUMVVu8C7+Ud0WHPV1zbPPJiTUj6Y8YworGEJR0wQsYAOksK/0dbRmRxdrfgpj lDHJLEvjUdrRZsa1RNupjWujAmx8mHttxHRB5/pEoYynYV9tdjU1IZ/38ZSlnyBuXmEjU/ gVT70QZ0RGatJiQJ1VHw0CFM5abwWLiq67/JeRvFRTaoCIMyJrcly6Sls+cIHQ== Date: Wed, 7 Aug 2024 19:13:43 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20240807171343.GU4991@pb2> References: <20240807155112.1576147-1-michael@niedermayer.cc> MIME-Version: 1.0 In-Reply-To: X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH v2] 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-Type: multipart/mixed; boundary="===============7592937352629571691==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============7592937352629571691== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="dy55e8aolw+8fmws" Content-Disposition: inline --dy55e8aolw+8fmws Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Aug 07, 2024 at 01:05:40PM -0300, James Almer wrote: >=20 >=20 > On 8/7/2024 12:51 PM, Michael Niedermayer wrote: > > Signed-off-by: Michael Niedermayer > > --- > > Makefile | 2 + > > tools/Makefile | 3 + > > tools/target_swr_fuzzer.c | 150 ++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 155 insertions(+) > > create mode 100644 tools/target_swr_fuzzer.c > >=20 > > 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_L= IBS) > > + $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(= LIBFUZZER_PATH) > > tools/enum_options$(EXESUF): ELIBS =3D $(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= =2Ec > > 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..b8af0bad78c > > --- /dev/null > > +++ b/tools/target_swr_fuzzer.c > > @@ -0,0 +1,150 @@ > > +/* > > + * 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[] =3D { > > + 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[]=3D{ > > + 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 , > > + AV_CHANNEL_LAYOUT_22POINT2 , > > + AV_CHANNEL_LAYOUT_5POINT1POINT2_BACK , >=20 > Maybe also AV_CHANNEL_LAYOUT_22POINT2 to ensure the fallback to 7.1(wide)= +BC > in rematrix.c works as intended. added with my time-machiene, can you confirm its in the mail i sent before your reply ? >=20 > > +}; > > + > > +int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { > > + const uint8_t *end =3D data + size; > > + struct SwrContext * swr=3D NULL; > > + AVChannelLayout in_ch_layout =3D { 0 }, out_ch_layout =3D { 0 }; > > + enum AVSampleFormat in_sample_fmt =3D AV_SAMPLE_FMT_S16P; > > + enum AVSampleFormat out_sample_fmt =3D AV_SAMPLE_FMT_S16P; > > + int in_sample_rate =3D 44100; > > + int out_sample_rate =3D 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 =3D size; > > + int count; > > + > > + if (size > 128) { > > + GetByteContext gbc; > > + int64_t flags64; > > + > > + size -=3D 128; > > + bytestream2_init(&gbc, data + size, 128); > > + in_sample_rate =3D bytestream2_get_le16(&gbc) + 1; > > + out_sample_rate =3D bytestream2_get_le16(&gbc) + 1; > > + in_sample_fmt =3D formats[bytestream2_get_byte(&gbc) % FF_AR= RAY_ELEMS(formats)]; > > + out_sample_fmt =3D formats[bytestream2_get_byte(&gbc) % FF_AR= RAY_ELEMS(formats)]; > > + av_channel_layout_copy(& in_ch_layout, &layouts[bytestream2_g= et_byte(&gbc) % FF_ARRAY_ELEMS(layouts)]); > > + av_channel_layout_copy(&out_ch_layout, &layouts[bytestream2_g= et_byte(&gbc) % FF_ARRAY_ELEMS(layouts)]); >=20 > Since you're only using native layouts, you could make the layouts array = be > of uint64_t masks (AV_CH_LAYOUT_*) and use av_channel_layout_from_mask() > here. I still refuse to do this because the fuzzer should have maximal coverage and limiting things to subsets goes against that idea even if the current code is limited to a subset Maybe iam missing something of course, but it simply doesnt seem the right direction >=20 > > + > > + out_sample_nb =3D bytestream2_get_le32(&gbc); > > + > > + flags64 =3D 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]); >=20 > This else chunk can be removed if you initialize both layouts above to > (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO instead. changed >=20 > > + } > > + > > + in_ch_count=3D in_ch_layout.nb_channels; > > + out_ch_count=3D out_ch_layout.nb_channels; > > + av_channel_layout_describe(& in_ch_layout, in_layout_string, size= of( in_layout_string)); > > + av_channel_layout_describe(&out_ch_layout, out_layout_string, size= of(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, o= ut_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) { >=20 > nit: space after the if. changed thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB No snowflake in an avalanche ever feels responsible. -- Voltaire --dy55e8aolw+8fmws Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZrOrQwAKCRBhHseHBAsP q0uHAKCLRAaxUG1fYZGiVqyDuK49MCY+bgCghIFDPE+zj7BqPI8J2VnT1AjVHVE= =8ZvQ -----END PGP SIGNATURE----- --dy55e8aolw+8fmws-- --===============7592937352629571691== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --===============7592937352629571691==--