October 2024 - ffmpeg-cvslog - lists.ffmpeg.org

checkasm/sw_range_convert: use YUV pixel formats instead of YUVJ
by Ramiro Polla 27 Oct '24

27 Oct '24

ffmpeg | branch: master | Ramiro Polla <ramiro.polla(a)gmail.com> | Wed Sep 18 13:45:17 2024 +0200| [d1acd68d73bea1d9a480cc9c6ebd6d9b60e57892] | committer: Ramiro Polla checkasm/sw_range_convert: use YUV pixel formats instead of YUVJ We are already setting the range, so we can use regular YUV pixel formats instead of YUVJ. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d1acd68d73bea1d9a… --- tests/checkasm/sw_range_convert.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/checkasm/sw_range_convert.c b/tests/checkasm/sw_range_convert.c index 06ea3474e4..005a732f85 100644 --- a/tests/checkasm/sw_range_convert.c +++ b/tests/checkasm/sw_range_convert.c @@ -46,8 +46,8 @@ static void check_lumConvertRange(int from) fail(); c = sws_internal(sws); - c->srcFormat = from ? AV_PIX_FMT_YUVJ444P : AV_PIX_FMT_YUV444P; - c->dstFormat = from ? AV_PIX_FMT_YUV444P : AV_PIX_FMT_YUVJ444P; + c->srcFormat = AV_PIX_FMT_YUV444P; + c->dstFormat = AV_PIX_FMT_YUV444P; c->srcRange = from; c->dstRange = !from; @@ -92,8 +92,8 @@ static void check_chrConvertRange(int from) fail(); c = sws_internal(sws); - c->srcFormat = from ? AV_PIX_FMT_YUVJ444P : AV_PIX_FMT_YUV444P; - c->dstFormat = from ? AV_PIX_FMT_YUV444P : AV_PIX_FMT_YUVJ444P; + c->srcFormat = AV_PIX_FMT_YUV444P; + c->dstFormat = AV_PIX_FMT_YUV444P; c->srcRange = from; c->dstRange = !from;

1 0

checkasm: use FF_ARRAY_ELEMS instead of hardcoding size of arrays
by Ramiro Polla 27 Oct '24

27 Oct '24

