ref: a9c8251b9d3b6e829cca2edd83a2a83ae6af2c64
parent: 9cc4935d7b29339d193eb9da479a36142fce2409
parent: fa143dbc8ee275a0a63b5ce43e022c82080cba69
author: Dmitry Kovalev <dkovalev@google.com>
date: Wed Oct 23 07:38:55 EDT 2013
Merge "Renaming vp9_short_fdct8x8 to vp9_fdct8x8."
--- a/test/fdct8x8_test.cc
+++ b/test/fdct8x8_test.cc
@@ -35,7 +35,7 @@
int tx_type);
void fdct8x8_ref(int16_t *in, int16_t *out, int stride, int tx_type) {- vp9_short_fdct8x8_c(in, out, stride);
+ vp9_fdct8x8_c(in, out, stride);
}
void fht8x8_ref(int16_t *in, int16_t *out, int stride, int tx_type) {@@ -297,7 +297,7 @@
INSTANTIATE_TEST_CASE_P(
C, FwdTrans8x8DCT,
::testing::Values(
- make_tuple(&vp9_short_fdct8x8_c, &vp9_idct8x8_64_add_c, 0)));
+ make_tuple(&vp9_fdct8x8_c, &vp9_idct8x8_64_add_c, 0)));
INSTANTIATE_TEST_CASE_P(
C, FwdTrans8x8HT,
::testing::Values(
@@ -310,7 +310,7 @@
INSTANTIATE_TEST_CASE_P(
SSE2, FwdTrans8x8DCT,
::testing::Values(
- make_tuple(&vp9_short_fdct8x8_sse2, &vp9_idct8x8_64_add_sse2, 0)));
+ make_tuple(&vp9_fdct8x8_sse2, &vp9_idct8x8_64_add_sse2, 0)));
INSTANTIATE_TEST_CASE_P(
SSE2, FwdTrans8x8HT,
::testing::Values(
--- a/vp9/common/vp9_rtcd_defs.sh
+++ b/vp9/common/vp9_rtcd_defs.sh
@@ -695,8 +695,8 @@
prototype void vp9_short_fht16x16 "int16_t *InputData, int16_t *OutputData, int pitch, int tx_type"
specialize vp9_short_fht16x16 sse2
-prototype void vp9_short_fdct8x8 "int16_t *InputData, int16_t *OutputData, int stride"
-specialize vp9_short_fdct8x8 sse2
+prototype void vp9_fdct8x8 "int16_t *input, int16_t *output, int stride"
+specialize vp9_fdct8x8 sse2
prototype void vp9_short_fdct4x4 "int16_t *InputData, int16_t *OutputData, int stride"
specialize vp9_short_fdct4x4 sse2
--- a/vp9/common/x86/vp9_idct_intrin_sse2.c
+++ b/vp9/common/x86/vp9_idct_intrin_sse2.c
@@ -525,7 +525,7 @@
// 2-D
for (i = 0; i < 2; i++) {- // 8x8 Transpose is copied from vp9_short_fdct8x8_sse2()
+ // 8x8 Transpose is copied from vp9_fdct8x8_sse2()
TRANSPOSE_8X8(in0, in1, in2, in3, in4, in5, in6, in7, in0, in1, in2, in3,
in4, in5, in6, in7);
@@ -638,7 +638,7 @@
in6 = in[6];
in7 = in[7];
- // 8x8 Transpose is copied from vp9_short_fdct8x8_sse2()
+ // 8x8 Transpose is copied from vp9_fdct8x8_sse2()
TRANSPOSE_8X8(in0, in1, in2, in3, in4, in5, in6, in7, in0, in1, in2, in3,
in4, in5, in6, in7);
--- a/vp9/encoder/vp9_dct.c
+++ b/vp9/encoder/vp9_dct.c
@@ -229,7 +229,7 @@
output[7] = dct_const_round_shift(t3);
}
-void vp9_short_fdct8x8_c(int16_t *input, int16_t *final_output, int stride) {+void vp9_fdct8x8_c(int16_t *input, int16_t *final_output, int stride) {int i, j;
int16_t intermediate[64];
--- a/vp9/encoder/vp9_encodemb.c
+++ b/vp9/encoder/vp9_encodemb.c
@@ -391,7 +391,7 @@
xoff = 8 * (block & twmask);
yoff = 8 * (block >> twl);
src_diff = p->src_diff + 4 * bw * yoff + xoff;
- vp9_short_fdct8x8(src_diff, coeff, bw * 4);
+ vp9_fdct8x8(src_diff, coeff, bw * 4);
vp9_quantize_b(coeff, 64, x->skip_block, p->zbin, p->round,
p->quant, p->quant_shift, qcoeff, dqcoeff,
pd->dequant, p->zbin_extra, eob, scan, iscan);
@@ -584,7 +584,7 @@
if (tx_type != DCT_DCT)
vp9_short_fht8x8(src_diff, coeff, bw * 4, tx_type);
else
- vp9_short_fdct8x8(src_diff, coeff, bw * 4);
+ vp9_fdct8x8(src_diff, coeff, bw * 4);
vp9_quantize_b(coeff, 64, x->skip_block, p->zbin, p->round, p->quant,
p->quant_shift, qcoeff, dqcoeff,
pd->dequant, p->zbin_extra, eob, scan, iscan);
--- a/vp9/encoder/x86/vp9_dct_sse2.c
+++ b/vp9/encoder/x86/vp9_dct_sse2.c
@@ -270,7 +270,7 @@
write_buffer_4x4(output, in);
}
-void vp9_short_fdct8x8_sse2(int16_t *input, int16_t *output, int stride) {+void vp9_fdct8x8_sse2(int16_t *input, int16_t *output, int stride) {int pass;
// Constants
// When we use them, in one case, they are all the same. In all others
--
⑨