summaryrefslogtreecommitdiff
path: root/vp9/common
diff options
context:
space:
mode:
authorLinfeng Zhang <linfengz@google.com>2018-01-23 18:28:59 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-01-23 18:28:59 +0000
commit8fd648c78abfa89752f5843a3d4ac2a49b358402 (patch)
tree61c10132d518b7dcd58481028a959d987ebe8f79 /vp9/common
parentb8159fab384dca7b906b6c8d7e9608a5a6c07084 (diff)
parent8f50e0601295c51dc7f783f923b958a77852e93d (diff)
downloadlibvpx-8fd648c78abfa89752f5843a3d4ac2a49b358402.tar
libvpx-8fd648c78abfa89752f5843a3d4ac2a49b358402.tar.gz
libvpx-8fd648c78abfa89752f5843a3d4ac2a49b358402.tar.bz2
libvpx-8fd648c78abfa89752f5843a3d4ac2a49b358402.zip
Merge "Add "vpx_" prefix to 2 idct x86 functions"
Diffstat (limited to 'vp9/common')
-rw-r--r--vp9/common/x86/vp9_highbd_iht8x8_add_sse4.c12
-rw-r--r--vp9/common/x86/vp9_idct_intrin_sse2.c8
2 files changed, 10 insertions, 10 deletions
diff --git a/vp9/common/x86/vp9_highbd_iht8x8_add_sse4.c b/vp9/common/x86/vp9_highbd_iht8x8_add_sse4.c
index bc07518c2..7d949b6db 100644
--- a/vp9/common/x86/vp9_highbd_iht8x8_add_sse4.c
+++ b/vp9/common/x86/vp9_highbd_iht8x8_add_sse4.c
@@ -204,12 +204,12 @@ void vp9_highbd_iht8x8_64_add_sse4_1(const tran_low_t *input, uint16_t *dest,
io_short[7] = _mm_packs_epi32(io[11], io[15]);
if (tx_type == DCT_DCT || tx_type == ADST_DCT) {
- idct8_sse2(io_short);
+ vpx_idct8_sse2(io_short);
} else {
iadst8_sse2(io_short);
}
if (tx_type == DCT_DCT || tx_type == DCT_ADST) {
- idct8_sse2(io_short);
+ vpx_idct8_sse2(io_short);
} else {
iadst8_sse2(io_short);
}
@@ -218,8 +218,8 @@ void vp9_highbd_iht8x8_64_add_sse4_1(const tran_low_t *input, uint16_t *dest,
__m128i temp[4];
if (tx_type == DCT_DCT || tx_type == ADST_DCT) {
- highbd_idct8x8_half1d(io);
- highbd_idct8x8_half1d(&io[8]);
+ vpx_highbd_idct8x8_half1d_sse4_1(io);
+ vpx_highbd_idct8x8_half1d_sse4_1(&io[8]);
} else {
highbd_iadst8_sse4_1(io);
highbd_iadst8_sse4_1(&io[8]);
@@ -235,12 +235,12 @@ void vp9_highbd_iht8x8_64_add_sse4_1(const tran_low_t *input, uint16_t *dest,
io[7] = io[11];
if (tx_type == DCT_DCT || tx_type == DCT_ADST) {
- highbd_idct8x8_half1d(io);
+ vpx_highbd_idct8x8_half1d_sse4_1(io);
io[8] = temp[0];
io[9] = temp[1];
io[10] = temp[2];
io[11] = temp[3];
- highbd_idct8x8_half1d(&io[8]);
+ vpx_highbd_idct8x8_half1d_sse4_1(&io[8]);
} else {
highbd_iadst8_sse4_1(io);
io[8] = temp[0];
diff --git a/vp9/common/x86/vp9_idct_intrin_sse2.c b/vp9/common/x86/vp9_idct_intrin_sse2.c
index 6996260e2..95dad919e 100644
--- a/vp9/common/x86/vp9_idct_intrin_sse2.c
+++ b/vp9/common/x86/vp9_idct_intrin_sse2.c
@@ -68,16 +68,16 @@ void vp9_iht8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int stride,
switch (tx_type) {
case 0: // DCT_DCT
- idct8_sse2(in);
- idct8_sse2(in);
+ vpx_idct8_sse2(in);
+ vpx_idct8_sse2(in);
break;
case 1: // ADST_DCT
- idct8_sse2(in);
+ vpx_idct8_sse2(in);
iadst8_sse2(in);
break;
case 2: // DCT_ADST
iadst8_sse2(in);
- idct8_sse2(in);
+ vpx_idct8_sse2(in);
break;
case 3: // ADST_ADST
iadst8_sse2(in);