ffmpeg | branch: master | Ramiro Polla <ramiro.polla(a)gmail.com> | Wed Sep 18 16:29:14 2024 +0200| [a8ef1fac0dfa9d64ba47fd6c4a307e2d4acb218f] | committer: Ramiro Polla checkasm: use FF_ARRAY_ELEMS instead of hardcoding size of arrays > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8ef1fac0dfa9d64b… --- tests/checkasm/sw_gbrp.c | 15 ++++----------- tests/checkasm/sw_range_convert.c | 8 ++------ tests/checkasm/sw_scale.c | 11 ++++------- 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/tests/checkasm/sw_gbrp.c b/tests/checkasm/sw_gbrp.c index 039be8006b..23ac1dfb56 100644 --- a/tests/checkasm/sw_gbrp.c +++ b/tests/checkasm/sw_gbrp.c @@ -72,7 +72,6 @@ static void check_output_yuv2gbrp(void) #define FILTER_SIZES 4 static const int filter_sizes[] = {1, 4, 8, 16}; #define LARGEST_INPUT_SIZE 512 -#define INPUT_SIZES 6 static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; uint8_t *dst0[4]; uint8_t *dst1[4]; @@ -140,7 +139,7 @@ static void check_output_yuv2gbrp(void) for (fmi = 0; fmi < FF_ARRAY_ELEMS(planar_fmts); fmi++) { for (fsi = 0; fsi < FILTER_SIZES; fsi++) { - for (isi = 0; isi < INPUT_SIZES; isi++ ) { + for (isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); isi++ ) { desc = av_pix_fmt_desc_get(planar_fmts[fmi]); c->dstFormat = planar_fmts[fmi]; @@ -187,7 +186,6 @@ static void check_output_yuv2gbrp(void) } #undef LARGEST_INPUT_SIZE -#undef INPUT_SIZES static void check_input_planar_rgb_to_y(void) { @@ -197,7 +195,6 @@ static void check_input_planar_rgb_to_y(void) int fmi, isi; int dstW, byte_size; #define LARGEST_INPUT_SIZE 512 -#define INPUT_SIZES 6 static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; const uint8_t *src[4]; int32_t rgb2yuv[9] = {0}; @@ -230,7 +227,7 @@ static void check_input_planar_rgb_to_y(void) c = sws_internal(sws); for (fmi = 0; fmi < FF_ARRAY_ELEMS(planar_fmts); fmi++) { - for (isi = 0; isi < INPUT_SIZES; isi++ ) { + for (isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); isi++ ) { desc = av_pix_fmt_desc_get(planar_fmts[fmi]); c->srcFormat = planar_fmts[fmi]; c->dstFormat = AV_PIX_FMT_YUVA444P16; @@ -257,7 +254,6 @@ static void check_input_planar_rgb_to_y(void) } #undef LARGEST_INPUT_SIZE -#undef INPUT_SIZES static void check_input_planar_rgb_to_uv(void) { @@ -267,7 +263,6 @@ static void check_input_planar_rgb_to_uv(void) int fmi, isi; int dstW, byte_size; #define LARGEST_INPUT_SIZE 512 -#define INPUT_SIZES 6 static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; const uint8_t *src[4]; int32_t rgb2yuv[9] = {0}; @@ -303,7 +298,7 @@ static void check_input_planar_rgb_to_uv(void) c = sws_internal(sws); for (fmi = 0; fmi < FF_ARRAY_ELEMS(planar_fmts); fmi++) { - for (isi = 0; isi < INPUT_SIZES; isi++ ) { + for (isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); isi++ ) { desc = av_pix_fmt_desc_get(planar_fmts[fmi]); c->srcFormat = planar_fmts[fmi]; c->dstFormat = AV_PIX_FMT_YUVA444P16; @@ -332,7 +327,6 @@ static void check_input_planar_rgb_to_uv(void) } #undef LARGEST_INPUT_SIZE -#undef INPUT_SIZES static void check_input_planar_rgb_to_a(void) { @@ -342,7 +336,6 @@ static void check_input_planar_rgb_to_a(void) int fmi, isi; int dstW, byte_size; #define LARGEST_INPUT_SIZE 512 -#define INPUT_SIZES 6 static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; const uint8_t *src[4]; int32_t rgb2yuv[9] = {0}; @@ -375,7 +368,7 @@ static void check_input_planar_rgb_to_a(void) c = sws_internal(sws); for (fmi = 0; fmi < FF_ARRAY_ELEMS(planar_fmts); fmi++) { - for (isi = 0; isi < INPUT_SIZES; isi++ ) { + for (isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); isi++ ) { desc = av_pix_fmt_desc_get(planar_fmts[fmi]); if (!(desc->flags & AV_PIX_FMT_FLAG_ALPHA)) continue; diff --git a/tests/checkasm/sw_range_convert.c b/tests/checkasm/sw_range_convert.c index 7da29b896e..06ea3474e4 100644 --- a/tests/checkasm/sw_range_convert.c +++ b/tests/checkasm/sw_range_convert.c @@ -32,7 +32,6 @@ 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}; SwsContext *sws; SwsInternal *c; @@ -52,7 +51,7 @@ static void check_lumConvertRange(int from) c->srcRange = from; c->dstRange = !from; - for (int dstWi = 0; dstWi < INPUT_SIZES; dstWi++) { + for (int dstWi = 0; dstWi < FF_ARRAY_ELEMS(input_sizes); dstWi++) { int width = input_sizes[dstWi]; for (int i = 0; i < width; i++) { uint8_t r = rnd(); @@ -72,13 +71,11 @@ static void check_lumConvertRange(int from) sws_freeContext(sws); } #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}; SwsContext *sws; SwsInternal *c; @@ -100,7 +97,7 @@ static void check_chrConvertRange(int from) c->srcRange = from; c->dstRange = !from; - for (int dstWi = 0; dstWi < INPUT_SIZES; dstWi++) { + for (int dstWi = 0; dstWi < FF_ARRAY_ELEMS(input_sizes); dstWi++) { int width = input_sizes[dstWi]; for (int i = 0; i < width; i++) { uint8_t r = rnd(); @@ -123,7 +120,6 @@ static void check_chrConvertRange(int from) sws_freeContext(sws); } #undef LARGEST_INPUT_SIZE -#undef INPUT_SIZES void checkasm_check_sw_range_convert(void) { diff --git a/tests/checkasm/sw_scale.c b/tests/checkasm/sw_scale.c index b383fa0930..7580c8b56c 100644 --- a/tests/checkasm/sw_scale.c +++ b/tests/checkasm/sw_scale.c @@ -105,7 +105,6 @@ static void check_yuv2yuv1(int accurate) int dstW, offset; size_t fail_offset; const int input_sizes[] = {8, 24, 128, 144, 256, 512}; - const int INPUT_SIZES = sizeof(input_sizes)/sizeof(input_sizes[0]); #define LARGEST_INPUT_SIZE 512 const int offsets[] = {0, 3, 8, 11, 16, 19}; @@ -131,7 +130,7 @@ static void check_yuv2yuv1(int accurate) fail(); ff_sws_init_scale(c); - for (isi = 0; isi < INPUT_SIZES; ++isi) { + for (isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); ++isi) { dstW = input_sizes[isi]; for (osi = 0; osi < OFFSET_SIZES; osi++) { offset = offsets[osi]; @@ -171,7 +170,6 @@ static void check_yuv2yuvX(int accurate) const int FILTER_SIZES = sizeof(filter_sizes)/sizeof(filter_sizes[0]); #define LARGEST_INPUT_SIZE 512 static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; - const int INPUT_SIZES = sizeof(input_sizes)/sizeof(input_sizes[0]); const char *accurate_str = (accurate) ? "accurate" : "approximate"; declare_func_emms(AV_CPU_FLAG_MMX, void, const int16_t *filter, @@ -199,7 +197,7 @@ static void check_yuv2yuvX(int accurate) fail(); ff_sws_init_scale(c); - for(isi = 0; isi < INPUT_SIZES; ++isi){ + for(isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); ++isi){ dstW = input_sizes[isi]; for(osi = 0; osi < 64; osi += 16){ if (dstW <= osi) @@ -274,8 +272,7 @@ static void check_hscale(void) }; #define LARGEST_INPUT_SIZE 512 -#define INPUT_SIZES 6 - static const int input_sizes[INPUT_SIZES] = {8, 24, 128, 144, 256, 512}; + static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; int i, j, fsi, hpi, width, dstWi; SwsContext *sws; @@ -307,7 +304,7 @@ static void check_hscale(void) for (hpi = 0; hpi < HSCALE_PAIRS; hpi++) { for (fsi = 0; fsi < FILTER_SIZES; fsi++) { - for (dstWi = 0; dstWi < INPUT_SIZES; dstWi++) { + for (dstWi = 0; dstWi < FF_ARRAY_ELEMS(input_sizes); dstWi++) { width = filter_sizes[fsi]; c->srcBpc = hscale_pairs[hpi][0];

