From patchwork Mon Sep 23 12:40:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramiro Polla X-Patchwork-Id: 51751 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp2472979vqb; Mon, 23 Sep 2024 06:59:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXyuoTXYWkHobpfI8m79CmfShrVY8Q3nl3GYDadCRq08ExezUyY5dpjk7N/iBPudhg+3QeukWU025YYV4zogHn2@gmail.com X-Google-Smtp-Source: AGHT+IFZg2mKU0vy/KyAfkc73P+Lpb/mnNK5V3vaqO3CDpGtpnUryTS87cRVtzpf4P1TBsngI+Lv X-Received: by 2002:a17:907:96ac:b0:a83:70d0:7a1e with SMTP id a640c23a62f3a-a90d50d5606mr516055566b.9.1727099961807; Mon, 23 Sep 2024 06:59:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727099961; cv=none; d=google.com; s=arc-20240605; b=ahiDlh4z7alB9IWVy/iYcn8q7bl2Mzuy5aQKoS0rRjUSCpRz2EegFXfwKWv+v6NZiw xodVTzs+3idL6wGdh620beAR0JvMjYxix10v+4EXwsP7Syqe1OyyV4lx9NOWU1Q0ded8 QsqZQveVD58NBtQCBNH+C7gR4jUVX67wmLX5tabMX34OzG7Si81ZX3u9uaGPlXAB9MM5 s3MrUWCztITWazPnsT4xuO8hEp6U+BoanLyx/CyYa5BSVy6GQOHJytmRjrJrOgAj1p24 5bIQ80CP4r07/IEEUucimeHXCK0A7th58jLWQhJaCv8dDNa6glIuIGfOg/MzbJDo1S25 H/Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=W4Z0n6guOWtHJ+LI+eAh8X4jAAmLznpSm/NDXpOfC0U=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=jKtQjNE6j0a1JJij3a2rwmBcGH3NJPRIuS3ZH6BbGez73uyE1nJ5+F49mK8s52uf5/ 11cTrdnEezMjK4T80ws5gphy/RoZJEfy+N0FoOtsdZIoPnDN9dAm3s+rXiEo07oX8mhT CzSmdpngX5FI/w66wZ8/EE/rf1T3BdBn/hBWgv0NcLeMu8LoAgLmaJo930XOu4wct2En hpqx8OGIKpkVOWbi/F4esl73nP/yWVQDDA7zMDen0RS1eJnbYOA7KvPUngBtJIkbnyss s0QKJ2eKiqG6jWB278GQNE58iuzN8sEYGkHlXkFp5KTxqXQL2xkUrMQrP4rer1MMaJM6 mjqw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=bkomun0M; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a906133aa9dsi1367330566b.862.2024.09.23.06.59.21; Mon, 23 Sep 2024 06:59:21 -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=@gmail.com header.s=20230601 header.b=bkomun0M; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 379CE68DB7F; Mon, 23 Sep 2024 15:40:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 892F768DB14 for ; Mon, 23 Sep 2024 15:40:26 +0300 (EEST) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4280ca0791bso41835405e9.1 for ; Mon, 23 Sep 2024 05:40:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727095225; x=1727700025; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=hj2ZaAAwlAHWZL6XXbManNIrNgfl7WD5aTdM3Qnyp8E=; b=bkomun0MZrOTtRd08DBrmaF5y2ot6zF2A0KZFaryychbkzOk2+0Mnuq8u8Z8/sAf/S xKknP3rzxrMrVn0ofWTppEQdMFJmVEHbtx9XJcdZHnjSRpjN9jPngO1ynZM24iZX2LLt cUeUlmWcPZ34cgFSaiC5X7AppV7x9idu1sqaotuWCrRaiGs2R8fEg7Pvi8wQudkjDEPV ECNHw3FqSZV1LM4Z+tnHJHWs8oOUAef6Mr5tpyjZkl4CBYsvgr6zPfkgTMu+bHnK0DwC CUecIDpWRxj/aEUUzG6GQSDiB0yPpdNBqUY0jhz4aEJO+2tMxrzTLpdDgl6rT1TSgQ2U lorw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727095225; x=1727700025; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hj2ZaAAwlAHWZL6XXbManNIrNgfl7WD5aTdM3Qnyp8E=; b=JPjOJ3RQAbZjaQnNctQlGk8NZjixbF9Jd5rcrYkum92+8lzaM2KrkLhjwf9qidT/qw IZgUndZofW1JHtzPrRGRDWfqxqfmCzAU2ZmP3j8MQyihMisrS2eu0Z4ucAB5rE2LZuL5 bdZHUITv0V01s0LkAdFjwoq5d2iVBYEMNN6HL+4Q1NadesBQc7bUlxE0+o0Lct+JMtCc 7Y2kNjFBDFdNFeXmbKlch35YhXHXVcj/Wz1RzEktxLxuTZKHX2LTN/gv7U9HkqEVcp1s IyKOQ4NNOAwgoXUUzMxCDqzw82AgnQtF1xzE3rksnSDlRwtlKVVQtTo1yH9S1vtgAc4b +d0w== X-Gm-Message-State: AOJu0YyJ5OawdSIvijtj61BQb5wJoeRpU0cnPlisIPQDVGHHVmEs2AT/ qeyqtO/whtx5QqkUOszi75B9IwCJUOBwFk57Xx2LAUrfAGhmmhS5ko17nQ== X-Received: by 2002:adf:ea46:0:b0:377:205f:c494 with SMTP id ffacd0b85a97d-37a4312b321mr6434466f8f.11.1727095225203; Mon, 23 Sep 2024 05:40:25 -0700 (PDT) Received: from localhost.localdomain (213.95-240-81.adsl-dyn.isp.belgacom.be. [81.240.95.213]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-378e71f0683sm24424345f8f.13.2024.09.23.05.40.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Sep 2024 05:40:24 -0700 (PDT) From: Ramiro Polla To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Sep 2024 14:40:07 +0200 Message-Id: <20240923124017.33659-5-ramiro.polla@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240923124017.33659-1-ramiro.polla@gmail.com> References: <20240923124017.33659-1-ramiro.polla@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/14] checkasm: use FF_ARRAY_ELEMS instead of hardcoding size of arrays 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: Cfohy8+dRYvw --- tests/checkasm/sw_gbrp.c | 15 ++++----------- tests/checkasm/sw_range_convert.c | 8 ++------ tests/checkasm/sw_scale.c | 11 ++++------- 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/tests/checkasm/sw_gbrp.c b/tests/checkasm/sw_gbrp.c index d843730f3e..744dfb9dab 100644 --- a/tests/checkasm/sw_gbrp.c +++ b/tests/checkasm/sw_gbrp.c @@ -71,7 +71,6 @@ static void check_output_yuv2gbrp(void) #define FILTER_SIZES 4 static const int filter_sizes[] = {1, 4, 8, 16}; #define LARGEST_INPUT_SIZE 512 -#define INPUT_SIZES 6 static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; uint8_t *dst0[4]; uint8_t *dst1[4]; @@ -138,7 +137,7 @@ static void check_output_yuv2gbrp(void) for (fmi = 0; fmi < FF_ARRAY_ELEMS(planar_fmts); fmi++) { for (fsi = 0; fsi < FILTER_SIZES; fsi++) { - for (isi = 0; isi < INPUT_SIZES; isi++ ) { + for (isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); isi++ ) { desc = av_pix_fmt_desc_get(planar_fmts[fmi]); ctx->dstFormat = planar_fmts[fmi]; @@ -185,7 +184,6 @@ static void check_output_yuv2gbrp(void) } #undef LARGEST_INPUT_SIZE -#undef INPUT_SIZES static void check_input_planar_rgb_to_y(void) { @@ -194,7 +192,6 @@ static void check_input_planar_rgb_to_y(void) int fmi, isi; int dstW, byte_size; #define LARGEST_INPUT_SIZE 512 -#define INPUT_SIZES 6 static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; const uint8_t *src[4]; int32_t rgb2yuv[9] = {0}; @@ -226,7 +223,7 @@ static void check_input_planar_rgb_to_y(void) fail(); for (fmi = 0; fmi < FF_ARRAY_ELEMS(planar_fmts); fmi++) { - for (isi = 0; isi < INPUT_SIZES; isi++ ) { + for (isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); isi++ ) { desc = av_pix_fmt_desc_get(planar_fmts[fmi]); ctx->srcFormat = planar_fmts[fmi]; ctx->dstFormat = AV_PIX_FMT_YUVA444P16; @@ -253,7 +250,6 @@ static void check_input_planar_rgb_to_y(void) } #undef LARGEST_INPUT_SIZE -#undef INPUT_SIZES static void check_input_planar_rgb_to_uv(void) { @@ -262,7 +258,6 @@ static void check_input_planar_rgb_to_uv(void) int fmi, isi; int dstW, byte_size; #define LARGEST_INPUT_SIZE 512 -#define INPUT_SIZES 6 static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; const uint8_t *src[4]; int32_t rgb2yuv[9] = {0}; @@ -297,7 +292,7 @@ static void check_input_planar_rgb_to_uv(void) fail(); for (fmi = 0; fmi < FF_ARRAY_ELEMS(planar_fmts); fmi++) { - for (isi = 0; isi < INPUT_SIZES; isi++ ) { + for (isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); isi++ ) { desc = av_pix_fmt_desc_get(planar_fmts[fmi]); ctx->srcFormat = planar_fmts[fmi]; ctx->dstFormat = AV_PIX_FMT_YUVA444P16; @@ -326,7 +321,6 @@ static void check_input_planar_rgb_to_uv(void) } #undef LARGEST_INPUT_SIZE -#undef INPUT_SIZES static void check_input_planar_rgb_to_a(void) { @@ -335,7 +329,6 @@ static void check_input_planar_rgb_to_a(void) int fmi, isi; int dstW, byte_size; #define LARGEST_INPUT_SIZE 512 -#define INPUT_SIZES 6 static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; const uint8_t *src[4]; int32_t rgb2yuv[9] = {0}; @@ -367,7 +360,7 @@ static void check_input_planar_rgb_to_a(void) fail(); for (fmi = 0; fmi < FF_ARRAY_ELEMS(planar_fmts); fmi++) { - for (isi = 0; isi < INPUT_SIZES; isi++ ) { + for (isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); isi++ ) { desc = av_pix_fmt_desc_get(planar_fmts[fmi]); if (!(desc->flags & AV_PIX_FMT_FLAG_ALPHA)) continue; diff --git a/tests/checkasm/sw_range_convert.c b/tests/checkasm/sw_range_convert.c index 08029103d1..1f04988097 100644 --- a/tests/checkasm/sw_range_convert.c +++ b/tests/checkasm/sw_range_convert.c @@ -32,7 +32,6 @@ static void check_lumConvertRange(int from) { const char *func_str = from ? "lumRangeFromJpeg" : "lumRangeToJpeg"; #define LARGEST_INPUT_SIZE 512 -#define INPUT_SIZES 6 static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; struct SwsContext *ctx; @@ -50,7 +49,7 @@ static void check_lumConvertRange(int from) ctx->srcRange = from; ctx->dstRange = !from; - for (int dstWi = 0; dstWi < INPUT_SIZES; dstWi++) { + for (int dstWi = 0; dstWi < FF_ARRAY_ELEMS(input_sizes); dstWi++) { int width = input_sizes[dstWi]; for (int i = 0; i < width; i++) { uint8_t r = rnd(); @@ -70,13 +69,11 @@ static void check_lumConvertRange(int from) sws_freeContext(ctx); } #undef LARGEST_INPUT_SIZE -#undef INPUT_SIZES static void check_chrConvertRange(int from) { const char *func_str = from ? "chrRangeFromJpeg" : "chrRangeToJpeg"; #define LARGEST_INPUT_SIZE 512 -#define INPUT_SIZES 6 static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; struct SwsContext *ctx; @@ -96,7 +93,7 @@ static void check_chrConvertRange(int from) ctx->srcRange = from; ctx->dstRange = !from; - for (int dstWi = 0; dstWi < INPUT_SIZES; dstWi++) { + for (int dstWi = 0; dstWi < FF_ARRAY_ELEMS(input_sizes); dstWi++) { int width = input_sizes[dstWi]; for (int i = 0; i < width; i++) { uint8_t r = rnd(); @@ -119,7 +116,6 @@ static void check_chrConvertRange(int from) sws_freeContext(ctx); } #undef LARGEST_INPUT_SIZE -#undef INPUT_SIZES void checkasm_check_sw_range_convert(void) { diff --git a/tests/checkasm/sw_scale.c b/tests/checkasm/sw_scale.c index 32a5d1c1ac..ba4ce2f26b 100644 --- a/tests/checkasm/sw_scale.c +++ b/tests/checkasm/sw_scale.c @@ -104,7 +104,6 @@ static void check_yuv2yuv1(int accurate) int dstW, offset; size_t fail_offset; const int input_sizes[] = {8, 24, 128, 144, 256, 512}; - const int INPUT_SIZES = sizeof(input_sizes)/sizeof(input_sizes[0]); #define LARGEST_INPUT_SIZE 512 const int offsets[] = {0, 3, 8, 11, 16, 19}; @@ -129,7 +128,7 @@ static void check_yuv2yuv1(int accurate) fail(); ff_sws_init_scale(ctx); - for (isi = 0; isi < INPUT_SIZES; ++isi) { + for (isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); ++isi) { dstW = input_sizes[isi]; for (osi = 0; osi < OFFSET_SIZES; osi++) { offset = offsets[osi]; @@ -168,7 +167,6 @@ static void check_yuv2yuvX(int accurate) const int FILTER_SIZES = sizeof(filter_sizes)/sizeof(filter_sizes[0]); #define LARGEST_INPUT_SIZE 512 static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; - const int INPUT_SIZES = sizeof(input_sizes)/sizeof(input_sizes[0]); const char *accurate_str = (accurate) ? "accurate" : "approximate"; declare_func_emms(AV_CPU_FLAG_MMX, void, const int16_t *filter, @@ -195,7 +193,7 @@ static void check_yuv2yuvX(int accurate) fail(); ff_sws_init_scale(ctx); - for(isi = 0; isi < INPUT_SIZES; ++isi){ + for(isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); ++isi){ dstW = input_sizes[isi]; for(osi = 0; osi < 64; osi += 16){ if (dstW <= osi) @@ -270,8 +268,7 @@ static void check_hscale(void) }; #define LARGEST_INPUT_SIZE 512 -#define INPUT_SIZES 6 - static const int input_sizes[INPUT_SIZES] = {8, 24, 128, 144, 256, 512}; + static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; int i, j, fsi, hpi, width, dstWi; struct SwsContext *ctx; @@ -301,7 +298,7 @@ static void check_hscale(void) for (hpi = 0; hpi < HSCALE_PAIRS; hpi++) { for (fsi = 0; fsi < FILTER_SIZES; fsi++) { - for (dstWi = 0; dstWi < INPUT_SIZES; dstWi++) { + for (dstWi = 0; dstWi < FF_ARRAY_ELEMS(input_sizes); dstWi++) { width = filter_sizes[fsi]; ctx->srcBpc = hscale_pairs[hpi][0];