On Tue, Jun 11, 2024 at 2:29 PM Ramiro Polla <ramiro.po...@gmail.com> wrote:
>
> ---
> tests/checkasm/Makefile | 2 +-
> tests/checkasm/checkasm.c | 1 +
> tests/checkasm/checkasm.h | 1 +
> tests/checkasm/sw_range_convert.c | 134 ++++++++++++++++++++++++++++++
> 4 files changed, 137 insertions(+), 1 deletion(-)
> create mode 100644 tests/checkasm/sw_range_convert.c
>
> diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile
> index 6eb94d10d5..f20732b37a 100644
> --- a/tests/checkasm/Makefile
> +++ b/tests/checkasm/Makefile
> @@ -63,7 +63,7 @@ AVFILTEROBJS-$(CONFIG_SOBEL_FILTER) += vf_convolution.o
> CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes)
>
> # swscale tests
> -SWSCALEOBJS += sw_gbrp.o sw_rgb.o sw_scale.o
> +SWSCALEOBJS += sw_gbrp.o sw_range_convert.o
> sw_rgb.o sw_scale.o
>
> CHECKASMOBJS-$(CONFIG_SWSCALE) += $(SWSCALEOBJS)
>
> diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
> index 2329e2e1bc..56232ab1e0 100644
> --- a/tests/checkasm/checkasm.c
> +++ b/tests/checkasm/checkasm.c
> @@ -251,6 +251,7 @@ static const struct {
> #endif
> #if CONFIG_SWSCALE
> { "sw_gbrp", checkasm_check_sw_gbrp },
> + { "sw_range_convert", checkasm_check_sw_range_convert },
> { "sw_rgb", checkasm_check_sw_rgb },
> { "sw_scale", checkasm_check_sw_scale },
> #endif
> diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h
> index 211d7f52e6..e544007b67 100644
> --- a/tests/checkasm/checkasm.h
> +++ b/tests/checkasm/checkasm.h
> @@ -119,6 +119,7 @@ void checkasm_check_rv40dsp(void);
> void checkasm_check_svq1enc(void);
> void checkasm_check_synth_filter(void);
> void checkasm_check_sw_gbrp(void);
> +void checkasm_check_sw_range_convert(void);
> void checkasm_check_sw_rgb(void);
> void checkasm_check_sw_scale(void);
> void checkasm_check_takdsp(void);
> diff --git a/tests/checkasm/sw_range_convert.c
> b/tests/checkasm/sw_range_convert.c
> new file mode 100644
> index 0000000000..08029103d1
> --- /dev/null
> +++ b/tests/checkasm/sw_range_convert.c
> @@ -0,0 +1,134 @@
> +/*
> + * 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 <string.h>
> +
> +#include "libavutil/common.h"
> +#include "libavutil/intreadwrite.h"
> +#include "libavutil/mem.h"
> +#include "libavutil/mem_internal.h"
> +
> +#include "libswscale/swscale.h"
> +#include "libswscale/swscale_internal.h"
> +
> +#include "checkasm.h"
> +
> +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;
> +
> + LOCAL_ALIGNED_32(int16_t, dst0, [LARGEST_INPUT_SIZE]);
> + LOCAL_ALIGNED_32(int16_t, dst1, [LARGEST_INPUT_SIZE]);
> +
> + declare_func(void, int16_t *dst, int width);
> +
> + ctx = sws_alloc_context();
> + if (sws_init_context(ctx, NULL, NULL) < 0)
> + fail();
> +
> + ctx->srcFormat = from ? AV_PIX_FMT_YUVJ444P : AV_PIX_FMT_YUV444P;
> + ctx->dstFormat = from ? AV_PIX_FMT_YUV444P : AV_PIX_FMT_YUVJ444P;
> + ctx->srcRange = from;
> + ctx->dstRange = !from;
> +
> + for (int dstWi = 0; dstWi < INPUT_SIZES; dstWi++) {
> + int width = input_sizes[dstWi];
> + for (int i = 0; i < width; i++) {
> + uint8_t r = rnd();
> + dst0[i] = (int16_t) r << 7;
> + dst1[i] = (int16_t) r << 7;
> + }
> + ff_sws_init_scale(ctx);
> + if (check_func(ctx->lumConvertRange, "%s_%d", func_str, width)) {
> + call_ref(dst0, width);
> + call_new(dst1, width);
> + if (memcmp(dst0, dst1, width * sizeof(int16_t)))
> + fail();
> + bench_new(dst1, width);
> + }
> + }
> +
> + 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;
> +
> + LOCAL_ALIGNED_32(int16_t, dstU0, [LARGEST_INPUT_SIZE]);
> + LOCAL_ALIGNED_32(int16_t, dstV0, [LARGEST_INPUT_SIZE]);
> + LOCAL_ALIGNED_32(int16_t, dstU1, [LARGEST_INPUT_SIZE]);
> + LOCAL_ALIGNED_32(int16_t, dstV1, [LARGEST_INPUT_SIZE]);
> +
> + declare_func(void, int16_t *dstU, int16_t *dstV, int width);
> +
> + ctx = sws_alloc_context();
> + if (sws_init_context(ctx, NULL, NULL) < 0)
> + fail();
> +
> + ctx->srcFormat = from ? AV_PIX_FMT_YUVJ444P : AV_PIX_FMT_YUV444P;
> + ctx->dstFormat = from ? AV_PIX_FMT_YUV444P : AV_PIX_FMT_YUVJ444P;
> + ctx->srcRange = from;
> + ctx->dstRange = !from;
> +
> + for (int dstWi = 0; dstWi < INPUT_SIZES; dstWi++) {
> + int width = input_sizes[dstWi];
> + for (int i = 0; i < width; i++) {
> + uint8_t r = rnd();
> + dstU0[i] = (int16_t) r << 7;
> + dstV0[i] = (int16_t) r << 7;
> + dstU1[i] = (int16_t) r << 7;
> + dstV1[i] = (int16_t) r << 7;
> + }
> + ff_sws_init_scale(ctx);
> + if (check_func(ctx->chrConvertRange, "%s_%d", func_str, width)) {
> + call_ref(dstU0, dstV0, width);
> + call_new(dstU1, dstV1, width);
> + if (memcmp(dstU0, dstU1, width * sizeof(int16_t)) ||
> + memcmp(dstV0, dstV1, width * sizeof(int16_t)))
> + fail();
> + bench_new(dstU1, dstV1, width);
> + }
> + }
> +
> + sws_freeContext(ctx);
> +}
> +#undef LARGEST_INPUT_SIZE
> +#undef INPUT_SIZES
> +
> +void checkasm_check_sw_range_convert(void)
> +{
> + check_lumConvertRange(1);
> + report("lumRangeFromJpeg");
> + check_chrConvertRange(1);
> + report("chrRangeFromJpeg");
> + check_lumConvertRange(0);
> + report("lumRangeToJpeg");
> + check_chrConvertRange(0);
> + report("chrRangeToJpeg");
> +}
> --
> 2.30.2
>
I'll apply tomorrow if there are no comments.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
