x64 always has MMX, MMXEXT, SSE and SSE2 and this means that some functions for MMX, MMXEXT and 3dnow are always overridden by other functions (unless one e.g. explicitly disables SSE2) for x64. So given that the only systems that benefit from these functions are truely ancient 32bit x86s they are removed.
Showing the changes to libswresample (2 of 2 files). Show all
Unified · Split
| @@ -608,15 +608,6 @@ pack_8ch_%2_to_%1_u_int %+ SUFFIX: · 607 unmodified lines | |||
| 608 | %macro NOP_N 0-6 | 608 | %macro NOP_N 0-6 |
| 609 | %endmacro | 609 | %endmacro |
| 610 | 610 | ||
| 611 | INIT_MMX mmx | ||
| 612 | CONV int32, int16, u, 2, 1, INT16_TO_INT32_N, NOP_N | ||
| 613 | CONV int32, int16, a, 2, 1, INT16_TO_INT32_N, NOP_N | ||
| 614 | CONV int16, int32, u, 1, 2, INT32_TO_INT16_N, NOP_N | ||
| 615 | CONV int16, int32, a, 1, 2, INT32_TO_INT16_N, NOP_N | ||
| 616 | |||
| 617 | PACK_6CH float, float, u, 2, 2, 0, NOP_N, NOP_N | ||
| 618 | PACK_6CH float, float, a, 2, 2, 0, NOP_N, NOP_N | ||
| 619 | |||
| 620 | INIT_XMM sse | 611 | INIT_XMM sse |
| 621 | PACK_6CH float, float, u, 2, 2, 7, NOP_N, NOP_N | 612 | PACK_6CH float, float, u, 2, 2, 7, NOP_N, NOP_N |
| 622 | PACK_6CH float, float, a, 2, 2, 7, NOP_N, NOP_N | 613 | PACK_6CH float, float, a, 2, 2, 7, NOP_N, NOP_N |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | |||
| 26 | #define PROTO(pre, in, out, cap) void ff ## pre ## in## _to_ ##out## _a_ ##cap(uint8_t **dst, const uint8_t **src, int len); | 26 | #define PROTO(pre, in, out, cap) void ff ## pre ## in## _to_ ##out## _a_ ##cap(uint8_t **dst, const uint8_t **src, int len); |
| 27 | #define PROTO2(pre, out, cap) PROTO(pre, int16, out, cap) PROTO(pre, int32, out, cap) PROTO(pre, float, out, cap) | 27 | #define PROTO2(pre, out, cap) PROTO(pre, int16, out, cap) PROTO(pre, int32, out, cap) PROTO(pre, float, out, cap) |
| 28 | #define PROTO3(pre, cap) PROTO2(pre, int16, cap) PROTO2(pre, int32, cap) PROTO2(pre, float, cap) | 28 | #define PROTO3(pre, cap) PROTO2(pre, int16, cap) PROTO2(pre, int32, cap) PROTO2(pre, float, cap) |
| 29 | #define PROTO4(pre) PROTO3(pre, mmx) PROTO3(pre, sse) PROTO3(pre, sse2) PROTO3(pre, ssse3) PROTO3(pre, sse4) PROTO3(pre, avx) PROTO3(pre, avx2) | 29 | #define PROTO4(pre) PROTO3(pre, sse) PROTO3(pre, sse2) PROTO3(pre, ssse3) PROTO3(pre, sse4) PROTO3(pre, avx) PROTO3(pre, avx2) |
| 30 | PROTO4(_) | 30 | PROTO4(_) |
| 31 | PROTO4(_pack_2ch_) | 31 | PROTO4(_pack_2ch_) |
| 32 | PROTO4(_pack_6ch_) | 32 | PROTO4(_pack_6ch_) |
| @@ -52,15 +52,8 @@ av_cold void swri_audio_convert_init_x86(struct AudioConvert *ac, · 19 unmodified lines | |||
| 52 | ac->simd_f = ff_int32_to_int16_a_ ## cap;\ | 52 | ac->simd_f = ff_int32_to_int16_a_ ## cap;\ |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | MULTI_CAPS_FUNC(MMX, mmx) | ||
| 56 | MULTI_CAPS_FUNC(SSE2, sse2) | 55 | MULTI_CAPS_FUNC(SSE2, sse2) |
| 57 | 56 | ||
| 58 | if(EXTERNAL_MMX(mm_flags)) { | ||
| 59 | if(channels == 6) { | ||
| 60 | if( out_fmt == AV_SAMPLE_FMT_FLT && in_fmt == AV_SAMPLE_FMT_FLTP || out_fmt == AV_SAMPLE_FMT_S32 && in_fmt == AV_SAMPLE_FMT_S32P) | ||
| 61 | ac->simd_f = ff_pack_6ch_float_to_float_a_mmx; | ||
| 62 | } | ||
| 63 | } | ||
| 64 | if(EXTERNAL_SSE(mm_flags)) { | 57 | if(EXTERNAL_SSE(mm_flags)) { |
| 65 | if(channels == 6) { | 58 | if(channels == 6) { |
| 66 | if( out_fmt == AV_SAMPLE_FMT_FLT && in_fmt == AV_SAMPLE_FMT_FLTP || out_fmt == AV_SAMPLE_FMT_S32 && in_fmt == AV_SAMPLE_FMT_S32P) | 59 | if( out_fmt == AV_SAMPLE_FMT_FLT && in_fmt == AV_SAMPLE_FMT_FLTP || out_fmt == AV_SAMPLE_FMT_S32 && in_fmt == AV_SAMPLE_FMT_S32P) |