|
|
@@ -26,7 +26,7 @@
|
|
|
#define PROTO(pre, in, out, cap) void ff ## pre ## in## _to_ ##out## _a_ ##cap(uint8_t **dst, const uint8_t **src, int len);
|
|
|
#define PROTO2(pre, out, cap) PROTO(pre, int16, out, cap) PROTO(pre, int32, out, cap) PROTO(pre, float, out, cap)
|
|
|
#define PROTO3(pre, cap) PROTO2(pre, int16, cap) PROTO2(pre, int32, cap) PROTO2(pre, float, cap)
|
|
|
-#define PROTO4(pre) PROTO3(pre, mmx) PROTO3(pre, sse) PROTO3(pre, sse2) PROTO3(pre, ssse3) PROTO3(pre, sse4) PROTO3(pre, avx) PROTO3(pre, avx2)
|
|
|
+#define PROTO4(pre) PROTO3(pre, sse) PROTO3(pre, sse2) PROTO3(pre, ssse3) PROTO3(pre, sse4) PROTO3(pre, avx) PROTO3(pre, avx2)
|
|
|
PROTO4(_)
|
|
|
PROTO4(_pack_2ch_)
|
|
|
PROTO4(_pack_6ch_)
|
|
|
@@ -52,15 +52,8 @@ av_cold void swri_audio_convert_init_x86(struct AudioConvert *ac,
|
|
|
ac->simd_f = ff_int32_to_int16_a_ ## cap;\
|
|
|
}
|
|
|
|
|
|
-MULTI_CAPS_FUNC(MMX, mmx)
|
|
|
MULTI_CAPS_FUNC(SSE2, sse2)
|
|
|
|
|
|
- if(EXTERNAL_MMX(mm_flags)) {
|
|
|
- if(channels == 6) {
|
|
|
- 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)
|
|
|
- ac->simd_f = ff_pack_6ch_float_to_float_a_mmx;
|
|
|
- }
|
|
|
- }
|
|
|
if(EXTERNAL_SSE(mm_flags)) {
|
|
|
if(channels == 6) {
|
|
|
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)
|