1 0

swscale/range_convert: indent after previous commit
by Ramiro Polla 27 Oct '24

27 Oct '24

ffmpeg | branch: master | Ramiro Polla <ramiro.polla(a)gmail.com> | Sun Sep 22 12:49:18 2024 +0200| [8b30daedf7933346589e6283f0b58f33cd8bf52a] | committer: Ramiro Polla swscale/range_convert: indent after previous commit > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b30daedf79333465… --- libswscale/loongarch/swscale_init_loongarch.c | 32 +++++++++++++-------------- libswscale/swscale.c | 8 +++---- libswscale/x86/swscale.c | 12 +++++----- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/libswscale/loongarch/swscale_init_loongarch.c b/libswscale/loongarch/swscale_init_loongarch.c index fea198338e..f02e957998 100644 --- a/libswscale/loongarch/swscale_init_loongarch.c +++ b/libswscale/loongarch/swscale_init_loongarch.c @@ -29,27 +29,27 @@ av_cold void ff_sws_init_range_convert_loongarch(SwsInternal *c) int cpu_flags = av_get_cpu_flags(); if (have_lsx(cpu_flags)) { - if (c->dstBpc <= 14) { - if (c->srcRange) { - c->lumConvertRange = lumRangeFromJpeg_lsx; - c->chrConvertRange = chrRangeFromJpeg_lsx; - } else { - c->lumConvertRange = lumRangeToJpeg_lsx; - c->chrConvertRange = chrRangeToJpeg_lsx; - } + if (c->dstBpc <= 14) { + if (c->srcRange) { + c->lumConvertRange = lumRangeFromJpeg_lsx; + c->chrConvertRange = chrRangeFromJpeg_lsx; + } else { + c->lumConvertRange = lumRangeToJpeg_lsx; + c->chrConvertRange = chrRangeToJpeg_lsx; } + } } #if HAVE_LASX if (have_lasx(cpu_flags)) { - if (c->dstBpc <= 14) { - if (c->srcRange) { - c->lumConvertRange = lumRangeFromJpeg_lasx; - c->chrConvertRange = chrRangeFromJpeg_lasx; - } else { - c->lumConvertRange = lumRangeToJpeg_lasx; - c->chrConvertRange = chrRangeToJpeg_lasx; - } + if (c->dstBpc <= 14) { + if (c->srcRange) { + c->lumConvertRange = lumRangeFromJpeg_lasx; + c->chrConvertRange = chrRangeFromJpeg_lasx; + } else { + c->lumConvertRange = lumRangeToJpeg_lasx; + c->chrConvertRange = chrRangeToJpeg_lasx; } + } } #endif // #if HAVE_LASX } diff --git a/libswscale/swscale.c b/libswscale/swscale.c index eeef16a57b..3402d3eb56 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -564,13 +564,13 @@ av_cold void ff_sws_init_range_convert(SwsInternal *c) } #if ARCH_AARCH64 - ff_sws_init_range_convert_aarch64(c); + ff_sws_init_range_convert_aarch64(c); #elif ARCH_LOONGARCH64 - ff_sws_init_range_convert_loongarch(c); + ff_sws_init_range_convert_loongarch(c); #elif ARCH_RISCV - ff_sws_init_range_convert_riscv(c); + ff_sws_init_range_convert_riscv(c); #elif ARCH_X86 - ff_sws_init_range_convert_x86(c); + ff_sws_init_range_convert_x86(c); #endif } } diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 3de1d71367..a61105b998 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -474,12 +474,12 @@ RANGE_CONVERT_FUNCS_DECL(avx2); av_cold void ff_sws_init_range_convert_x86(SwsInternal *c) { - int cpu_flags = av_get_cpu_flags(); - if (EXTERNAL_AVX2_FAST(cpu_flags)) { - RANGE_CONVERT_FUNCS(avx2); - } else if (EXTERNAL_SSE2(cpu_flags)) { - RANGE_CONVERT_FUNCS(sse2); - } + int cpu_flags = av_get_cpu_flags(); + if (EXTERNAL_AVX2_FAST(cpu_flags)) { + RANGE_CONVERT_FUNCS(avx2); + } else if (EXTERNAL_SSE2(cpu_flags)) { + RANGE_CONVERT_FUNCS(sse2); + } } av_cold void ff_sws_init_swscale_x86(SwsInternal *c)

1 0

swscale/range_convert: drop redundant conditionals from arch-specific init functions
by Ramiro Polla 27 Oct '24

27 Oct '24

ffmpeg | branch: master | Ramiro Polla <ramiro.polla(a)gmail.com> | Sun Sep 22 12:48:12 2024 +0200| [f7ee0195dfd527865666dcc1fd194c849576910f] | committer: Ramiro Polla swscale/range_convert: drop redundant conditionals from arch-specific init functions These conditions are already checked for in the main init function. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7ee0195dfd527865… --- libswscale/aarch64/swscale.c | 2 -- libswscale/loongarch/swscale_init_loongarch.c | 4 ---- libswscale/riscv/swscale.c | 3 +-- libswscale/swscale.c | 2 +- libswscale/x86/swscale.c | 2 -- 5 files changed, 2 insertions(+), 11 deletions(-) diff --git a/libswscale/aarch64/swscale.c b/libswscale/aarch64/swscale.c index 20697fc590..79b6272743 100644 --- a/libswscale/aarch64/swscale.c +++ b/libswscale/aarch64/swscale.c @@ -228,7 +228,6 @@ av_cold void ff_sws_init_range_convert_aarch64(SwsInternal *c) int cpu_flags = av_get_cpu_flags(); if (have_neon(cpu_flags)) { - if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat)) { if (c->dstBpc <= 14) { if (c->srcRange) { c->lumConvertRange = ff_lumRangeFromJpeg_neon; @@ -239,7 +238,6 @@ av_cold void ff_sws_init_range_convert_aarch64(SwsInternal *c) } } } - } } av_cold void ff_sws_init_swscale_aarch64(SwsInternal *c) diff --git a/libswscale/loongarch/swscale_init_loongarch.c b/libswscale/loongarch/swscale_init_loongarch.c index 0c3a99d167..fea198338e 100644 --- a/libswscale/loongarch/swscale_init_loongarch.c +++ b/libswscale/loongarch/swscale_init_loongarch.c @@ -29,7 +29,6 @@ av_cold void ff_sws_init_range_convert_loongarch(SwsInternal *c) int cpu_flags = av_get_cpu_flags(); if (have_lsx(cpu_flags)) { - if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat)) { if (c->dstBpc <= 14) { if (c->srcRange) { c->lumConvertRange = lumRangeFromJpeg_lsx; @@ -39,11 +38,9 @@ av_cold void ff_sws_init_range_convert_loongarch(SwsInternal *c) c->chrConvertRange = chrRangeToJpeg_lsx; } } - } } #if HAVE_LASX if (have_lasx(cpu_flags)) { - if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat)) { if (c->dstBpc <= 14) { if (c->srcRange) { c->lumConvertRange = lumRangeFromJpeg_lasx; @@ -53,7 +50,6 @@ av_cold void ff_sws_init_range_convert_loongarch(SwsInternal *c) c->chrConvertRange = chrRangeToJpeg_lasx; } } - } } #endif // #if HAVE_LASX } diff --git a/libswscale/riscv/swscale.c b/libswscale/riscv/swscale.c index 4bc6fb1e6d..63539fa82e 100644 --- a/libswscale/riscv/swscale.c +++ b/libswscale/riscv/swscale.c @@ -39,8 +39,7 @@ av_cold void ff_sws_init_range_convert_riscv(SwsInternal *c) { ff_range_lum_from_jpeg_16_rvv, ff_range_chr_from_jpeg_16_rvv }, }; - if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat) && - c->dstBpc <= 14 && + if (c->dstBpc <= 14 && (flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB)) { bool from = c->srcRange != 0; diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 3d9b9d4b96..eeef16a57b 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -562,7 +562,6 @@ av_cold void ff_sws_init_range_convert(SwsInternal *c) c->chrConvertRange = chrRangeToJpeg16_c; } } - } #if ARCH_AARCH64 ff_sws_init_range_convert_aarch64(c); @@ -573,6 +572,7 @@ av_cold void ff_sws_init_range_convert(SwsInternal *c) #elif ARCH_X86 ff_sws_init_range_convert_x86(c); #endif + } } static av_cold void sws_init_swscale(SwsInternal *c) diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 28e8c2ad26..3de1d71367 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -474,14 +474,12 @@ RANGE_CONVERT_FUNCS_DECL(avx2); av_cold void ff_sws_init_range_convert_x86(SwsInternal *c) { - if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat)) { int cpu_flags = av_get_cpu_flags(); if (EXTERNAL_AVX2_FAST(cpu_flags)) { RANGE_CONVERT_FUNCS(avx2); } else if (EXTERNAL_SSE2(cpu_flags)) { RANGE_CONVERT_FUNCS(sse2); } - } } av_cold void ff_sws_init_swscale_x86(SwsInternal *c)

