diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-06 01:46:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-06 01:54:10 +0100 |
| commit | 1d048f762d2fc4ede5316818f467e2f1d1065ac1 (patch) | |
| tree | 3667fa5304938b04abb0b636f32ae7cfe0e55657 /libavcodec/x86/v210enc_init.c | |
| parent | e827f65618f601ae2016e6f8ac8851534ed346c8 (diff) | |
| parent | 9a738c27dceb4b975784b23213a46f5cb560d1c2 (diff) | |
| download | ffmpeg-1d048f762d2fc4ede5316818f467e2f1d1065ac1.tar.gz | |
Merge commit '9a738c27dceb4b975784b23213a46f5cb560d1c2'
* commit '9a738c27dceb4b975784b23213a46f5cb560d1c2':
v210enc: Add SIMD optimised 8-bit and 10-bit encoders
Conflicts:
libavcodec/v210enc.c
libavcodec/v210enc.h
libavcodec/x86/Makefile
libavcodec/x86/v210enc.asm
libavcodec/x86/v210enc_init.c
tests/ref/vsynth/vsynth1-v210
tests/ref/vsynth/vsynth2-v210
See: 36091742d182b3ad4411aae22682354b3834a974
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/v210enc_init.c')
| -rw-r--r-- | libavcodec/x86/v210enc_init.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libavcodec/x86/v210enc_init.c b/libavcodec/x86/v210enc_init.c index 3ac498ac5f..2afb1b2d7b 100644 --- a/libavcodec/x86/v210enc_init.c +++ b/libavcodec/x86/v210enc_init.c @@ -19,19 +19,24 @@ #include "libavutil/x86/cpu.h" #include "libavcodec/v210enc.h" -void ff_v210_planar_pack_8_ssse3(const uint8_t *y, const uint8_t *u, const uint8_t *v, uint8_t *dst, ptrdiff_t width); -void ff_v210_planar_pack_8_avx(const uint8_t *y, const uint8_t *u, const uint8_t *v, uint8_t *dst, ptrdiff_t width); -void ff_v210_planar_pack_10_ssse3(const uint16_t *y, const uint16_t *u, const uint16_t *v, uint8_t *dst, ptrdiff_t width); +void ff_v210_planar_pack_8_ssse3(const uint8_t *y, const uint8_t *u, + const uint8_t *v, uint8_t *dst, + ptrdiff_t width); +void ff_v210_planar_pack_8_avx(const uint8_t *y, const uint8_t *u, + const uint8_t *v, uint8_t *dst, ptrdiff_t width); +void ff_v210_planar_pack_10_ssse3(const uint16_t *y, const uint16_t *u, + const uint16_t *v, uint8_t *dst, + ptrdiff_t width); av_cold void ff_v210enc_init_x86(V210EncContext *s) { int cpu_flags = av_get_cpu_flags(); - if( EXTERNAL_SSSE3(cpu_flags) ) { + if (EXTERNAL_SSSE3(cpu_flags)) { s->pack_line_8 = ff_v210_planar_pack_8_ssse3; s->pack_line_10 = ff_v210_planar_pack_10_ssse3; } - if( EXTERNAL_AVX(cpu_flags) ) + if (EXTERNAL_AVX(cpu_flags)) s->pack_line_8 = ff_v210_planar_pack_8_avx; } |