diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-09 12:30:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-09 12:30:14 +0100 |
| commit | 4765f635387cef3efb01e52e59d4f3add126a0e2 (patch) | |
| tree | a41b58a7f4262729b93f5e7a7538fc41770b9f93 /libavresample/x86/dither_init.c | |
| parent | 75afbe2ab4a14cdfdc4001869ae67ded99cf5ce7 (diff) | |
| parent | d744801f1a7c65200a6ed207bb0dea197432288e (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
xan: Convert to bytestream2
oggenc: add a page_duration option and deprecate the pagesize option
x86: lavr: add SSE2/AVX dither_int_to_float()
Conflicts:
libavcodec/xan.c
libavformat/oggenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/x86/dither_init.c')
| -rw-r--r-- | libavresample/x86/dither_init.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/libavresample/x86/dither_init.c b/libavresample/x86/dither_init.c index d5d92902fd..6532887c09 100644 --- a/libavresample/x86/dither_init.c +++ b/libavresample/x86/dither_init.c @@ -26,6 +26,12 @@ extern void ff_quantize_sse2(int16_t *dst, const float *src, float *dither, int len); +extern void ff_dither_int_to_float_rectangular_sse2(float *dst, int *src, int len); +extern void ff_dither_int_to_float_rectangular_avx(float *dst, int *src, int len); + +extern void ff_dither_int_to_float_triangular_sse2(float *dst, int *src0, int len); +extern void ff_dither_int_to_float_triangular_avx(float *dst, int *src0, int len); + av_cold void ff_dither_init_x86(DitherDSPContext *ddsp, enum AVResampleDitherMethod method) { @@ -36,4 +42,20 @@ av_cold void ff_dither_init_x86(DitherDSPContext *ddsp, ddsp->ptr_align = 16; ddsp->samples_align = 8; } + + if (method == AV_RESAMPLE_DITHER_RECTANGULAR) { + if (EXTERNAL_SSE2(mm_flags)) { + ddsp->dither_int_to_float = ff_dither_int_to_float_rectangular_sse2; + } + if (EXTERNAL_AVX(mm_flags)) { + ddsp->dither_int_to_float = ff_dither_int_to_float_rectangular_avx; + } + } else { + if (EXTERNAL_SSE2(mm_flags)) { + ddsp->dither_int_to_float = ff_dither_int_to_float_triangular_sse2; + } + if (EXTERNAL_AVX(mm_flags)) { + ddsp->dither_int_to_float = ff_dither_int_to_float_triangular_avx; + } + } } |