* [FFmpeg-devel] [PATCH 1/5] checkasm/sw_rgb: test rgb24 to yuv
@ 2024-06-04 13:55 Zhao Zhili
2024-06-04 13:58 ` James Almer
2024-06-05 15:39 ` Rémi Denis-Courmont
0 siblings, 2 replies; 6+ messages in thread
From: Zhao Zhili @ 2024-06-04 13:55 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Zhao Zhili
From: Zhao Zhili <zhilizhao@tencent.com>
---
tests/checkasm/sw_rgb.c | 103 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 103 insertions(+)
diff --git a/tests/checkasm/sw_rgb.c b/tests/checkasm/sw_rgb.c
index 7cd815e5be..cc9b957461 100644
--- a/tests/checkasm/sw_rgb.c
+++ b/tests/checkasm/sw_rgb.c
@@ -24,6 +24,8 @@
#include "libavutil/mem_internal.h"
#include "libswscale/rgb2rgb.h"
+#include "libswscale/swscale.h"
+#include "libswscale/swscale_internal.h"
#include "checkasm.h"
@@ -179,8 +181,89 @@ static void check_interleave_bytes(void)
}
}
+#define MAX_LINE_SIZE 1920
+
+static void check_rgb_to_y(struct SwsContext *ctx)
+{
+ static const int input_sizes[] = {8, 128, 1280, 1080, MAX_LINE_SIZE};
+
+ LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]);
+ LOCAL_ALIGNED_32(uint8_t, dst0_y, [MAX_LINE_SIZE * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst1_y, [MAX_LINE_SIZE * 2]);
+
+ declare_func(void, uint8_t *dst, const uint8_t *src,
+ const uint8_t *unused1, const uint8_t *unused2, int width,
+ uint32_t *rgb2yuv, void *opq);
+
+ randomize_buffers(src, MAX_LINE_SIZE * 3);
+
+ for (int i = 0; i < FF_ARRAY_ELEMS(input_sizes); i++) {
+ int w = input_sizes[i];
+
+ if (check_func(ctx->lumToYV12, "rgb24_to_y_%d", w)) {
+ memset(dst0_y, 0xFA, MAX_LINE_SIZE * 2);
+ memset(dst1_y, 0xFA, MAX_LINE_SIZE * 2);
+
+ call_ref(dst0_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL);
+ call_new(dst1_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL);
+
+ if (memcmp(dst0_y, dst1_y, w * 2))
+ fail();
+
+ bench_new(dst1_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL);
+ }
+ }
+}
+
+static void check_rgb_to_uv(struct SwsContext *ctx)
+{
+ static const int input_sizes[] = {8, 128, 1280, 1080, MAX_LINE_SIZE};
+
+ LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]);
+ LOCAL_ALIGNED_32(uint8_t, dst0_u, [MAX_LINE_SIZE * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst0_v, [MAX_LINE_SIZE * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst1_u, [MAX_LINE_SIZE * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst1_v, [MAX_LINE_SIZE * 2]);
+
+ declare_func(void, uint8_t *dstU, uint8_t *dstV,
+ const uint8_t *src1, const uint8_t *src2, const uint8_t *src3,
+ int width, uint32_t *pal, void *opq);
+
+ randomize_buffers(src, MAX_LINE_SIZE * 3);
+
+ for (int i = 0; i < 2; i++) {
+ ctx->chrSrcHSubSample = i ? 1 : 0;
+ ctx->srcFormat = AV_PIX_FMT_RGB24;
+ ctx->dstFormat = i ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_YUV444P;
+ ff_sws_init_scale(ctx);
+
+ for (int j = 0; j < FF_ARRAY_ELEMS(input_sizes); j++) {
+ int w = input_sizes[j] >> i;
+
+ if (check_func(ctx->chrToYV12, "rgb24_to_uv%s_%d", i ? "_half" : "", w)) {
+ memset(dst0_u, 0xFF, MAX_LINE_SIZE * 2);
+ memset(dst0_v, 0xFF, MAX_LINE_SIZE * 2);
+ memset(dst1_u, 0xFF, MAX_LINE_SIZE * 2);
+ memset(dst1_v, 0xFF, MAX_LINE_SIZE * 2);
+
+ call_ref(dst0_u, dst0_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL);
+ call_new(dst1_u, dst1_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL);
+
+ if (memcmp(dst0_u, dst1_u, w * 2) || memcmp(dst0_v, dst1_v, w * 2))
+ fail();
+
+ bench_new(dst1_u, dst1_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL);
+ }
+ }
+ }
+}
+
void checkasm_check_sw_rgb(void)
{
+ struct SwsContext *ctx;
+ int *inv_table, *table;
+ int in_full, out_full, brightness, contrast, saturation;
+
ff_sws_rgb2rgb_init();
check_shuffle_bytes(shuffle_bytes_2103, "shuffle_bytes_2103");
@@ -203,4 +286,24 @@ void checkasm_check_sw_rgb(void)
check_interleave_bytes();
report("interleave_bytes");
+
+ ctx = sws_getContext(MAX_LINE_SIZE, MAX_LINE_SIZE, AV_PIX_FMT_RGB24,
+ MAX_LINE_SIZE, MAX_LINE_SIZE, AV_PIX_FMT_YUV420P,
+ SWS_ACCURATE_RND | SWS_BITEXACT, NULL, NULL, NULL);
+ if (!ctx)
+ fail();
+
+ sws_getColorspaceDetails(ctx, &inv_table, &in_full,
+ &table, &out_full,
+ &brightness, &contrast, &saturation);
+ sws_setColorspaceDetails(ctx, inv_table, in_full,
+ table, out_full,
+ brightness, contrast, saturation);
+ check_rgb_to_y(ctx);
+ report("rgb_to_y");
+
+ check_rgb_to_uv(ctx);
+ report("rgb_to_uv");
+
+ sws_freeContext(ctx);
}
--
2.42.0
_______________________________________________
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".
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [FFmpeg-devel] [PATCH 1/5] checkasm/sw_rgb: test rgb24 to yuv
2024-06-04 13:55 [FFmpeg-devel] [PATCH 1/5] checkasm/sw_rgb: test rgb24 to yuv Zhao Zhili
@ 2024-06-04 13:58 ` James Almer
2024-06-04 14:06 ` Zhao Zhili
2024-06-05 15:39 ` Rémi Denis-Courmont
1 sibling, 1 reply; 6+ messages in thread
From: James Almer @ 2024-06-04 13:58 UTC (permalink / raw)
To: ffmpeg-devel
On 6/4/2024 10:55 AM, Zhao Zhili wrote:
> From: Zhao Zhili <zhilizhao@tencent.com>
>
> ---
> tests/checkasm/sw_rgb.c | 103 ++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 103 insertions(+)
>
> diff --git a/tests/checkasm/sw_rgb.c b/tests/checkasm/sw_rgb.c
> index 7cd815e5be..cc9b957461 100644
> --- a/tests/checkasm/sw_rgb.c
> +++ b/tests/checkasm/sw_rgb.c
> @@ -24,6 +24,8 @@
> #include "libavutil/mem_internal.h"
>
> #include "libswscale/rgb2rgb.h"
> +#include "libswscale/swscale.h"
> +#include "libswscale/swscale_internal.h"
>
> #include "checkasm.h"
>
> @@ -179,8 +181,89 @@ static void check_interleave_bytes(void)
> }
> }
>
> +#define MAX_LINE_SIZE 1920
> +
> +static void check_rgb_to_y(struct SwsContext *ctx)
> +{
> + static const int input_sizes[] = {8, 128, 1280, 1080, MAX_LINE_SIZE};
> +
> + LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]);
> + LOCAL_ALIGNED_32(uint8_t, dst0_y, [MAX_LINE_SIZE * 2]);
> + LOCAL_ALIGNED_32(uint8_t, dst1_y, [MAX_LINE_SIZE * 2]);
> +
> + declare_func(void, uint8_t *dst, const uint8_t *src,
> + const uint8_t *unused1, const uint8_t *unused2, int width,
> + uint32_t *rgb2yuv, void *opq);
> +
> + randomize_buffers(src, MAX_LINE_SIZE * 3);
> +
> + for (int i = 0; i < FF_ARRAY_ELEMS(input_sizes); i++) {
> + int w = input_sizes[i];
> +
> + if (check_func(ctx->lumToYV12, "rgb24_to_y_%d", w)) {
> + memset(dst0_y, 0xFA, MAX_LINE_SIZE * 2);
> + memset(dst1_y, 0xFA, MAX_LINE_SIZE * 2);
> +
> + call_ref(dst0_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL);
> + call_new(dst1_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL);
> +
> + if (memcmp(dst0_y, dst1_y, w * 2))
> + fail();
> +
> + bench_new(dst1_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL);
> + }
> + }
> +}
> +
> +static void check_rgb_to_uv(struct SwsContext *ctx)
> +{
> + static const int input_sizes[] = {8, 128, 1280, 1080, MAX_LINE_SIZE};
> +
> + LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]);
> + LOCAL_ALIGNED_32(uint8_t, dst0_u, [MAX_LINE_SIZE * 2]);
> + LOCAL_ALIGNED_32(uint8_t, dst0_v, [MAX_LINE_SIZE * 2]);
> + LOCAL_ALIGNED_32(uint8_t, dst1_u, [MAX_LINE_SIZE * 2]);
> + LOCAL_ALIGNED_32(uint8_t, dst1_v, [MAX_LINE_SIZE * 2]);
> +
> + declare_func(void, uint8_t *dstU, uint8_t *dstV,
> + const uint8_t *src1, const uint8_t *src2, const uint8_t *src3,
> + int width, uint32_t *pal, void *opq);
> +
> + randomize_buffers(src, MAX_LINE_SIZE * 3);
> +
> + for (int i = 0; i < 2; i++) {
> + ctx->chrSrcHSubSample = i ? 1 : 0;
> + ctx->srcFormat = AV_PIX_FMT_RGB24;
> + ctx->dstFormat = i ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_YUV444P;
> + ff_sws_init_scale(ctx);
> +
> + for (int j = 0; j < FF_ARRAY_ELEMS(input_sizes); j++) {
> + int w = input_sizes[j] >> i;
> +
> + if (check_func(ctx->chrToYV12, "rgb24_to_uv%s_%d", i ? "_half" : "", w)) {
> + memset(dst0_u, 0xFF, MAX_LINE_SIZE * 2);
> + memset(dst0_v, 0xFF, MAX_LINE_SIZE * 2);
> + memset(dst1_u, 0xFF, MAX_LINE_SIZE * 2);
> + memset(dst1_v, 0xFF, MAX_LINE_SIZE * 2);
> +
> + call_ref(dst0_u, dst0_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL);
> + call_new(dst1_u, dst1_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL);
> +
> + if (memcmp(dst0_u, dst1_u, w * 2) || memcmp(dst0_v, dst1_v, w * 2))
> + fail();
> +
> + bench_new(dst1_u, dst1_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL);
> + }
> + }
> + }
> +}
> +
> void checkasm_check_sw_rgb(void)
> {
> + struct SwsContext *ctx;
> + int *inv_table, *table;
> + int in_full, out_full, brightness, contrast, saturation;
> +
> ff_sws_rgb2rgb_init();
>
> check_shuffle_bytes(shuffle_bytes_2103, "shuffle_bytes_2103");
> @@ -203,4 +286,24 @@ void checkasm_check_sw_rgb(void)
>
> check_interleave_bytes();
> report("interleave_bytes");
> +
> + ctx = sws_getContext(MAX_LINE_SIZE, MAX_LINE_SIZE, AV_PIX_FMT_RGB24,
> + MAX_LINE_SIZE, MAX_LINE_SIZE, AV_PIX_FMT_YUV420P,
> + SWS_ACCURATE_RND | SWS_BITEXACT, NULL, NULL, NULL);
> + if (!ctx)
> + fail();
> +
> + sws_getColorspaceDetails(ctx, &inv_table, &in_full,
> + &table, &out_full,
> + &brightness, &contrast, &saturation);
> + sws_setColorspaceDetails(ctx, inv_table, in_full,
> + table, out_full,
> + brightness, contrast, saturation);
Isn't this pointless? It looks like you're setting the context with
values taken from the same context.
> + check_rgb_to_y(ctx);
> + report("rgb_to_y");
> +
> + check_rgb_to_uv(ctx);
> + report("rgb_to_uv");
> +
> + sws_freeContext(ctx);
> }
_______________________________________________
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".
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [FFmpeg-devel] [PATCH 1/5] checkasm/sw_rgb: test rgb24 to yuv
2024-06-04 13:58 ` James Almer
@ 2024-06-04 14:06 ` Zhao Zhili
2024-06-05 15:37 ` James Almer
0 siblings, 1 reply; 6+ messages in thread
From: Zhao Zhili @ 2024-06-04 14:06 UTC (permalink / raw)
To: FFmpeg development discussions and patches
> On Jun 4, 2024, at 21:58, James Almer <jamrial@gmail.com> wrote:
>
> On 6/4/2024 10:55 AM, Zhao Zhili wrote:
>> From: Zhao Zhili <zhilizhao@tencent.com>
>> ---
>> tests/checkasm/sw_rgb.c | 103 ++++++++++++++++++++++++++++++++++++++++
>> 1 file changed, 103 insertions(+)
>> diff --git a/tests/checkasm/sw_rgb.c b/tests/checkasm/sw_rgb.c
>> index 7cd815e5be..cc9b957461 100644
>> --- a/tests/checkasm/sw_rgb.c
>> +++ b/tests/checkasm/sw_rgb.c
>> @@ -24,6 +24,8 @@
>> #include "libavutil/mem_internal.h"
>> #include "libswscale/rgb2rgb.h"
>> +#include "libswscale/swscale.h"
>> +#include "libswscale/swscale_internal.h"
>> #include "checkasm.h"
>> @@ -179,8 +181,89 @@ static void check_interleave_bytes(void)
>> }
>> }
>> +#define MAX_LINE_SIZE 1920
>> +
>> +static void check_rgb_to_y(struct SwsContext *ctx)
>> +{
>> + static const int input_sizes[] = {8, 128, 1280, 1080, MAX_LINE_SIZE};
>> +
>> + LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]);
>> + LOCAL_ALIGNED_32(uint8_t, dst0_y, [MAX_LINE_SIZE * 2]);
>> + LOCAL_ALIGNED_32(uint8_t, dst1_y, [MAX_LINE_SIZE * 2]);
>> +
>> + declare_func(void, uint8_t *dst, const uint8_t *src,
>> + const uint8_t *unused1, const uint8_t *unused2, int width,
>> + uint32_t *rgb2yuv, void *opq);
>> +
>> + randomize_buffers(src, MAX_LINE_SIZE * 3);
>> +
>> + for (int i = 0; i < FF_ARRAY_ELEMS(input_sizes); i++) {
>> + int w = input_sizes[i];
>> +
>> + if (check_func(ctx->lumToYV12, "rgb24_to_y_%d", w)) {
>> + memset(dst0_y, 0xFA, MAX_LINE_SIZE * 2);
>> + memset(dst1_y, 0xFA, MAX_LINE_SIZE * 2);
>> +
>> + call_ref(dst0_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL);
>> + call_new(dst1_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL);
>> +
>> + if (memcmp(dst0_y, dst1_y, w * 2))
>> + fail();
>> +
>> + bench_new(dst1_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL);
>> + }
>> + }
>> +}
>> +
>> +static void check_rgb_to_uv(struct SwsContext *ctx)
>> +{
>> + static const int input_sizes[] = {8, 128, 1280, 1080, MAX_LINE_SIZE};
>> +
>> + LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]);
>> + LOCAL_ALIGNED_32(uint8_t, dst0_u, [MAX_LINE_SIZE * 2]);
>> + LOCAL_ALIGNED_32(uint8_t, dst0_v, [MAX_LINE_SIZE * 2]);
>> + LOCAL_ALIGNED_32(uint8_t, dst1_u, [MAX_LINE_SIZE * 2]);
>> + LOCAL_ALIGNED_32(uint8_t, dst1_v, [MAX_LINE_SIZE * 2]);
>> +
>> + declare_func(void, uint8_t *dstU, uint8_t *dstV,
>> + const uint8_t *src1, const uint8_t *src2, const uint8_t *src3,
>> + int width, uint32_t *pal, void *opq);
>> +
>> + randomize_buffers(src, MAX_LINE_SIZE * 3);
>> +
>> + for (int i = 0; i < 2; i++) {
>> + ctx->chrSrcHSubSample = i ? 1 : 0;
>> + ctx->srcFormat = AV_PIX_FMT_RGB24;
>> + ctx->dstFormat = i ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_YUV444P;
>> + ff_sws_init_scale(ctx);
>> +
>> + for (int j = 0; j < FF_ARRAY_ELEMS(input_sizes); j++) {
>> + int w = input_sizes[j] >> i;
>> +
>> + if (check_func(ctx->chrToYV12, "rgb24_to_uv%s_%d", i ? "_half" : "", w)) {
>> + memset(dst0_u, 0xFF, MAX_LINE_SIZE * 2);
>> + memset(dst0_v, 0xFF, MAX_LINE_SIZE * 2);
>> + memset(dst1_u, 0xFF, MAX_LINE_SIZE * 2);
>> + memset(dst1_v, 0xFF, MAX_LINE_SIZE * 2);
>> +
>> + call_ref(dst0_u, dst0_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL);
>> + call_new(dst1_u, dst1_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL);
>> +
>> + if (memcmp(dst0_u, dst1_u, w * 2) || memcmp(dst0_v, dst1_v, w * 2))
>> + fail();
>> +
>> + bench_new(dst1_u, dst1_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL);
>> + }
>> + }
>> + }
>> +}
>> +
>> void checkasm_check_sw_rgb(void)
>> {
>> + struct SwsContext *ctx;
>> + int *inv_table, *table;
>> + int in_full, out_full, brightness, contrast, saturation;
>> +
>> ff_sws_rgb2rgb_init();
>> check_shuffle_bytes(shuffle_bytes_2103, "shuffle_bytes_2103");
>> @@ -203,4 +286,24 @@ void checkasm_check_sw_rgb(void)
>> check_interleave_bytes();
>> report("interleave_bytes");
>> +
>> + ctx = sws_getContext(MAX_LINE_SIZE, MAX_LINE_SIZE, AV_PIX_FMT_RGB24,
>> + MAX_LINE_SIZE, MAX_LINE_SIZE, AV_PIX_FMT_YUV420P,
>> + SWS_ACCURATE_RND | SWS_BITEXACT, NULL, NULL, NULL);
>> + if (!ctx)
>> + fail();
>> +
>> + sws_getColorspaceDetails(ctx, &inv_table, &in_full,
>> + &table, &out_full,
>> + &brightness, &contrast, &saturation);
>> + sws_setColorspaceDetails(ctx, inv_table, in_full,
>> + table, out_full,
>> + brightness, contrast, saturation);
>
> Isn't this pointless? It looks like you're setting the context with values taken from the same context.
Yes, will remove in next version.
>
>> + check_rgb_to_y(ctx);
>> + report("rgb_to_y");
>> +
>> + check_rgb_to_uv(ctx);
>> + report("rgb_to_uv");
>> +
>> + sws_freeContext(ctx);
>> }
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org <mailto:ffmpeg-devel@ffmpeg.org>
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org <mailto:ffmpeg-devel-request@ffmpeg.org> with subject "unsubscribe".
_______________________________________________
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".
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [FFmpeg-devel] [PATCH 1/5] checkasm/sw_rgb: test rgb24 to yuv
2024-06-04 14:06 ` Zhao Zhili
@ 2024-06-05 15:37 ` James Almer
0 siblings, 0 replies; 6+ messages in thread
From: James Almer @ 2024-06-05 15:37 UTC (permalink / raw)
To: ffmpeg-devel
On 6/4/2024 11:06 AM, Zhao Zhili wrote:
>
>
>> On Jun 4, 2024, at 21:58, James Almer <jamrial@gmail.com> wrote:
>>
>> On 6/4/2024 10:55 AM, Zhao Zhili wrote:
>>> From: Zhao Zhili <zhilizhao@tencent.com>
>>> ---
>>> tests/checkasm/sw_rgb.c | 103 ++++++++++++++++++++++++++++++++++++++++
>>> 1 file changed, 103 insertions(+)
>>> diff --git a/tests/checkasm/sw_rgb.c b/tests/checkasm/sw_rgb.c
>>> index 7cd815e5be..cc9b957461 100644
>>> --- a/tests/checkasm/sw_rgb.c
>>> +++ b/tests/checkasm/sw_rgb.c
>>> @@ -24,6 +24,8 @@
>>> #include "libavutil/mem_internal.h"
>>> #include "libswscale/rgb2rgb.h"
>>> +#include "libswscale/swscale.h"
>>> +#include "libswscale/swscale_internal.h"
>>> #include "checkasm.h"
>>> @@ -179,8 +181,89 @@ static void check_interleave_bytes(void)
>>> }
>>> }
>>> +#define MAX_LINE_SIZE 1920
>>> +
>>> +static void check_rgb_to_y(struct SwsContext *ctx)
>>> +{
>>> + static const int input_sizes[] = {8, 128, 1280, 1080, MAX_LINE_SIZE};
>>> +
>>> + LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]);
>>> + LOCAL_ALIGNED_32(uint8_t, dst0_y, [MAX_LINE_SIZE * 2]);
>>> + LOCAL_ALIGNED_32(uint8_t, dst1_y, [MAX_LINE_SIZE * 2]);
>>> +
>>> + declare_func(void, uint8_t *dst, const uint8_t *src,
>>> + const uint8_t *unused1, const uint8_t *unused2, int width,
>>> + uint32_t *rgb2yuv, void *opq);
>>> +
>>> + randomize_buffers(src, MAX_LINE_SIZE * 3);
>>> +
>>> + for (int i = 0; i < FF_ARRAY_ELEMS(input_sizes); i++) {
>>> + int w = input_sizes[i];
>>> +
>>> + if (check_func(ctx->lumToYV12, "rgb24_to_y_%d", w)) {
>>> + memset(dst0_y, 0xFA, MAX_LINE_SIZE * 2);
>>> + memset(dst1_y, 0xFA, MAX_LINE_SIZE * 2);
>>> +
>>> + call_ref(dst0_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL);
>>> + call_new(dst1_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL);
>>> +
>>> + if (memcmp(dst0_y, dst1_y, w * 2))
>>> + fail();
>>> +
>>> + bench_new(dst1_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table, NULL);
>>> + }
>>> + }
>>> +}
>>> +
>>> +static void check_rgb_to_uv(struct SwsContext *ctx)
>>> +{
>>> + static const int input_sizes[] = {8, 128, 1280, 1080, MAX_LINE_SIZE};
>>> +
>>> + LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]);
>>> + LOCAL_ALIGNED_32(uint8_t, dst0_u, [MAX_LINE_SIZE * 2]);
>>> + LOCAL_ALIGNED_32(uint8_t, dst0_v, [MAX_LINE_SIZE * 2]);
>>> + LOCAL_ALIGNED_32(uint8_t, dst1_u, [MAX_LINE_SIZE * 2]);
>>> + LOCAL_ALIGNED_32(uint8_t, dst1_v, [MAX_LINE_SIZE * 2]);
>>> +
>>> + declare_func(void, uint8_t *dstU, uint8_t *dstV,
>>> + const uint8_t *src1, const uint8_t *src2, const uint8_t *src3,
>>> + int width, uint32_t *pal, void *opq);
>>> +
>>> + randomize_buffers(src, MAX_LINE_SIZE * 3);
>>> +
>>> + for (int i = 0; i < 2; i++) {
>>> + ctx->chrSrcHSubSample = i ? 1 : 0;
>>> + ctx->srcFormat = AV_PIX_FMT_RGB24;
>>> + ctx->dstFormat = i ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_YUV444P;
>>> + ff_sws_init_scale(ctx);
>>> +
>>> + for (int j = 0; j < FF_ARRAY_ELEMS(input_sizes); j++) {
>>> + int w = input_sizes[j] >> i;
>>> +
>>> + if (check_func(ctx->chrToYV12, "rgb24_to_uv%s_%d", i ? "_half" : "", w)) {
>>> + memset(dst0_u, 0xFF, MAX_LINE_SIZE * 2);
>>> + memset(dst0_v, 0xFF, MAX_LINE_SIZE * 2);
>>> + memset(dst1_u, 0xFF, MAX_LINE_SIZE * 2);
>>> + memset(dst1_v, 0xFF, MAX_LINE_SIZE * 2);
>>> +
>>> + call_ref(dst0_u, dst0_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL);
>>> + call_new(dst1_u, dst1_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL);
>>> +
>>> + if (memcmp(dst0_u, dst1_u, w * 2) || memcmp(dst0_v, dst1_v, w * 2))
>>> + fail();
>>> +
>>> + bench_new(dst1_u, dst1_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL);
>>> + }
>>> + }
>>> + }
>>> +}
>>> +
>>> void checkasm_check_sw_rgb(void)
>>> {
>>> + struct SwsContext *ctx;
>>> + int *inv_table, *table;
>>> + int in_full, out_full, brightness, contrast, saturation;
>>> +
>>> ff_sws_rgb2rgb_init();
>>> check_shuffle_bytes(shuffle_bytes_2103, "shuffle_bytes_2103");
>>> @@ -203,4 +286,24 @@ void checkasm_check_sw_rgb(void)
>>> check_interleave_bytes();
>>> report("interleave_bytes");
>>> +
>>> + ctx = sws_getContext(MAX_LINE_SIZE, MAX_LINE_SIZE, AV_PIX_FMT_RGB24,
>>> + MAX_LINE_SIZE, MAX_LINE_SIZE, AV_PIX_FMT_YUV420P,
>>> + SWS_ACCURATE_RND | SWS_BITEXACT, NULL, NULL, NULL);
>>> + if (!ctx)
>>> + fail();
>>> +
>>> + sws_getColorspaceDetails(ctx, &inv_table, &in_full,
>>> + &table, &out_full,
>>> + &brightness, &contrast, &saturation);
>>> + sws_setColorspaceDetails(ctx, inv_table, in_full,
>>> + table, out_full,
>>> + brightness, contrast, saturation);
>>
>> Isn't this pointless? It looks like you're setting the context with values taken from the same context.
>
> Yes, will remove in next version.
Will you send a new version with other changes, or just this? If the
latter, i can amend it and push it now.
_______________________________________________
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".
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/5] checkasm/sw_rgb: test rgb24 to yuv
2024-06-04 13:55 [FFmpeg-devel] [PATCH 1/5] checkasm/sw_rgb: test rgb24 to yuv Zhao Zhili
2024-06-04 13:58 ` James Almer
@ 2024-06-05 15:39 ` Rémi Denis-Courmont
2024-06-05 17:34 ` [FFmpeg-devel] [PATCH v2 1/5] checkasm/sw_rgb: test rgb24/bgr24 " Zhao Zhili
1 sibling, 1 reply; 6+ messages in thread
From: Rémi Denis-Courmont @ 2024-06-05 15:39 UTC (permalink / raw)
To: ffmpeg-devel
Le tiistaina 4. kesäkuuta 2024, 16.55.00 EEST Zhao Zhili a écrit :
> From: Zhao Zhili <zhilizhao@tencent.com>
>
> ---
> tests/checkasm/sw_rgb.c | 103 ++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 103 insertions(+)
>
> diff --git a/tests/checkasm/sw_rgb.c b/tests/checkasm/sw_rgb.c
> index 7cd815e5be..cc9b957461 100644
> --- a/tests/checkasm/sw_rgb.c
> +++ b/tests/checkasm/sw_rgb.c
> @@ -24,6 +24,8 @@
> #include "libavutil/mem_internal.h"
>
> #include "libswscale/rgb2rgb.h"
> +#include "libswscale/swscale.h"
> +#include "libswscale/swscale_internal.h"
>
> #include "checkasm.h"
>
> @@ -179,8 +181,89 @@ static void check_interleave_bytes(void)
> }
> }
>
> +#define MAX_LINE_SIZE 1920
> +
> +static void check_rgb_to_y(struct SwsContext *ctx)
> +{
> + static const int input_sizes[] = {8, 128, 1280, 1080, MAX_LINE_SIZE};
> +
> + LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]);
> + LOCAL_ALIGNED_32(uint8_t, dst0_y, [MAX_LINE_SIZE * 2]);
> + LOCAL_ALIGNED_32(uint8_t, dst1_y, [MAX_LINE_SIZE * 2]);
> +
> + declare_func(void, uint8_t *dst, const uint8_t *src,
> + const uint8_t *unused1, const uint8_t *unused2, int width,
> + uint32_t *rgb2yuv, void *opq);
> +
> + randomize_buffers(src, MAX_LINE_SIZE * 3);
> +
> + for (int i = 0; i < FF_ARRAY_ELEMS(input_sizes); i++) {
> + int w = input_sizes[i];
> +
> + if (check_func(ctx->lumToYV12, "rgb24_to_y_%d", w)) {
> + memset(dst0_y, 0xFA, MAX_LINE_SIZE * 2);
> + memset(dst1_y, 0xFA, MAX_LINE_SIZE * 2);
> +
> + call_ref(dst0_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table,
> NULL); + call_new(dst1_y, src, NULL, NULL, w,
> ctx->input_rgb2yuv_table, NULL); +
> + if (memcmp(dst0_y, dst1_y, w * 2))
> + fail();
> +
> + bench_new(dst1_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table,
> NULL); + }
> + }
> +}
> +
> +static void check_rgb_to_uv(struct SwsContext *ctx)
> +{
> + static const int input_sizes[] = {8, 128, 1280, 1080, MAX_LINE_SIZE};
> +
> + LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]);
> + LOCAL_ALIGNED_32(uint8_t, dst0_u, [MAX_LINE_SIZE * 2]);
> + LOCAL_ALIGNED_32(uint8_t, dst0_v, [MAX_LINE_SIZE * 2]);
> + LOCAL_ALIGNED_32(uint8_t, dst1_u, [MAX_LINE_SIZE * 2]);
> + LOCAL_ALIGNED_32(uint8_t, dst1_v, [MAX_LINE_SIZE * 2]);
> +
> + declare_func(void, uint8_t *dstU, uint8_t *dstV,
> + const uint8_t *src1, const uint8_t *src2, const uint8_t
> *src3, + int width, uint32_t *pal, void *opq);
> +
> + randomize_buffers(src, MAX_LINE_SIZE * 3);
> +
> + for (int i = 0; i < 2; i++) {
> + ctx->chrSrcHSubSample = i ? 1 : 0;
> + ctx->srcFormat = AV_PIX_FMT_RGB24;
> + ctx->dstFormat = i ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_YUV444P;
> + ff_sws_init_scale(ctx);
Given the loop is there, wouldn't it be trivial to also test BGR24 ? (maybe
skipping benchmarks)
> +
> + for (int j = 0; j < FF_ARRAY_ELEMS(input_sizes); j++) {
> + int w = input_sizes[j] >> i;
> +
> + if (check_func(ctx->chrToYV12, "rgb24_to_uv%s_%d", i ? "_half"
> : "", w)) { + memset(dst0_u, 0xFF, MAX_LINE_SIZE * 2);
> + memset(dst0_v, 0xFF, MAX_LINE_SIZE * 2);
> + memset(dst1_u, 0xFF, MAX_LINE_SIZE * 2);
> + memset(dst1_v, 0xFF, MAX_LINE_SIZE * 2);
> +
> + call_ref(dst0_u, dst0_v, NULL, src, src, w,
> ctx->input_rgb2yuv_table, NULL); + call_new(dst1_u, dst1_v,
> NULL, src, src, w, ctx->input_rgb2yuv_table, NULL); +
> + if (memcmp(dst0_u, dst1_u, w * 2) || memcmp(dst0_v, dst1_v,
> w * 2)) + fail();
> +
> + bench_new(dst1_u, dst1_v, NULL, src, src, w,
> ctx->input_rgb2yuv_table, NULL); + }
> + }
> + }
> +}
> +
> void checkasm_check_sw_rgb(void)
> {
> + struct SwsContext *ctx;
> + int *inv_table, *table;
> + int in_full, out_full, brightness, contrast, saturation;
> +
> ff_sws_rgb2rgb_init();
>
> check_shuffle_bytes(shuffle_bytes_2103, "shuffle_bytes_2103");
> @@ -203,4 +286,24 @@ void checkasm_check_sw_rgb(void)
>
> check_interleave_bytes();
> report("interleave_bytes");
> +
> + ctx = sws_getContext(MAX_LINE_SIZE, MAX_LINE_SIZE, AV_PIX_FMT_RGB24,
> + MAX_LINE_SIZE, MAX_LINE_SIZE, AV_PIX_FMT_YUV420P,
> + SWS_ACCURATE_RND | SWS_BITEXACT, NULL, NULL,
> NULL); + if (!ctx)
> + fail();
> +
> + sws_getColorspaceDetails(ctx, &inv_table, &in_full,
> + &table, &out_full,
> + &brightness, &contrast, &saturation);
> + sws_setColorspaceDetails(ctx, inv_table, in_full,
> + table, out_full,
> + brightness, contrast, saturation);
> + check_rgb_to_y(ctx);
> + report("rgb_to_y");
> +
> + check_rgb_to_uv(ctx);
> + report("rgb_to_uv");
> +
> + sws_freeContext(ctx);
> }
--
雷米‧德尼-库尔蒙
http://www.remlab.net/
_______________________________________________
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".
^ permalink raw reply [flat|nested] 6+ messages in thread* [FFmpeg-devel] [PATCH v2 1/5] checkasm/sw_rgb: test rgb24/bgr24 to yuv
2024-06-05 15:39 ` Rémi Denis-Courmont
@ 2024-06-05 17:34 ` Zhao Zhili
0 siblings, 0 replies; 6+ messages in thread
From: Zhao Zhili @ 2024-06-05 17:34 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Zhao Zhili
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 5491 bytes --]
From: Zhao Zhili <zhilizhao@tencent.com>
The line width 8 is supposed to test corner case, while the
performance doesn't matter. Width 1080 is also a case of
unaligned to 16.
Width 1920 meant for benchmark (together with --runs options).
---
v2: add bgr24 support
Feel free to remove 128 and/or 1280 from input_sizes if you think it's
redundant.
I'm still working on patch 2-5. Send patch 1/5 because James and Rémi'
patches depend on this.
tests/checkasm/sw_rgb.c | 113 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 113 insertions(+)
diff --git a/tests/checkasm/sw_rgb.c b/tests/checkasm/sw_rgb.c
index 7cd815e5be..06d27f9235 100644
--- a/tests/checkasm/sw_rgb.c
+++ b/tests/checkasm/sw_rgb.c
@@ -22,8 +22,11 @@
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/mem_internal.h"
+#include "libavutil/pixdesc.h"
#include "libswscale/rgb2rgb.h"
+#include "libswscale/swscale.h"
+#include "libswscale/swscale_internal.h"
#include "checkasm.h"
@@ -179,8 +182,104 @@ static void check_interleave_bytes(void)
}
}
+#define MAX_LINE_SIZE 1920
+static const int input_sizes[] = {8, 128, 1280, 1080, MAX_LINE_SIZE};
+static const enum AVPixelFormat rgb_formats[] = {
+ AV_PIX_FMT_RGB24,
+ AV_PIX_FMT_BGR24,
+};
+
+static void check_rgb_to_y(struct SwsContext *ctx)
+{
+ LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]);
+ LOCAL_ALIGNED_32(uint8_t, dst0_y, [MAX_LINE_SIZE * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst1_y, [MAX_LINE_SIZE * 2]);
+
+ declare_func(void, uint8_t *dst, const uint8_t *src,
+ const uint8_t *unused1, const uint8_t *unused2, int width,
+ uint32_t *rgb2yuv, void *opq);
+
+ randomize_buffers(src, MAX_LINE_SIZE * 3);
+
+ for (int i = 0; i < FF_ARRAY_ELEMS(rgb_formats); i++) {
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(rgb_formats[i]);
+
+ ctx->srcFormat = rgb_formats[i];
+ ctx->dstFormat = AV_PIX_FMT_YUV420P;
+ ff_sws_init_scale(ctx);
+
+ for (int j = 0; j < FF_ARRAY_ELEMS(input_sizes); j++) {
+ int w = input_sizes[j];
+
+ if (check_func(ctx->lumToYV12, "%s_to_y_%d", desc->name, w)) {
+ memset(dst0_y, 0xFA, MAX_LINE_SIZE * 2);
+ memset(dst1_y, 0xFA, MAX_LINE_SIZE * 2);
+
+ call_ref(dst0_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table,
+ NULL);
+ call_new(dst1_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table,
+ NULL);
+
+ if (memcmp(dst0_y, dst1_y, w * 2))
+ fail();
+
+ bench_new(dst1_y, src, NULL, NULL, w, ctx->input_rgb2yuv_table,
+ NULL);
+ }
+ }
+ }
+}
+
+static void check_rgb_to_uv(struct SwsContext *ctx)
+{
+ LOCAL_ALIGNED_32(uint8_t, src, [MAX_LINE_SIZE * 3]);
+ LOCAL_ALIGNED_32(uint8_t, dst0_u, [MAX_LINE_SIZE * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst0_v, [MAX_LINE_SIZE * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst1_u, [MAX_LINE_SIZE * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst1_v, [MAX_LINE_SIZE * 2]);
+
+ declare_func(void, uint8_t *dstU, uint8_t *dstV,
+ const uint8_t *src1, const uint8_t *src2, const uint8_t *src3,
+ int width, uint32_t *pal, void *opq);
+
+ randomize_buffers(src, MAX_LINE_SIZE * 3);
+
+ for (int i = 0; i < 2 * FF_ARRAY_ELEMS(rgb_formats); i++) {
+ enum AVPixelFormat src_fmt = rgb_formats[i / 2];
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(src_fmt);
+
+ ctx->chrSrcHSubSample = (i % 2) ? 0 : 1;
+ ctx->srcFormat = src_fmt;
+ ctx->dstFormat = ctx->chrSrcHSubSample ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_YUV444P;
+ ff_sws_init_scale(ctx);
+
+ for (int j = 0; j < FF_ARRAY_ELEMS(input_sizes); j++) {
+ int w = input_sizes[j] >> ctx->chrSrcHSubSample;
+
+ if (check_func(ctx->chrToYV12, "%s_to_uv%s_%d", desc->name,
+ ctx->chrSrcHSubSample ? "_half" : "",
+ input_sizes[j])) {
+ memset(dst0_u, 0xFF, MAX_LINE_SIZE * 2);
+ memset(dst0_v, 0xFF, MAX_LINE_SIZE * 2);
+ memset(dst1_u, 0xFF, MAX_LINE_SIZE * 2);
+ memset(dst1_v, 0xFF, MAX_LINE_SIZE * 2);
+
+ call_ref(dst0_u, dst0_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL);
+ call_new(dst1_u, dst1_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL);
+
+ if (memcmp(dst0_u, dst1_u, w * 2) || memcmp(dst0_v, dst1_v, w * 2))
+ fail();
+
+ bench_new(dst1_u, dst1_v, NULL, src, src, w, ctx->input_rgb2yuv_table, NULL);
+ }
+ }
+ }
+}
+
void checkasm_check_sw_rgb(void)
{
+ struct SwsContext *ctx;
+
ff_sws_rgb2rgb_init();
check_shuffle_bytes(shuffle_bytes_2103, "shuffle_bytes_2103");
@@ -203,4 +302,18 @@ void checkasm_check_sw_rgb(void)
check_interleave_bytes();
report("interleave_bytes");
+
+ ctx = sws_getContext(MAX_LINE_SIZE, MAX_LINE_SIZE, AV_PIX_FMT_RGB24,
+ MAX_LINE_SIZE, MAX_LINE_SIZE, AV_PIX_FMT_YUV420P,
+ SWS_ACCURATE_RND | SWS_BITEXACT, NULL, NULL, NULL);
+ if (!ctx)
+ fail();
+
+ check_rgb_to_y(ctx);
+ report("rgb_to_y");
+
+ check_rgb_to_uv(ctx);
+ report("rgb_to_uv");
+
+ sws_freeContext(ctx);
}
--
2.42.0
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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".
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-06-05 17:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-04 13:55 [FFmpeg-devel] [PATCH 1/5] checkasm/sw_rgb: test rgb24 to yuv Zhao Zhili
2024-06-04 13:58 ` James Almer
2024-06-04 14:06 ` Zhao Zhili
2024-06-05 15:37 ` James Almer
2024-06-05 15:39 ` Rémi Denis-Courmont
2024-06-05 17:34 ` [FFmpeg-devel] [PATCH v2 1/5] checkasm/sw_rgb: test rgb24/bgr24 " Zhao Zhili
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