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 B5D8C4B9CF for ; Wed, 7 Aug 2024 16:05:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E8AB68DB39; Wed, 7 Aug 2024 19:05:43 +0300 (EEST) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF4CD68DAA4 for ; Wed, 7 Aug 2024 19:05:37 +0300 (EEST) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1fc6ee64512so880225ad.0 for ; Wed, 07 Aug 2024 09:05:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723046735; x=1723651535; 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=LZJnkK/LmUFnktZjWfTtaXJ7KIWPS3pGUtSgtIKi9bU=; b=GkWVlM9Nab5htV5jt030sa7Iv426cbJrV1jAv5JQafBrDnonNfvN0/+Dee/cYIFfJm Ez3g/oagtJ6zpeX/30nrCusGEXm4YMoba7393DgY5l3iPUsW4LLQGH35blLwWJmQcNIJ Mv1gMR1bIg8Hi1zyjhci73gETNzcmBxxxcODnorc4NIjeibodI2Ki8kfl/NJmxw76p+N O2Ix0sMm3X9O02BQZ4blmbBoDbMN8K+xflovlJ+vwK3tY+zeiBc3tcm30fp3wP8FQSlz aJldmumn+pguITVerx7/m43A1gZdqClr7EhcWq5EvKTmFOapLz480daKhxcBss0PTHCH lJqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723046735; x=1723651535; 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=LZJnkK/LmUFnktZjWfTtaXJ7KIWPS3pGUtSgtIKi9bU=; b=eiYzNmFCXVsmftHv8YwMtffA5gwWyp9+1oXfAintnx7jw5mS3AJXROwjSaWxgyMZ3M DN7b+TIa3d2ULPCWHrgH2Ul0YRBp/FfP+r3mbcHcnS4jMi/uXNvu5WTVMYYNrLG3VvZB XzOO6hpTPgXjOdy3I6KWyAWFDjIbpxzV5eOPO7+/3hP8qABFD+xsNxFpVLn92X5jXitM xSgyX8DehyTaeV7pImMmtmpONeVhHhwGT93/FKe0+6xAcucim3LURrIXhEmy8EB1edyy R3T9MiZECLkLio1MuZ4CeSDn6LsH264qy/8dxEDZQCeTcskx+U1/tyzQX7QE+Q3j+r8A EK0g== X-Gm-Message-State: AOJu0YzBOVpP90332IT1Yu0ueiQKBstBlP44e0jpGEUMgNtirD7eQQS0 CtDyHFrCweWW9psLiaPjc7fgUxms2W2N/88BEjQbE8i4bNe/F/huYPrgJg== X-Google-Smtp-Source: AGHT+IGP4ngUt6AnZw3bsr6/lgDcspmPvA/qeZTt71CH4c/SWb2fIIGNdQ2UPBy5hktV231T4ec1QQ== X-Received: by 2002:a17:903:120c:b0:1fb:8a61:12b0 with SMTP id d9443c01a7336-1ff574e15edmr193275975ad.54.1723046734976; Wed, 07 Aug 2024 09:05:34 -0700 (PDT) Received: from [192.168.0.14] ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7b763a3fa2asm8671195a12.50.2024.08.07.09.05.33 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 07 Aug 2024 09:05:34 -0700 (PDT) Message-ID: Date: Wed, 7 Aug 2024 13:05:40 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240807155112.1576147-1-michael@niedermayer.cc> Content-Language: en-US From: James Almer In-Reply-To: <20240807155112.1576147-1-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-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 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 > > 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..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[] = { > + 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[]={ > + 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 , Maybe also AV_CHANNEL_LAYOUT_22POINT2 to ensure the fallback to 7.1(wide)+BC in rematrix.c works as intended. > +}; > + > +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)]); 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. > + > + 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]); This else chunk can be removed if you initialize both layouts above to (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO instead. > + } > + > + 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) { nit: space after the if. > + 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; > + > + av_samples_fill_arrays(ain , NULL, data, in_ch_count, in_sample_nb, in_sample_fmt, 1); > + av_samples_fill_arrays(aout, NULL, out_data, out_ch_count, out_sample_nb, out_sample_fmt, 1); > + > + 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".