diff options
author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-03-15 22:29:04 -0400 |
---|---|---|
committer | Justin Ruggles <justin.ruggles@gmail.com> | 2011-03-17 16:46:48 -0400 |
commit | 0f999cfddb0746602288eabddf38679fd25a2ff7 (patch) | |
tree | 055b877b24d0d1df4ff4feca6d0922174c51938f /libavcodec/x86/ac3dsp_mmx.c | |
parent | 487fef2dcc24d7b4051b4402acf5c619fb082351 (diff) | |
download | ffmpeg-0f999cfddb0746602288eabddf38679fd25a2ff7.tar.gz |
ac3enc: add float_to_fixed24() with x86-optimized versions to AC3DSPContext
and use in scale_coefficients() for the floating-point AC-3 encoder.
Diffstat (limited to 'libavcodec/x86/ac3dsp_mmx.c')
-rw-r--r-- | libavcodec/x86/ac3dsp_mmx.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/libavcodec/x86/ac3dsp_mmx.c b/libavcodec/x86/ac3dsp_mmx.c index 835b10696d..97d0657aa6 100644 --- a/libavcodec/x86/ac3dsp_mmx.c +++ b/libavcodec/x86/ac3dsp_mmx.c @@ -38,7 +38,11 @@ extern void ff_ac3_lshift_int16_sse2(int16_t *src, unsigned int len, unsigned in extern void ff_ac3_rshift_int32_mmx (int32_t *src, unsigned int len, unsigned int shift); extern void ff_ac3_rshift_int32_sse2(int32_t *src, unsigned int len, unsigned int shift); -av_cold void ff_ac3dsp_init_x86(AC3DSPContext *c) +extern void ff_float_to_fixed24_3dnow(int32_t *dst, const float *src, unsigned int len); +extern void ff_float_to_fixed24_sse (int32_t *dst, const float *src, unsigned int len); +extern void ff_float_to_fixed24_sse2 (int32_t *dst, const float *src, unsigned int len); + +av_cold void ff_ac3dsp_init_x86(AC3DSPContext *c, int bit_exact) { int mm_flags = av_get_cpu_flags(); @@ -49,13 +53,22 @@ av_cold void ff_ac3dsp_init_x86(AC3DSPContext *c) c->ac3_lshift_int16 = ff_ac3_lshift_int16_mmx; c->ac3_rshift_int32 = ff_ac3_rshift_int32_mmx; } + if (mm_flags & AV_CPU_FLAG_3DNOW && HAVE_AMD3DNOW) { + if (!bit_exact) { + c->float_to_fixed24 = ff_float_to_fixed24_3dnow; + } + } if (mm_flags & AV_CPU_FLAG_MMX2 && HAVE_MMX2) { c->ac3_exponent_min = ff_ac3_exponent_min_mmxext; c->ac3_max_msb_abs_int16 = ff_ac3_max_msb_abs_int16_mmxext; } + if (mm_flags & AV_CPU_FLAG_SSE && HAVE_SSE) { + c->float_to_fixed24 = ff_float_to_fixed24_sse; + } if (mm_flags & AV_CPU_FLAG_SSE2 && HAVE_SSE) { c->ac3_exponent_min = ff_ac3_exponent_min_sse2; c->ac3_max_msb_abs_int16 = ff_ac3_max_msb_abs_int16_sse2; + c->float_to_fixed24 = ff_float_to_fixed24_sse2; if (!(mm_flags & AV_CPU_FLAG_SSE2SLOW)) { c->ac3_lshift_int16 = ff_ac3_lshift_int16_sse2; c->ac3_rshift_int32 = ff_ac3_rshift_int32_sse2; |