1 0

swscale/range_convert: call arch-specific init functions from main init function
by Ramiro Polla 27 Oct '24

27 Oct '24

ffmpeg | branch: master | Ramiro Polla <ramiro.polla(a)gmail.com> | Wed Sep 18 11:23:18 2024 +0200| [7728b3357df3891585fdc05bb70b709177291a64] | committer: Ramiro Polla swscale/range_convert: call arch-specific init functions from main init function This commit also fixes the issue that the call to ff_sws_init_range_convert() from sws_init_swscale() was not setting up the arch-specific optimizations. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7728b3357df389158… --- libswscale/aarch64/swscale.c | 5 ++++- libswscale/loongarch/swscale_init_loongarch.c | 1 - libswscale/riscv/swscale.c | 7 ++++--- libswscale/swscale.c | 10 ++++++++++ libswscale/swscale_internal.h | 1 + libswscale/utils.c | 10 +--------- libswscale/x86/swscale.c | 2 -- 7 files changed, 20 insertions(+), 16 deletions(-) diff --git a/libswscale/aarch64/swscale.c b/libswscale/aarch64/swscale.c index 4c31b78ed8..20697fc590 100644 --- a/libswscale/aarch64/swscale.c +++ b/libswscale/aarch64/swscale.c @@ -225,6 +225,9 @@ void ff_chrRangeToJpeg_neon(int16_t *dstU, int16_t *dstV, int width); av_cold void ff_sws_init_range_convert_aarch64(SwsInternal *c) { + int cpu_flags = av_get_cpu_flags(); + + if (have_neon(cpu_flags)) { if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat)) { if (c->dstBpc <= 14) { if (c->srcRange) { @@ -236,6 +239,7 @@ av_cold void ff_sws_init_range_convert_aarch64(SwsInternal *c) } } } + } } av_cold void ff_sws_init_swscale_aarch64(SwsInternal *c) @@ -296,6 +300,5 @@ av_cold void ff_sws_init_swscale_aarch64(SwsInternal *c) default: break; } - ff_sws_init_range_convert_aarch64(c); } } diff --git a/libswscale/loongarch/swscale_init_loongarch.c b/libswscale/loongarch/swscale_init_loongarch.c index 7cc92be216..0c3a99d167 100644 --- a/libswscale/loongarch/swscale_init_loongarch.c +++ b/libswscale/loongarch/swscale_init_loongarch.c @@ -95,7 +95,6 @@ av_cold void ff_sws_init_swscale_loongarch(SwsInternal *c) } } #endif // #if HAVE_LASX - ff_sws_init_range_convert_loongarch(c); } av_cold void rgb2rgb_init_loongarch(void) diff --git a/libswscale/riscv/swscale.c b/libswscale/riscv/swscale.c index 8ed9ce969e..4bc6fb1e6d 100644 --- a/libswscale/riscv/swscale.c +++ b/libswscale/riscv/swscale.c @@ -26,9 +26,11 @@ void ff_range_chr_to_jpeg_16_rvv(int16_t *, int16_t *, int); void ff_range_lum_from_jpeg_16_rvv(int16_t *, int); void ff_range_chr_from_jpeg_16_rvv(int16_t *, int16_t *, int); -av_cold static void ff_sws_init_range_convert_riscv(SwsInternal *c, int flags) +av_cold void ff_sws_init_range_convert_riscv(SwsInternal *c) { #if HAVE_RVV + int flags = av_get_cpu_flags(); + static const struct { void (*lum)(int16_t *, int); void (*chr)(int16_t *, int16_t *, int); @@ -67,9 +69,9 @@ RVV_INPUT(rgba32); av_cold void ff_sws_init_swscale_riscv(SwsInternal *c) { +#if HAVE_RVV int flags = av_get_cpu_flags(); -#if HAVE_RVV if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB)) { switch (c->srcFormat) { case AV_PIX_FMT_ABGR: @@ -122,5 +124,4 @@ av_cold void ff_sws_init_swscale_riscv(SwsInternal *c) } } #endif - ff_sws_init_range_convert_riscv(c, flags); } diff --git a/libswscale/swscale.c b/libswscale/swscale.c index e0a9e0279f..3d9b9d4b96 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -563,6 +563,16 @@ av_cold void ff_sws_init_range_convert(SwsInternal *c) } } } + +#if ARCH_AARCH64 + ff_sws_init_range_convert_aarch64(c); +#elif ARCH_LOONGARCH64 + ff_sws_init_range_convert_loongarch(c); +#elif ARCH_RISCV + ff_sws_init_range_convert_riscv(c); +#elif ARCH_X86 + ff_sws_init_range_convert_x86(c); +#endif } static av_cold void sws_init_swscale(SwsInternal *c) diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index b8820ea0ba..0035168997 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -719,6 +719,7 @@ void ff_update_palette(SwsInternal *c, const uint32_t *pal); av_cold void ff_sws_init_range_convert(SwsInternal *c); av_cold void ff_sws_init_range_convert_aarch64(SwsInternal *c); av_cold void ff_sws_init_range_convert_loongarch(SwsInternal *c); +av_cold void ff_sws_init_range_convert_riscv(SwsInternal *c); av_cold void ff_sws_init_range_convert_x86(SwsInternal *c); SwsFunc ff_yuv2rgb_init_x86(SwsInternal *c); diff --git a/libswscale/utils.c b/libswscale/utils.c index c49121de59..1c3b4083df 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1095,16 +1095,8 @@ int sws_setColorspaceDetails(SwsContext *sws, const int inv_table[4], c->srcRange = srcRange; c->dstRange = dstRange; - if (need_reinit) { + if (need_reinit) ff_sws_init_range_convert(c); -#if ARCH_AARCH64 - ff_sws_init_range_convert_aarch64(c); -#elif ARCH_LOONGARCH64 - ff_sws_init_range_convert_loongarch(c); -#elif ARCH_X86 - ff_sws_init_range_convert_x86(c); -#endif - } c->dstFormatBpp = av_get_bits_per_pixel(desc_dst); c->srcFormatBpp = av_get_bits_per_pixel(desc_src); diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 16182124c0..28e8c2ad26 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -851,6 +851,4 @@ switch(c->dstBpc){ \ } #endif - - ff_sws_init_range_convert_x86(c); }

1 0

avutil/wchar_filename: re-introduce explicit cast of void* to char*
by Marton Balint 27 Oct '24

27 Oct '24

ffmpeg | branch: release/6.1 | Marton Balint <cus(a)passwd.hu> | Tue Oct 22 19:49:16 2024 +0200| [4d40898657659f8251a351af3f1f2a93584ccd58] | committer: Marton Balint avutil/wchar_filename: re-introduce explicit cast of void* to char* Fixes compile error on windows with decklink: In file included from ./libavformat/os_support.h:175, from ./libavformat/internal.h:30, from libavdevice/decklink_common.cpp:25: ./libavutil/wchar_filename.h: In function 'int wchartocp(unsigned int, const wchar_t*, char**)': ./libavutil/wchar_filename.h:59:32: error: invalid conversion from 'void*' to 'char*' [-fpermissive] 59 | *filename = av_malloc_array(num_chars, sizeof **filename); | ~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | void* Regression since e9e8bea2e79bc3c481a6f81f75f6c871e3e0f367. Fixes ticket #11103. Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit 9b0128aa766221f8a32e13cf3c1d3e6d75a2d829) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d40898657659f825… --- libavutil/wchar_filename.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 23cc92aa2d..1370a084c9 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -57,7 +57,7 @@ static inline int wchartocp(unsigned int code_page, const wchar_t *filename_w, errno = EINVAL; return -1; } - *filename = av_malloc_array(num_chars, sizeof **filename); + *filename = (char *)av_malloc_array(num_chars, sizeof **filename); if (!*filename) { errno = ENOMEM; return -1;

