Unified · Split
| @@ -318,48 +318,41 @@ void ff_vvc_dsp_init_x86(VVCDSPContext *const c, const int bd) · 317 unmodified lines | |||
| 318 | #if ARCH_X86_64 | 318 | #if ARCH_X86_64 |
| 319 | const int cpu_flags = av_get_cpu_flags(); | 319 | const int cpu_flags = av_get_cpu_flags(); |
| 320 | 320 | ||
| 321 | if (bd == 8) { | 321 | switch (bd) { |
| 322 | case 8: | ||
| 322 | if (EXTERNAL_SSE4(cpu_flags)) { | 323 | if (EXTERNAL_SSE4(cpu_flags)) { |
| 323 | MC_LINK_SSE4(8); | 324 | MC_LINK_SSE4(8); |
| 324 | } | 325 | } |
| 325 | if (EXTERNAL_AVX2_FAST(cpu_flags)) { | 326 | if (EXTERNAL_AVX2_FAST(cpu_flags)) { |
| 327 | ALF_INIT(8); | ||
| 328 | AVG_INIT(8, avx2); | ||
| 326 | MC_LINKS_AVX2(8); | 329 | MC_LINKS_AVX2(8); |
| 327 | } | 330 | } |
| 328 | } else if (bd == 10) { | 331 | break; |
| 332 | case 10: | ||
| 329 | if (EXTERNAL_SSE4(cpu_flags)) { | 333 | if (EXTERNAL_SSE4(cpu_flags)) { |
| 330 | MC_LINK_SSE4(10); | 334 | MC_LINK_SSE4(10); |
| 331 | } | 335 | } |
| 332 | if (EXTERNAL_AVX2_FAST(cpu_flags)) { | 336 | if (EXTERNAL_AVX2_FAST(cpu_flags)) { |
| 337 | ALF_INIT(10); | ||
| 338 | AVG_INIT(10, avx2); | ||
| 333 | MC_LINKS_AVX2(10); | 339 | MC_LINKS_AVX2(10); |
| 334 | MC_LINKS_16BPC_AVX2(10); | 340 | MC_LINKS_16BPC_AVX2(10); |
| 335 | } | 341 | } |
| 336 | } else if (bd == 12) { | 342 | break; |
| 343 | case 12: | ||
| 337 | if (EXTERNAL_SSE4(cpu_flags)) { | 344 | if (EXTERNAL_SSE4(cpu_flags)) { |
| 338 | MC_LINK_SSE4(12); | 345 | MC_LINK_SSE4(12); |
| 339 | } | 346 | } |
| 340 | if (EXTERNAL_AVX2_FAST(cpu_flags)) { | 347 | if (EXTERNAL_AVX2_FAST(cpu_flags)) { |
| 348 | ALF_INIT(12); | ||
| 349 | AVG_INIT(12, avx2); | ||
| 341 | MC_LINKS_AVX2(12); | 350 | MC_LINKS_AVX2(12); |
| 342 | MC_LINKS_16BPC_AVX2(12); | 351 | MC_LINKS_16BPC_AVX2(12); |
| 343 | } | 352 | } |
| 344 | } | 353 | break; |
| 345 | 354 | default: | |
| 346 | if (EXTERNAL_AVX2(cpu_flags)) { | 355 | break; |
| 347 | switch (bd) { | ||
| 348 | case 8: | ||
| 349 | ALF_INIT(8); | ||
| 350 | AVG_INIT(8, avx2); | ||
| 351 | break; | ||
| 352 | case 10: | ||
| 353 | ALF_INIT(10); | ||
| 354 | AVG_INIT(10, avx2); | ||
| 355 | break; | ||
| 356 | case 12: | ||
| 357 | ALF_INIT(12); | ||
| 358 | AVG_INIT(12, avx2); | ||
| 359 | break; | ||
| 360 | default: | ||
| 361 | break; | ||
| 362 | } | ||
| 363 | } | 356 | } |
| 364 | #endif | 357 | #endif |
| 365 | } | 358 | } |