diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-06 15:43:34 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-06 15:55:47 +0100 |
commit | 54a71f2e6c9d8ff42ac0367d54b9df39a31cb3ff (patch) | |
tree | d25dd9b537de12e72a9486cb5b425de8022d2862 /libavfilter/x86/af_volume_init.c | |
parent | 1bb547192f6e9bd28b55f1f11d43bcc216976ac7 (diff) | |
parent | b519298a1578e0c895d53d4b4ed8867b1c031a56 (diff) | |
download | ffmpeg-streaming-54a71f2e6c9d8ff42ac0367d54b9df39a31cb3ff.zip ffmpeg-streaming-54a71f2e6c9d8ff42ac0367d54b9df39a31cb3ff.tar.gz |
Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'
* commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56':
pixdesc: fix yuva 10bit bit depth
avconv: deprecate the -vol option
x86: af_volume: add SSE2/SSSE3/AVX-optimized s32 volume scaling
x86: af_volume: add SSE2-optimized s16 volume scaling
Conflicts:
ffmpeg.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/x86/af_volume_init.c')
-rw-r--r-- | libavfilter/x86/af_volume_init.c | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/libavfilter/x86/af_volume_init.c b/libavfilter/x86/af_volume_init.c new file mode 100644 index 0000000..beee8ca --- /dev/null +++ b/libavfilter/x86/af_volume_init.c @@ -0,0 +1,59 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" +#include "libavutil/cpu.h" +#include "libavutil/samplefmt.h" +#include "libavutil/x86/cpu.h" +#include "libavfilter/af_volume.h" + +void ff_scale_samples_s16_sse2(uint8_t *dst, const uint8_t *src, int len, + int volume); + +void ff_scale_samples_s32_sse2(uint8_t *dst, const uint8_t *src, int len, + int volume); +void ff_scale_samples_s32_ssse3_atom(uint8_t *dst, const uint8_t *src, int len, + int volume); +void ff_scale_samples_s32_avx(uint8_t *dst, const uint8_t *src, int len, + int volume); + +void ff_volume_init_x86(VolumeContext *vol) +{ + int mm_flags = av_get_cpu_flags(); + enum AVSampleFormat sample_fmt = av_get_packed_sample_fmt(vol->sample_fmt); + + if (sample_fmt == AV_SAMPLE_FMT_S16) { + if (EXTERNAL_SSE2(mm_flags) && vol->volume_i < 32768) { + vol->scale_samples = ff_scale_samples_s16_sse2; + vol->samples_align = 8; + } + } else if (sample_fmt == AV_SAMPLE_FMT_S32) { + if (EXTERNAL_SSE2(mm_flags)) { + vol->scale_samples = ff_scale_samples_s32_sse2; + vol->samples_align = 4; + } + if (EXTERNAL_SSSE3(mm_flags) && mm_flags & AV_CPU_FLAG_ATOM) { + vol->scale_samples = ff_scale_samples_s32_ssse3_atom; + vol->samples_align = 4; + } + if (EXTERNAL_AVX(mm_flags)) { + vol->scale_samples = ff_scale_samples_s32_avx; + vol->samples_align = 8; + } + } +} |