1 0

avutil/wchar_filename: re-introduce explicit cast of void* to char*
by Marton Balint 27 Oct '24

27 Oct '24

ffmpeg | branch: release/7.1 | Marton Balint <cus(a)passwd.hu> | Tue Oct 22 19:49:16 2024 +0200| [15035aaec0b5d86ea063b8b3d46d13ed1ee9bed2] | committer: Marton Balint avutil/wchar_filename: re-introduce explicit cast of void* to char* Fixes compile error on windows with decklink: In file included from ./libavformat/os_support.h:175, from ./libavformat/internal.h:30, from libavdevice/decklink_common.cpp:25: ./libavutil/wchar_filename.h: In function 'int wchartocp(unsigned int, const wchar_t*, char**)': ./libavutil/wchar_filename.h:59:32: error: invalid conversion from 'void*' to 'char*' [-fpermissive] 59 | *filename = av_malloc_array(num_chars, sizeof **filename); | ~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | void* Regression since e9e8bea2e79bc3c481a6f81f75f6c871e3e0f367. Fixes ticket #11103. Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit 9b0128aa766221f8a32e13cf3c1d3e6d75a2d829) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15035aaec0b5d86ea… --- libavutil/wchar_filename.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 23cc92aa2d..1370a084c9 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -57,7 +57,7 @@ static inline int wchartocp(unsigned int code_page, const wchar_t *filename_w, errno = EINVAL; return -1; } - *filename = av_malloc_array(num_chars, sizeof **filename); + *filename = (char *)av_malloc_array(num_chars, sizeof **filename); if (!*filename) { errno = ENOMEM; return -1;

