From: Niklas Haas <ffmpeg@haasn.xyz> To: ffmpeg-devel@ffmpeg.org Cc: Niklas Haas <git@haasn.dev> Subject: [FFmpeg-devel] [PATCH 02/11] tests/swscale: allow testing only unscaled convertors Date: Mon, 17 Mar 2025 11:43:48 +0100 Message-ID: <20250317104357.307832-2-ffmpeg@haasn.xyz> (raw) In-Reply-To: <20250317104357.307832-1-ffmpeg@haasn.xyz> 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".
next prev parent reply other threads:[~2025-03-17 10:44 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2025-03-17 10:43 [FFmpeg-devel] [PATCH 01/11] tests/swscale: allow choosing specific flags and dither mode Niklas Haas 2025-03-17 10:43 ` Niklas Haas [this message] 2025-03-17 10:43 ` [FFmpeg-devel] [PATCH 03/11] tests/swscale: print speedup numbers in color Niklas Haas 2025-03-17 10:43 ` [FFmpeg-devel] [PATCH 04/11] tests/swscale: use yuva444p as reference Niklas Haas 2025-03-17 10:43 ` [FFmpeg-devel] [PATCH 05/11] tests/swscale: switch from MSE to SSIM Niklas Haas 2025-03-17 10:43 ` [FFmpeg-devel] [PATCH 06/11] tests/swscale: print performance stats on exit Niklas Haas 2025-03-17 10:43 ` [FFmpeg-devel] [PATCH 07/11] tests/swscale: check supported inputs for legacy swscale separately Niklas Haas 2025-03-17 10:43 ` [FFmpeg-devel] [PATCH 08/11] tests/swscale: remove stray whitespace in scanf format Niklas Haas 2025-03-17 10:43 ` [FFmpeg-devel] [PATCH 09/11] tests/swscale: calculate theoretical expected SSIM Niklas Haas 2025-03-17 10:53 ` Niklas Haas 2025-03-17 10:43 ` [FFmpeg-devel] [PATCH 10/11] tests/swscale: constrain reference SSIM for low bit depth formats Niklas Haas 2025-03-17 10:43 ` [FFmpeg-devel] [PATCH 11/11] tests/swscale: allow setting log verbosity Niklas Haas
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20250317104357.307832-2-ffmpeg@haasn.xyz \ --to=ffmpeg@haasn.xyz \ --cc=ffmpeg-devel@ffmpeg.org \ --cc=git@haasn.dev \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git