These conditions are already checked for in the main init function.
Unified · Split
| @@ -228,7 +228,6 @@ av_cold void ff_sws_init_range_convert_aarch64(SwsInternal *c) · 227 unmodified lines | |||
| 228 | int cpu_flags = av_get_cpu_flags(); | 228 | int cpu_flags = av_get_cpu_flags(); |
| 229 | 229 | ||
| 230 | if (have_neon(cpu_flags)) { | 230 | if (have_neon(cpu_flags)) { |
| 231 | if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat)) { | ||
| 232 | if (c->dstBpc <= 14) { | 231 | if (c->dstBpc <= 14) { |
| 233 | if (c->srcRange) { | 232 | if (c->srcRange) { |
| 234 | c->lumConvertRange = ff_lumRangeFromJpeg_neon; | 233 | c->lumConvertRange = ff_lumRangeFromJpeg_neon; |
| @@ -239,7 +238,6 @@ av_cold void ff_sws_init_range_convert_aarch64(SwsInternal *c) · 4 unmodified lines | |||
| 239 | } | 238 | } |
| 240 | } | 239 | } |
| 241 | } | 240 | } |
| 242 | } | ||
| 243 | } | 241 | } |
| 244 | 242 | ||
| 245 | av_cold void ff_sws_init_swscale_aarch64(SwsInternal *c) | 243 | av_cold void ff_sws_init_swscale_aarch64(SwsInternal *c) |
| @@ -29,7 +29,6 @@ av_cold void ff_sws_init_range_convert_loongarch(SwsInternal *c) · 28 unmodified lines | |||
| 29 | int cpu_flags = av_get_cpu_flags(); | 29 | int cpu_flags = av_get_cpu_flags(); |
| 30 | 30 | ||
| 31 | if (have_lsx(cpu_flags)) { | 31 | if (have_lsx(cpu_flags)) { |
| 32 | if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat)) { | ||
| 33 | if (c->dstBpc <= 14) { | 32 | if (c->dstBpc <= 14) { |
| 34 | if (c->srcRange) { | 33 | if (c->srcRange) { |
| 35 | c->lumConvertRange = lumRangeFromJpeg_lsx; | 34 | c->lumConvertRange = lumRangeFromJpeg_lsx; |
| @@ -39,11 +38,9 @@ av_cold void ff_sws_init_range_convert_loongarch(SwsInternal *c) · 3 unmodified lines | |||
| 39 | c->chrConvertRange = chrRangeToJpeg_lsx; | 38 | c->chrConvertRange = chrRangeToJpeg_lsx; |
| 40 | } | 39 | } |
| 41 | } | 40 | } |
| 42 | } | ||
| 43 | } | 41 | } |
| 44 | #if HAVE_LASX | 42 | #if HAVE_LASX |
| 45 | if (have_lasx(cpu_flags)) { | 43 | if (have_lasx(cpu_flags)) { |
| 46 | if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat)) { | ||
| 47 | if (c->dstBpc <= 14) { | 44 | if (c->dstBpc <= 14) { |
| 48 | if (c->srcRange) { | 45 | if (c->srcRange) { |
| 49 | c->lumConvertRange = lumRangeFromJpeg_lasx; | 46 | c->lumConvertRange = lumRangeFromJpeg_lasx; |
| @@ -53,7 +50,6 @@ av_cold void ff_sws_init_range_convert_loongarch(SwsInternal *c) · 3 unmodified lines | |||
| 53 | c->chrConvertRange = chrRangeToJpeg_lasx; | 50 | c->chrConvertRange = chrRangeToJpeg_lasx; |
| 54 | } | 51 | } |
| 55 | } | 52 | } |
| 56 | } | ||
| 57 | } | 53 | } |
| 58 | #endif // #if HAVE_LASX | 54 | #endif // #if HAVE_LASX |
| 59 | } | 55 | } |
| @@ -39,8 +39,7 @@ av_cold void ff_sws_init_range_convert_riscv(SwsInternal *c) · 38 unmodified lines | |||
| 39 | { ff_range_lum_from_jpeg_16_rvv, ff_range_chr_from_jpeg_16_rvv }, | 39 | { ff_range_lum_from_jpeg_16_rvv, ff_range_chr_from_jpeg_16_rvv }, |
| 40 | }; | 40 | }; |
| 41 | 41 | ||
| 42 | if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat) && | 42 | if (c->dstBpc <= 14 && |
| 43 | c->dstBpc <= 14 && | ||
| 44 | (flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB)) { | 43 | (flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB)) { |
| 45 | bool from = c->srcRange != 0; | 44 | bool from = c->srcRange != 0; |
| 46 | 45 | ||
| @@ -562,7 +562,6 @@ av_cold void ff_sws_init_range_convert(SwsInternal *c) · 561 unmodified lines | |||
| 562 | c->chrConvertRange = chrRangeToJpeg16_c; | 562 | c->chrConvertRange = chrRangeToJpeg16_c; |
| 563 | } | 563 | } |
| 564 | } | 564 | } |
| 565 | } | ||
| 566 | 565 | ||
| 567 | #if ARCH_AARCH64 | 566 | #if ARCH_AARCH64 |
| 568 | ff_sws_init_range_convert_aarch64(c); | 567 | ff_sws_init_range_convert_aarch64(c); |
| @@ -573,6 +572,7 @@ av_cold void ff_sws_init_range_convert(SwsInternal *c) · 4 unmodified lines | |||
| 573 | #elif ARCH_X86 | 572 | #elif ARCH_X86 |
| 574 | ff_sws_init_range_convert_x86(c); | 573 | ff_sws_init_range_convert_x86(c); |
| 575 | #endif | 574 | #endif |
| 575 | } | ||
| 576 | } | 576 | } |
| 577 | 577 | ||
| 578 | static av_cold void sws_init_swscale(SwsInternal *c) | 578 | static av_cold void sws_init_swscale(SwsInternal *c) |
| @@ -474,14 +474,12 @@ RANGE_CONVERT_FUNCS_DECL(avx2); · 473 unmodified lines | |||
| 474 | 474 | ||
| 475 | av_cold void ff_sws_init_range_convert_x86(SwsInternal *c) | 475 | av_cold void ff_sws_init_range_convert_x86(SwsInternal *c) |
| 476 | { | 476 | { |
| 477 | if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat)) { | ||
| 478 | int cpu_flags = av_get_cpu_flags(); | 477 | int cpu_flags = av_get_cpu_flags(); |
| 479 | if (EXTERNAL_AVX2_FAST(cpu_flags)) { | 478 | if (EXTERNAL_AVX2_FAST(cpu_flags)) { |
| 480 | RANGE_CONVERT_FUNCS(avx2); | 479 | RANGE_CONVERT_FUNCS(avx2); |
| 481 | } else if (EXTERNAL_SSE2(cpu_flags)) { | 480 | } else if (EXTERNAL_SSE2(cpu_flags)) { |
| 482 | RANGE_CONVERT_FUNCS(sse2); | 481 | RANGE_CONVERT_FUNCS(sse2); |
| 483 | } | 482 | } |
| 484 | } | ||
| 485 | } | 483 | } |
| 486 | 484 | ||
| 487 | av_cold void ff_sws_init_swscale_x86(SwsInternal *c) | 485 | av_cold void ff_sws_init_swscale_x86(SwsInternal *c) |