1 0

avutil/wchar_filename: re-introduce explicit cast of void* to char*
by Marton Balint 27 Oct '24

27 Oct '24

ffmpeg | branch: release/7.0 | Marton Balint <cus(a)passwd.hu> | Tue Oct 22 19:49:16 2024 +0200| [d63f7ddebc20a26838cc733aca2c6a21091c391c] | committer: Marton Balint avutil/wchar_filename: re-introduce explicit cast of void* to char* Fixes compile error on windows with decklink: In file included from ./libavformat/os_support.h:175, from ./libavformat/internal.h:30, from libavdevice/decklink_common.cpp:25: ./libavutil/wchar_filename.h: In function 'int wchartocp(unsigned int, const wchar_t*, char**)': ./libavutil/wchar_filename.h:59:32: error: invalid conversion from 'void*' to 'char*' [-fpermissive] 59 | *filename = av_malloc_array(num_chars, sizeof **filename); | ~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | void* Regression since e9e8bea2e79bc3c481a6f81f75f6c871e3e0f367. Fixes ticket #11103. Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit 9b0128aa766221f8a32e13cf3c1d3e6d75a2d829) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d63f7ddebc20a2683… --- libavutil/wchar_filename.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 23cc92aa2d..1370a084c9 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -57,7 +57,7 @@ static inline int wchartocp(unsigned int code_page, const wchar_t *filename_w, errno = EINVAL; return -1; } - *filename = av_malloc_array(num_chars, sizeof **filename); + *filename = (char *)av_malloc_array(num_chars, sizeof **filename); if (!*filename) { errno = ENOMEM; return -1;

