Commit e07c9705 authored by Justin Ruggles's avatar Justin Ruggles
Browse files

lavr: x86: optimized 2-channel flt to fltp conversion

parent 5245c9f3
...@@ -1165,3 +1165,35 @@ CONV_FLT_TO_S16P_6CH ...@@ -1165,3 +1165,35 @@ CONV_FLT_TO_S16P_6CH
INIT_XMM avx INIT_XMM avx
CONV_FLT_TO_S16P_6CH CONV_FLT_TO_S16P_6CH
%endif %endif
;------------------------------------------------------------------------------
; void ff_conv_flt_to_fltp_2ch(float *const *dst, float *src, int len,
; int channels);
;------------------------------------------------------------------------------
%macro CONV_FLT_TO_FLTP_2CH 0
cglobal conv_flt_to_fltp_2ch, 3,4,3, dst0, src, len, dst1
lea lenq, [4*lend]
mov dst1q, [dst0q+gprsize]
mov dst0q, [dst0q ]
lea srcq, [srcq+2*lenq]
add dst0q, lenq
add dst1q, lenq
neg lenq
.loop:
mova m0, [srcq+2*lenq ]
mova m1, [srcq+2*lenq+mmsize]
DEINT2_PS 0, 1, 2
mova [dst0q+lenq], m0
mova [dst1q+lenq], m1
add lenq, mmsize
jl .loop
REP_RET
%endmacro
INIT_XMM sse
CONV_FLT_TO_FLTP_2CH
%if HAVE_AVX
INIT_XMM avx
CONV_FLT_TO_FLTP_2CH
%endif
...@@ -132,6 +132,11 @@ extern void ff_conv_flt_to_s16p_6ch_ssse3(int16_t *const *dst, float *src, ...@@ -132,6 +132,11 @@ extern void ff_conv_flt_to_s16p_6ch_ssse3(int16_t *const *dst, float *src,
extern void ff_conv_flt_to_s16p_6ch_avx (int16_t *const *dst, float *src, extern void ff_conv_flt_to_s16p_6ch_avx (int16_t *const *dst, float *src,
int len, int channels); int len, int channels);
extern void ff_conv_flt_to_fltp_2ch_sse(float *const *dst, float *src, int len,
int channels);
extern void ff_conv_flt_to_fltp_2ch_avx(float *const *dst, float *src, int len,
int channels);
av_cold void ff_audio_convert_init_x86(AudioConvert *ac) av_cold void ff_audio_convert_init_x86(AudioConvert *ac)
{ {
#if HAVE_YASM #if HAVE_YASM
...@@ -148,6 +153,8 @@ av_cold void ff_audio_convert_init_x86(AudioConvert *ac) ...@@ -148,6 +153,8 @@ av_cold void ff_audio_convert_init_x86(AudioConvert *ac)
6, 1, 2, "SSE", ff_conv_fltp_to_s16_6ch_sse); 6, 1, 2, "SSE", ff_conv_fltp_to_s16_6ch_sse);
ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP,
2, 16, 8, "SSE", ff_conv_fltp_to_flt_2ch_sse); 2, 16, 8, "SSE", ff_conv_fltp_to_flt_2ch_sse);
ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_FLT,
2, 16, 4, "SSE", ff_conv_flt_to_fltp_2ch_sse);
} }
if (mm_flags & AV_CPU_FLAG_SSE2 && HAVE_SSE) { if (mm_flags & AV_CPU_FLAG_SSE2 && HAVE_SSE) {
if (!(mm_flags & AV_CPU_FLAG_SSE2SLOW)) { if (!(mm_flags & AV_CPU_FLAG_SSE2SLOW)) {
...@@ -241,6 +248,8 @@ av_cold void ff_audio_convert_init_x86(AudioConvert *ac) ...@@ -241,6 +248,8 @@ av_cold void ff_audio_convert_init_x86(AudioConvert *ac)
2, 16, 8, "AVX", ff_conv_flt_to_s16p_2ch_avx); 2, 16, 8, "AVX", ff_conv_flt_to_s16p_2ch_avx);
ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_FLT, ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_FLT,
6, 16, 4, "AVX", ff_conv_flt_to_s16p_6ch_avx); 6, 16, 4, "AVX", ff_conv_flt_to_s16p_6ch_avx);
ff_audio_convert_set_func(ac, AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_FLT,
2, 16, 4, "AVX", ff_conv_flt_to_fltp_2ch_avx);
} }
#endif #endif
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment