swr: int32_to_int16_mmx/sse

Michael Niedermayer committed 14 years ago

Commit 65722e71 parent 755667e2 files · +36 −1Browse files

Unified · Split

2 files

@@ -194,14 +194,45 @@ float_to_int16_u_int %+ SUFFIX · 193 unmodified lines
194	REP_RET	194	REP_RET
195	%endmacro	195	%endmacro
196		196
		197	%macro INT32_TO_INT16 1
		198	cglobal int32_to_int16_%1, 3, 3, 2, dst, src, len
		199	mov srcq, [srcq]
		200	mov dstq, [dstq]
		201	%ifidn %1, a
		202	test dstq, mmsize-1
		203	jne int32_to_int16_u_int %+ SUFFIX
		204	test srcq, mmsize-1
		205	jne int32_to_int16_u_int %+ SUFFIX
		206	%else
		207	int32_to_int16_u_int %+ SUFFIX
		208	%endif
		209	lea srcq, [srcq + 2*lenq]
		210	add dstq, lenq
		211	neg lenq
		212	.next:
		213	mov%1 m0, [ srcq+2*lenq]
		214	mov%1 m1, [mmsize + srcq+2*lenq]
		215	psrad m0, 16
		216	psrad m1, 16
		217	packssdw m0, m1
		218	mov%1 [ dstq+lenq], m0
		219	add lenq, mmsize
		220	jl .next
		221	REP_RET
		222	%endmacro
		223
197		224
198	INIT_MMX mmx	225	INIT_MMX mmx
199	INT16_TO_INT32 u	226	INT16_TO_INT32 u
200	INT16_TO_INT32 a	227	INT16_TO_INT32 a
		228	INT32_TO_INT16 u
		229	INT32_TO_INT16 a
201		230
202	INIT_XMM sse	231	INIT_XMM sse
203	INT16_TO_INT32 u	232	INT16_TO_INT32 u
204	INT16_TO_INT32 a	233	INT16_TO_INT32 a
		234	INT32_TO_INT16 u
		235	INT32_TO_INT16 a
205		236
206	INIT_XMM sse2	237	INIT_XMM sse2
207	INT32_TO_FLOAT u	238	INT32_TO_FLOAT u

 #include "libswresample/audioconvert.h"
 #define MULTI_CAPS_FUNC_DECL(cap) \
-    void ff_int16_to_int32_a_ ## cap(uint8_t **dst, const uint8_t **src, int len);
+    void ff_int16_to_int32_a_ ## cap(uint8_t **dst, const uint8_t **src, int len);\
+    void ff_int32_to_int16_a_ ## cap(uint8_t **dst, const uint8_t **src, int len);\
 MULTI_CAPS_FUNC_DECL(mmx)
 MULTI_CAPS_FUNC_DECL(sse)
     if (mm_flags & flag) {\
         if(   out_fmt == AV_SAMPLE_FMT_S32  && in_fmt == AV_SAMPLE_FMT_S16 || out_fmt == AV_SAMPLE_FMT_S32P && in_fmt == AV_SAMPLE_FMT_S16P)\
             ac->simd_f =  ff_int16_to_int32_a_ ## cap;\
+        if(   out_fmt == AV_SAMPLE_FMT_S16  && in_fmt == AV_SAMPLE_FMT_S32 || out_fmt == AV_SAMPLE_FMT_S16P && in_fmt == AV_SAMPLE_FMT_S32P)\
+            ac->simd_f =  ff_int32_to_int16_a_ ## cap;\
     }
 MULTI_CAPS_FUNC(AV_CPU_FLAG_MMX, mmx)

Keyboard shortcuts