1 0

avutil/wchar_filename: re-introduce explicit cast of void* to char*
by Marton Balint 27 Oct '24

27 Oct '24

ffmpeg | branch: release/5.1 | Marton Balint <cus(a)passwd.hu> | Tue Oct 22 19:49:16 2024 +0200| [dcdfd7fb62464beeeb03c24f21713bf3914b9ea4] | committer: Marton Balint avutil/wchar_filename: re-introduce explicit cast of void* to char* Fixes compile error on windows with decklink: In file included from ./libavformat/os_support.h:175, from ./libavformat/internal.h:30, from libavdevice/decklink_common.cpp:25: ./libavutil/wchar_filename.h: In function 'int wchartocp(unsigned int, const wchar_t*, char**)': ./libavutil/wchar_filename.h:59:32: error: invalid conversion from 'void*' to 'char*' [-fpermissive] 59 | *filename = av_malloc_array(num_chars, sizeof **filename); | ~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | void* Regression since e9e8bea2e79bc3c481a6f81f75f6c871e3e0f367. Fixes ticket #11103. Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit 9b0128aa766221f8a32e13cf3c1d3e6d75a2d829) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dcdfd7fb62464beee… --- libavutil/wchar_filename.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 70194a035c..942dc56778 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -56,7 +56,7 @@ static inline int wchartocp(unsigned int code_page, const wchar_t *filename_w, errno = EINVAL; return -1; } - *filename = av_malloc_array(num_chars, sizeof **filename); + *filename = (char *)av_malloc_array(num_chars, sizeof **filename); if (!*filename) { errno = ENOMEM; return -1;

1 0

avutil/wchar_filename: re-introduce explicit cast of void* to char*
by Marton Balint 27 Oct '24

27 Oct '24

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Tue Oct 22 19:49:16 2024 +0200| [9b0128aa766221f8a32e13cf3c1d3e6d75a2d829] | committer: Marton Balint avutil/wchar_filename: re-introduce explicit cast of void* to char* Fixes compile error on windows with decklink: In file included from ./libavformat/os_support.h:175, from ./libavformat/internal.h:30, from libavdevice/decklink_common.cpp:25: ./libavutil/wchar_filename.h: In function 'int wchartocp(unsigned int, const wchar_t*, char**)': ./libavutil/wchar_filename.h:59:32: error: invalid conversion from 'void*' to 'char*' [-fpermissive] 59 | *filename = av_malloc_array(num_chars, sizeof **filename); | ~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | void* Regression since e9e8bea2e79bc3c481a6f81f75f6c871e3e0f367. Fixes ticket #11103. Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b0128aa766221f8a… --- libavutil/wchar_filename.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 23cc92aa2d..1370a084c9 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -57,7 +57,7 @@ static inline int wchartocp(unsigned int code_page, const wchar_t *filename_w, errno = EINVAL; return -1; } - *filename = av_malloc_array(num_chars, sizeof **filename); + *filename = (char *)av_malloc_array(num_chars, sizeof **filename); if (!*filename) { errno = ENOMEM; return -1;

1 0