aom_dsp/x86/txfm_common_av2.h: remove av1_ prefix
BUG=aomedia:2734
Change-Id: I164ad3b721a36eb2ee67a1581e2905d0bc9686cb
diff --git a/aom_dsp/x86/txfm_common_avx2.h b/aom_dsp/x86/txfm_common_avx2.h
index ea57c9f..4105250 100644
--- a/aom_dsp/x86/txfm_common_avx2.h
+++ b/aom_dsp/x86/txfm_common_avx2.h
@@ -246,21 +246,19 @@
}
}
-static INLINE __m256i av1_round_shift_32_avx2(__m256i vec, int bit) {
+static INLINE __m256i round_shift_32_avx2(__m256i vec, int bit) {
__m256i tmp, round;
round = _mm256_set1_epi32(1 << (bit - 1));
tmp = _mm256_add_epi32(vec, round);
return _mm256_srai_epi32(tmp, bit);
}
-static INLINE void av1_round_shift_array_32_avx2(__m256i *input,
- __m256i *output,
- const int size,
- const int bit) {
+static INLINE void round_shift_array_32_avx2(__m256i *input, __m256i *output,
+ const int size, const int bit) {
if (bit > 0) {
int i;
for (i = 0; i < size; i++) {
- output[i] = av1_round_shift_32_avx2(input[i], bit);
+ output[i] = round_shift_32_avx2(input[i], bit);
}
} else {
int i;
@@ -270,25 +268,24 @@
}
}
-static INLINE void av1_round_shift_rect_array_32_avx2(__m256i *input,
- __m256i *output,
- const int size,
- const int bit,
- const int val) {
+static INLINE void round_shift_rect_array_32_avx2(__m256i *input,
+ __m256i *output,
+ const int size, const int bit,
+ const int val) {
const __m256i sqrt2 = _mm256_set1_epi32(val);
if (bit > 0) {
int i;
for (i = 0; i < size; i++) {
- const __m256i r0 = av1_round_shift_32_avx2(input[i], bit);
+ const __m256i r0 = round_shift_32_avx2(input[i], bit);
const __m256i r1 = _mm256_mullo_epi32(sqrt2, r0);
- output[i] = av1_round_shift_32_avx2(r1, NewSqrt2Bits);
+ output[i] = round_shift_32_avx2(r1, NewSqrt2Bits);
}
} else {
int i;
for (i = 0; i < size; i++) {
const __m256i r0 = _mm256_slli_epi32(input[i], -bit);
const __m256i r1 = _mm256_mullo_epi32(sqrt2, r0);
- output[i] = av1_round_shift_32_avx2(r1, NewSqrt2Bits);
+ output[i] = round_shift_32_avx2(r1, NewSqrt2Bits);
}
}
}
diff --git a/av1/common/x86/highbd_inv_txfm_avx2.c b/av1/common/x86/highbd_inv_txfm_avx2.c
index 93e98e4..87613e8 100644
--- a/av1/common/x86/highbd_inv_txfm_avx2.c
+++ b/av1/common/x86/highbd_inv_txfm_avx2.c
@@ -4146,8 +4146,8 @@
transpose_8x8_avx2(&buf0_cur[0], &buf0_cur[0]);
}
if (rect_type == 1 || rect_type == -1) {
- av1_round_shift_rect_array_32_avx2(
- buf0, buf0, buf_size_nonzero_w_div8 << 3, 0, NewInvSqrt2);
+ round_shift_rect_array_32_avx2(buf0, buf0, buf_size_nonzero_w_div8 << 3,
+ 0, NewInvSqrt2);
}
row_txfm(buf0, buf0, av1_inv_cos_bit_row[txw_idx][txh_idx], 0, bd,
-shift[0]);
@@ -4169,9 +4169,9 @@
col_txfm(buf1 + i * txfm_size_row, buf1 + i * txfm_size_row,
av1_inv_cos_bit_col[txw_idx][txh_idx], 1, bd, 0);
- av1_round_shift_array_32_avx2(buf1 + i * txfm_size_row,
- buf1 + i * txfm_size_row, txfm_size_row,
- -shift[1]);
+ round_shift_array_32_avx2(buf1 + i * txfm_size_row,
+ buf1 + i * txfm_size_row, txfm_size_row,
+ -shift[1]);
}
// write to buffer
diff --git a/av1/encoder/x86/av1_fwd_txfm2d_avx2.c b/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
index 634d50b..3c9191e 100644
--- a/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
+++ b/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
@@ -1704,8 +1704,8 @@
}
fdct64_new_avx2(bufA, bufA, cos_bit_row);
fdct64_new_avx2(bufB, bufB, cos_bit_row);
- av1_round_shift_array_32_avx2(bufA, bufA, 32, -shift[2]);
- av1_round_shift_array_32_avx2(bufB, bufB, 32, -shift[2]);
+ round_shift_array_32_avx2(bufA, bufA, 32, -shift[2]);
+ round_shift_array_32_avx2(bufB, bufB, 32, -shift[2]);
int32_t *output8 = output + 16 * 32 * i;
for (int j = 0; j < 4; ++j) {
@@ -1843,8 +1843,8 @@
}
fdct64_new_avx2(bufA, bufA, cos_bit_row);
fdct64_new_avx2(bufB, bufB, cos_bit_row);
- av1_round_shift_rect_array_32_avx2(bufA, bufA, 32, -shift[2], NewSqrt2);
- av1_round_shift_rect_array_32_avx2(bufB, bufB, 32, -shift[2], NewSqrt2);
+ round_shift_rect_array_32_avx2(bufA, bufA, 32, -shift[2], NewSqrt2);
+ round_shift_rect_array_32_avx2(bufB, bufB, 32, -shift[2], NewSqrt2);
int32_t *output8 = output + 16 * 32 * i;
for (int j = 0; j < 4; ++j) {
@@ -1893,8 +1893,8 @@
}
fdct32_avx2(bufA, bufA, cos_bit_row);
fdct32_avx2(bufB, bufB, cos_bit_row);
- av1_round_shift_rect_array_32_avx2(bufA, bufA, 32, -shift[2], NewSqrt2);
- av1_round_shift_rect_array_32_avx2(bufB, bufB, 32, -shift[2], NewSqrt2);
+ round_shift_rect_array_32_avx2(bufA, bufA, 32, -shift[2], NewSqrt2);
+ round_shift_rect_array_32_avx2(bufB, bufB, 32, -shift[2], NewSqrt2);
int32_t *output8 = output + 16 * 32 * i;
for (int j = 0; j < 4; ++j) {
diff --git a/av1/encoder/x86/highbd_fwd_txfm_avx2.c b/av1/encoder/x86/highbd_fwd_txfm_avx2.c
index a81378c..1faa412 100644
--- a/av1/encoder/x86/highbd_fwd_txfm_avx2.c
+++ b/av1/encoder/x86/highbd_fwd_txfm_avx2.c
@@ -1335,7 +1335,7 @@
row_txfm(in, out, bit, 2, 2);
fwd_txfm_transpose_8x8_avx2(out, in, 2, 1);
fwd_txfm_transpose_8x8_avx2(&out[1], &in[8], 2, 1);
- av1_round_shift_rect_array_32_avx2(in, in, 16, -shift[2], NewSqrt2);
+ round_shift_rect_array_32_avx2(in, in, 16, -shift[2], NewSqrt2);
store_buffer_avx2(in, coeff, 8, 16);
(void)bd;
}
@@ -1396,7 +1396,7 @@
row_txfm(in, out, bit, 1, 1);
fwd_txfm_transpose_8x8_avx2(out, in, 1, 2);
fwd_txfm_transpose_8x8_avx2(&out[8], &in[1], 1, 2);
- av1_round_shift_rect_array_32_avx2(in, in, 16, -shift[2], NewSqrt2);
+ round_shift_rect_array_32_avx2(in, in, 16, -shift[2], NewSqrt2);
store_buffer_avx2(in, coeff, 8, 16);
(void)bd;
}
