diff options
author | Dmitry Kovalev <dkovalev@google.com> | 2014-02-06 11:54:15 -0800 |
---|---|---|
committer | Dmitry Kovalev <dkovalev@google.com> | 2014-02-06 11:54:15 -0800 |
commit | 005fc6970b4c1997d40b98d2ac01d34f39310606 (patch) | |
tree | f853b44855c1814a17f0e293f1f19c5134d5a17f /vp9/encoder/x86/vp9_dct_avx2.c | |
parent | 4d8ebc9ec450fbbc049e19711c1a4f062459c23e (diff) | |
download | libvpx-005fc6970b4c1997d40b98d2ac01d34f39310606.tar libvpx-005fc6970b4c1997d40b98d2ac01d34f39310606.tar.gz libvpx-005fc6970b4c1997d40b98d2ac01d34f39310606.tar.bz2 libvpx-005fc6970b4c1997d40b98d2ac01d34f39310606.zip |
Finally removing "short" from transform names.
Change-Id: I5259b68dc1bcceb153e3ffe638a79a59a3019e9d
Diffstat (limited to 'vp9/encoder/x86/vp9_dct_avx2.c')
-rw-r--r-- | vp9/encoder/x86/vp9_dct_avx2.c | 77 |
1 files changed, 45 insertions, 32 deletions
diff --git a/vp9/encoder/x86/vp9_dct_avx2.c b/vp9/encoder/x86/vp9_dct_avx2.c index ea031fb07..2b82d9750 100644 --- a/vp9/encoder/x86/vp9_dct_avx2.c +++ b/vp9/encoder/x86/vp9_dct_avx2.c @@ -244,32 +244,36 @@ void fadst4_avx2(__m128i *in) { transpose_4x4_avx2(in); } -void vp9_short_fht4x4_avx2(const int16_t *input, int16_t *output, - int stride, int tx_type) { +void vp9_fht4x4_avx2(const int16_t *input, int16_t *output, + int stride, int tx_type) { __m128i in[4]; - load_buffer_4x4_avx2(input, in, stride); + switch (tx_type) { - case 0: // DCT_DCT - fdct4_avx2(in); - fdct4_avx2(in); + case DCT_DCT: + vp9_fdct4x4_avx2(input, output, stride); break; - case 1: // ADST_DCT + case ADST_DCT: + load_buffer_4x4_avx2(input, in, stride); fadst4_avx2(in); fdct4_avx2(in); + write_buffer_4x4_avx2(output, in); break; - case 2: // DCT_ADST + case DCT_ADST: + load_buffer_4x4_avx2(input, in, stride); fdct4_avx2(in); fadst4_avx2(in); + write_buffer_4x4_avx2(output, in); break; - case 3: // ADST_ADST + case ADST_ADST: + load_buffer_4x4_avx2(input, in, stride); fadst4_avx2(in); fadst4_avx2(in); + write_buffer_4x4_avx2(output, in); break; default: assert(0); break; } - write_buffer_4x4_avx2(output, in); } void vp9_fdct8x8_avx2(const int16_t *input, int16_t *output, int stride) { @@ -1028,33 +1032,39 @@ void fadst8_avx2(__m128i *in) { array_transpose_8x8_avx2(in, in); } -void vp9_short_fht8x8_avx2(const int16_t *input, int16_t *output, - int stride, int tx_type) { +void vp9_fht8x8_avx2(const int16_t *input, int16_t *output, + int stride, int tx_type) { __m128i in[8]; - load_buffer_8x8_avx2(input, in, stride); + switch (tx_type) { - case 0: // DCT_DCT - fdct8_avx2(in); - fdct8_avx2(in); + case DCT_DCT: + vp9_fdct8x8_avx2(input, output, stride); break; - case 1: // ADST_DCT + case ADST_DCT: + load_buffer_8x8_avx2(input, in, stride); fadst8_avx2(in); fdct8_avx2(in); + right_shift_8x8_avx2(in, 1); + write_buffer_8x8_avx2(output, in, 8); break; - case 2: // DCT_ADST + case DCT_ADST: + load_buffer_8x8_avx2(input, in, stride); fdct8_avx2(in); fadst8_avx2(in); + right_shift_8x8_avx2(in, 1); + write_buffer_8x8_avx2(output, in, 8); break; - case 3: // ADST_ADST + case ADST_ADST: + load_buffer_8x8_avx2(input, in, stride); fadst8_avx2(in); fadst8_avx2(in); + right_shift_8x8_avx2(in, 1); + write_buffer_8x8_avx2(output, in, 8); break; default: assert(0); break; } - right_shift_8x8_avx2(in, 1); - write_buffer_8x8_avx2(output, in, 8); } void vp9_fdct16x16_avx2(const int16_t *input, int16_t *output, int stride) { @@ -2534,36 +2544,39 @@ void fadst16_avx2(__m128i *in0, __m128i *in1) { array_transpose_16x16_avx2(in0, in1); } -void vp9_short_fht16x16_avx2(const int16_t *input, int16_t *output, - int stride, int tx_type) { +void vp9_fht16x16_avx2(const int16_t *input, int16_t *output, + int stride, int tx_type) { __m128i in0[16], in1[16]; - load_buffer_16x16_avx2(input, in0, in1, stride); + switch (tx_type) { - case 0: // DCT_DCT - fdct16_avx2(in0, in1); - right_shift_16x16_avx2(in0, in1); - fdct16_avx2(in0, in1); + case DCT_DCT: + vp9_fdct16x16_avx2(input, output, stride); break; - case 1: // ADST_DCT + case ADST_DCT: + load_buffer_16x16_avx2(input, in0, in1, stride); fadst16_avx2(in0, in1); right_shift_16x16_avx2(in0, in1); fdct16_avx2(in0, in1); + write_buffer_16x16_avx2(output, in0, in1, 16); break; - case 2: // DCT_ADST + case DCT_ADST: + load_buffer_16x16_avx2(input, in0, in1, stride); fdct16_avx2(in0, in1); right_shift_16x16_avx2(in0, in1); fadst16_avx2(in0, in1); + write_buffer_16x16_avx2(output, in0, in1, 16); break; - case 3: // ADST_ADST + case ADST_ADST: + load_buffer_16x16_avx2(input, in0, in1, stride); fadst16_avx2(in0, in1); right_shift_16x16_avx2(in0, in1); fadst16_avx2(in0, in1); + write_buffer_16x16_avx2(output, in0, in1, 16); break; default: assert(0); break; } - write_buffer_16x16_avx2(output, in0, in1, 16); } #define FDCT32x32_2D_AVX2 vp9_fdct32x32_rd_avx2 |