generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix vp10 txfm on MSVC 2015." into nextgenv2

Browse Source
This commit is contained in:
Alex Converse
2016-04-27 21:38:30 +00:00
committed by Gerrit Code Review
parent bd76fc0492 97673cb128
commit 38dfee802f
1 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
vp10/common/x86/vp10_txfm1d_sse4.h
View File

@@ -81,33 +81,32 @@ static INLINE void transpose_32(int txfm_size, const __m128i* input,
}
}
#define round_shift_32_sse4_1(vec, bit) \
({ \
__m128i tmp, round; \
round = _mm_set1_epi32(1 << (bit - 1)); \
tmp = _mm_add_epi32(vec, round); \
_mm_srai_epi32(tmp, bit); \
})
static INLINE __m128i round_shift_32_sse4_1(__m128i vec, int bit) {
__m128i tmp, round;
round = _mm_set1_epi32(1 << (bit - 1));
tmp = _mm_add_epi32(vec, round);
return _mm_srai_epi32(tmp, bit);
}
#define round_shift_array_32_sse4_1(input, output, size, bit) \
({ \
if (bit > 0) { \
int i; \
for (i = 0; i < size; i++) { \
output[i] = round_shift_32_sse4_1(input[i], bit); \
} \
} else { \
int i; \
for (i = 0; i < size; i++) { \
output[i] = _mm_slli_epi32(input[i], -bit); \
} \
} \
})
static INLINE void round_shift_array_32_sse4_1(__m128i *input, __m128i *output,
const int size, const int bit) {
if (bit > 0) {
int i;
for (i = 0; i < size; i++) {
output[i] = round_shift_32_sse4_1(input[i], bit);
}
} else {
int i;
for (i = 0; i < size; i++) {
output[i] = _mm_slli_epi32(input[i], -bit);
}
}
}
// out0 = in0*w0 + in1*w1
// out1 = -in1*w0 + in0*w1
#define btf_32_sse4_1_type0(w0, w1, in0, in1, out0, out1, bit) \
({ \
do { \
__m128i ww0, ww1, in0_w0, in1_w1, in0_w1, in1_w0; \
ww0 = _mm_set1_epi32(w0); \
ww1 = _mm_set1_epi32(w1); \
@@ -119,12 +118,12 @@ static INLINE void transpose_32(int txfm_size, const __m128i* input,
in1_w0 = _mm_mullo_epi32(in1, ww0); \
out1 = _mm_sub_epi32(in0_w1, in1_w0); \
out1 = round_shift_32_sse4_1(out1, bit); \
})
} while (0)
// out0 = in0*w0 + in1*w1
// out1 = in1*w0 - in0*w1
#define btf_32_sse4_1_type1(w0, w1, in0, in1, out0, out1, bit) \
({ \
do { \
__m128i ww0, ww1, in0_w0, in1_w1, in0_w1, in1_w0; \
ww0 = _mm_set1_epi32(w0); \
ww1 = _mm_set1_epi32(w1); \
@@ -136,7 +135,7 @@ static INLINE void transpose_32(int txfm_size, const __m128i* input,
in1_w0 = _mm_mullo_epi32(in1, ww0); \
out1 = _mm_sub_epi32(in1_w0, in0_w1); \
out1 = round_shift_32_sse4_1(out1, bit); \
})
} while (0)
#ifdef __cplusplus
}