From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 3902E4E81B
for <ffmpegdev@gitmailbox.com>; Mon, 17 Mar 2025 10:44:23 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B02568B1B4;
Mon, 17 Mar 2025 12:44:09 +0200 (EET)
Received: from haasn.dev (haasn.dev [78.46.187.166])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5FEBB687BD0
for <ffmpeg-devel@ffmpeg.org>; Mon, 17 Mar 2025 12:44:01 +0200 (EET)
Received: from haasn.dev (unknown [10.30.1.1])
by haasn.dev (Postfix) with UTF8SMTP id 23E12410B5;
Mon, 17 Mar 2025 11:44:01 +0100 (CET)
From: Niklas Haas <ffmpeg@haasn.xyz>
To: ffmpeg-devel@ffmpeg.org
Date: Mon, 17 Mar 2025 11:43:48 +0100
Message-ID: <20250317104357.307832-2-ffmpeg@haasn.xyz>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <20250317104357.307832-1-ffmpeg@haasn.xyz>
References: <20250317104357.307832-1-ffmpeg@haasn.xyz>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH 02/11] tests/swscale: allow testing only
unscaled convertors
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Niklas Haas <git@haasn.dev>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250317104357.307832-2-ffmpeg@haasn.xyz/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
From: Niklas Haas <git@haasn.dev>
I need this to be able to test the new unscaled conversion code more quickly.
We re-order the flags order to make 0 the first entry, so we don't set any
flags when performing unscaled tests.
---
libswscale/tests/swscale.c | 29 +++++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/libswscale/tests/swscale.c b/libswscale/tests/swscale.c
index 0027139154..bdfea4e761 100644
--- a/libswscale/tests/swscale.c
+++ b/libswscale/tests/swscale.c
@@ -49,6 +49,7 @@ struct options {
int bench;
int flags;
int dither;
+ int unscaled;
};
struct mode {
@@ -57,6 +58,7 @@ struct mode {
};
const SwsFlags flags[] = {
+ 0, // test defaults
SWS_FAST_BILINEAR,
SWS_BILINEAR,
SWS_BICUBIC,
@@ -64,7 +66,6 @@ const SwsFlags flags[] = {
SWS_POINT,
SWS_AREA | SWS_ACCURATE_RND,
SWS_BICUBIC | SWS_FULL_CHR_H_INT | SWS_FULL_CHR_H_INP,
- 0, // test defaults
};
static FFSFC64 prng_state;
@@ -255,6 +256,12 @@ static int run_test(enum AVPixelFormat src_fmt, enum AVPixelFormat dst_fmt,
return ret;
}
+static inline int fmt_is_subsampled(enum AVPixelFormat fmt)
+{
+ return av_pix_fmt_desc_get(fmt)->log2_chroma_w != 0 ||
+ av_pix_fmt_desc_get(fmt)->log2_chroma_h != 0;
+}
+
static int run_self_tests(const AVFrame *ref, struct options opts)
{
const int dst_w[] = { opts.w, opts.w - opts.w / 3, opts.w + opts.w / 3 };
@@ -272,13 +279,17 @@ static int run_self_tests(const AVFrame *ref, struct options opts)
dst_fmt_min = dst_fmt_max = opts.dst_fmt;
for (src_fmt = src_fmt_min; src_fmt <= src_fmt_max; src_fmt++) {
+ if (opts.unscaled && fmt_is_subsampled(src_fmt))
+ continue;
if (!sws_test_format(src_fmt, 0) || !sws_test_format(src_fmt, 1))
continue;
for (dst_fmt = dst_fmt_min; dst_fmt <= dst_fmt_max; dst_fmt++) {
+ if (opts.unscaled && fmt_is_subsampled(dst_fmt))
+ continue;
if (!sws_test_format(dst_fmt, 0) || !sws_test_format(dst_fmt, 1))
continue;
- for (int h = 0; h < FF_ARRAY_ELEMS(dst_h); h++)
- for (int w = 0; w < FF_ARRAY_ELEMS(dst_w); w++)
+ for (int h = 0; h < FF_ARRAY_ELEMS(dst_h); h++) {
+ for (int w = 0; w < FF_ARRAY_ELEMS(dst_w); w++) {
for (int f = 0; f < FF_ARRAY_ELEMS(flags); f++) {
struct mode mode = {
.flags = opts.flags >= 0 ? opts.flags : flags[f],
@@ -292,9 +303,15 @@ static int run_self_tests(const AVFrame *ref, struct options opts)
mode, opts, ref, NULL) < 0)
return -1;
- if (opts.flags >= 0)
+ if (opts.flags >= 0 || opts.unscaled)
break;
}
+ if (opts.unscaled)
+ break;
+ }
+ if (opts.unscaled)
+ break;
+ }
}
}
@@ -384,6 +401,8 @@ int main(int argc, char **argv)
" Test with a specific combination of flags\n"
" -dither <mode>\n"
" Test with a specific dither mode\n"
+ " -unscaled <1 or 0>\n"
+ " If 1, test only conversions that do not involve scaling\n"
" -threads <threads>\n"
" Use the specified number of threads\n"
" -cpuflags <cpuflags>\n"
@@ -429,6 +448,8 @@ int main(int argc, char **argv)
opts.flags = atoi(argv[i + 1]);
} else if (!strcmp(argv[i], "-dither")) {
opts.dither = atoi(argv[i + 1]);
+ } else if (!strcmp(argv[i], "-unscaled")) {
+ opts.unscaled = atoi(argv[i + 1]);
} else if (!strcmp(argv[i], "-threads")) {
opts.threads = atoi(argv[i + 1]);
} else if (!strcmp(argv[i], "-p")) {
--
2.48.1
_______________________________________________
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".