From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 5B9B04944D for ; Wed, 16 Jul 2025 16:26:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id A6B9968E9EC; Wed, 16 Jul 2025 19:25:48 +0300 (EEST) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 6B49668E9DA for ; Wed, 16 Jul 2025 19:25:40 +0300 (EEST) Received: from haasn.dev (unknown [10.30.1.1]) by haasn.dev (Postfix) with UTF8SMTP id 38C4D41849; Wed, 16 Jul 2025 18:25:40 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jul 2025 18:24:56 +0200 Message-ID: <20250716162536.394049-3-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250716162536.394049-1-ffmpeg@haasn.xyz> References: <20250716162536.394049-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/3] tests/checkasm: add check for vf_colordetect 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 Cc: Niklas Haas Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Niklas Haas --- tests/checkasm/Makefile | 1 + tests/checkasm/checkasm.c | 3 + tests/checkasm/checkasm.h | 1 + tests/checkasm/vf_colordetect.c | 137 ++++++++++++++++++++++++++++++++ 4 files changed, 142 insertions(+) create mode 100644 tests/checkasm/vf_colordetect.c diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index afd62d95ba..d8328ecc68 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -55,6 +55,7 @@ CHECKASMOBJS-$(CONFIG_AVCODEC) += $(AVCODECOBJS-yes) AVFILTEROBJS-$(CONFIG_AFIR_FILTER) += af_afir.o AVFILTEROBJS-$(CONFIG_BLEND_FILTER) += vf_blend.o AVFILTEROBJS-$(CONFIG_BWDIF_FILTER) += vf_bwdif.o +AVFILTEROBJS-$(CONFIG_COLORDETECT_FILTER)+= vf_colordetect.o AVFILTEROBJS-$(CONFIG_COLORSPACE_FILTER) += vf_colorspace.o AVFILTEROBJS-$(CONFIG_EQ_FILTER) += vf_eq.o AVFILTEROBJS-$(CONFIG_GBLUR_FILTER) += vf_gblur.o diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c index f4e3d4f433..e01994768e 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -269,6 +269,9 @@ static const struct { #if CONFIG_BWDIF_FILTER { "vf_bwdif", checkasm_check_vf_bwdif }, #endif + #if CONFIG_COLORDETECT_FILTER + { "vf_colordetect", checkasm_check_colordetect }, + #endif #if CONFIG_COLORSPACE_FILTER { "vf_colorspace", checkasm_check_colorspace }, #endif diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index e829942d58..0b3e238318 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -89,6 +89,7 @@ void checkasm_check_av_tx(void); void checkasm_check_blend(void); void checkasm_check_blockdsp(void); void checkasm_check_bswapdsp(void); +void checkasm_check_colordetect(void); void checkasm_check_colorspace(void); void checkasm_check_diracdsp(void); void checkasm_check_exrdsp(void); diff --git a/tests/checkasm/vf_colordetect.c b/tests/checkasm/vf_colordetect.c new file mode 100644 index 0000000000..af02529376 --- /dev/null +++ b/tests/checkasm/vf_colordetect.c @@ -0,0 +1,137 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 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 General Public License for more details. + * + * You should have received a copy of the GNU 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 +#include "checkasm.h" + +#include "libavfilter/vf_colordetect.h" +#include "libavutil/mem_internal.h" + +#define WIDTH 256 +#define HEIGHT 16 +#define STRIDE (WIDTH + 32) + +static void check_range_detect(int depth) +{ + const int mpeg_min = 16 << (depth - 8); + const int mpeg_max = 235 << (depth - 8); + + FFColorDetectDSPContext dsp = {0}; + ff_color_detect_dsp_init(&dsp, depth, AVCOL_RANGE_UNSPECIFIED); + + declare_func(int, const uint8_t *, ptrdiff_t, ptrdiff_t, ptrdiff_t, int, int); + + /* Initialize to 128, which should always return 0 */ + LOCAL_ALIGNED_32(uint8_t, in, [HEIGHT * STRIDE]); + memset(in, 0x80, HEIGHT * STRIDE); + + /* Place an out-of-range value in a random position near the center */ + const int h2 = HEIGHT >> 1; + int idx0 = ((rnd() % h2) + h2) * STRIDE + (rnd() % WIDTH); + if (depth > 8) { + idx0 &= ~1; + in[idx0] = in[idx0 + 1] = 0; + } else { + in[idx0] = 0; + } + + int w = WIDTH; + if (depth > 8) + w /= 2; + + if (check_func(dsp.detect_range, "rangedetect%d", depth)) { + /* Test increasing height, to ensure we hit the placed 0 eventually */ + for (int h = 1; h <= HEIGHT; h++) { + int res_ref = call_ref(in, STRIDE, w, h, mpeg_min, mpeg_max); + int res_new = call_new(in, STRIDE, w, h, mpeg_min, mpeg_max); + if (res_ref != res_new) + fail(); + } + + /* Test performance of base case without any out-of-range values */ + memset(in, 0x80, HEIGHT * STRIDE); + bench_new(in, STRIDE, w, HEIGHT, mpeg_min, mpeg_max); + } +} + +static void check_alpha_detect(int depth, enum AVColorRange range) +{ + const int mpeg_min = 16 << (depth - 8); + const int mpeg_max = 235 << (depth - 8); + const int p = (1 << depth) - 1; + const int q = mpeg_max - mpeg_min; + const int k = mpeg_min * p + 128; + + FFColorDetectDSPContext dsp = {0}; + ff_color_detect_dsp_init(&dsp, depth, range); + + declare_func(int, const uint8_t *, ptrdiff_t, const uint8_t *, ptrdiff_t, + ptrdiff_t, ptrdiff_t, int p, int q, int k); + + LOCAL_ALIGNED_32(uint8_t, luma, [HEIGHT * STRIDE]); + LOCAL_ALIGNED_32(uint8_t, alpha, [HEIGHT * STRIDE]); + memset(luma, 0x80, HEIGHT * STRIDE); + memset(alpha, 0xFF, HEIGHT * STRIDE); + + /* Try and force overflow */ + if (depth > 8 && range == AVCOL_RANGE_MPEG) { + ((uint16_t *) luma)[0] = 235 << (depth - 8); + ((uint16_t *) luma)[1] = 16 << (depth - 8); + } else { + luma[0] = 235; + luma[1] = 16; + } + + /* Place an out-of-range value in a random position near the center */ + const int h2 = HEIGHT >> 1; + int idx0 = ((rnd() % h2) + h2) * STRIDE + (rnd() % WIDTH); + if (depth > 8) { + idx0 &= ~1; + alpha[idx0] = alpha[idx0 + 1] = 0; + } else { + alpha[idx0] = 0; + } + + int w = WIDTH; + if (depth > 8) + w /= 2; + + if (check_func(dsp.detect_alpha, "alphadetect%d_%s", depth, range == AVCOL_RANGE_JPEG ? "full" : "limited")) { + /* Test increasing height, to ensure we hit the placed 0 eventually */ + for (int h = 1; h <= HEIGHT; h++) { + int res_ref = call_ref(luma, STRIDE, alpha, STRIDE, w, h, p, q, k); + int res_new = call_new(luma, STRIDE, alpha, STRIDE, w, h, p, q, k); + if (res_ref != res_new) + fail(); + } + + /* Test performance of base case without any out-of-range values */ + memset(alpha, 0xFF, HEIGHT * STRIDE); + bench_new(luma, STRIDE, alpha, STRIDE, w, HEIGHT, p, q, k); + } +} + +void checkasm_check_colordetect(void) +{ + for (int depth = 8; depth <= 16; depth += 8) { + check_range_detect(depth); + check_alpha_detect(depth, AVCOL_RANGE_JPEG); + check_alpha_detect(depth, AVCOL_RANGE_MPEG); + report("colordetect%d", depth); + } +} -- 2.50.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".