ref: dea22b4bdade9a854cb3d395bc25551093aa42ef
parent: ae0e747d6a41ec6aab149fcdff7db357a9280353
parent: a018988ce8b9a1823d896272fd8d7911afe67244
author: Dmitry Kovalev <dkovalev@google.com>
date: Wed Oct 23 10:18:57 EDT 2013
Merge "Renaming vp9_short_fdct32x32 to vp9_fdct32x32."
--- a/test/dct32x32_test.cc
+++ b/test/dct32x32_test.cc
@@ -150,7 +150,7 @@
input_block[j] = rnd.Rand8() - rnd.Rand8();
const int stride = 32;
- vp9_short_fdct32x32_c(input_block, output_ref_block, stride);
+ vp9_fdct32x32_c(input_block, output_ref_block, stride);
REGISTER_STATE_CHECK(fwd_txfm_(input_block, output_block, stride));
if (version_ == 0) {@@ -188,7 +188,7 @@
input_extreme_block[j] = -255;
const int stride = 32;
- vp9_short_fdct32x32_c(input_extreme_block, output_ref_block, stride);
+ vp9_fdct32x32_c(input_extreme_block, output_ref_block, stride);
REGISTER_STATE_CHECK(fwd_txfm_(input_extreme_block, output_block, stride));
// The minimum quant value is 4.
@@ -246,16 +246,16 @@
INSTANTIATE_TEST_CASE_P(
C, Trans32x32Test,
::testing::Values(
- make_tuple(&vp9_short_fdct32x32_c, &vp9_idct32x32_1024_add_c, 0),
- make_tuple(&vp9_short_fdct32x32_rd_c, &vp9_idct32x32_1024_add_c, 1)));
+ make_tuple(&vp9_fdct32x32_c, &vp9_idct32x32_1024_add_c, 0),
+ make_tuple(&vp9_fdct32x32_rd_c, &vp9_idct32x32_1024_add_c, 1)));
#if HAVE_SSE2
INSTANTIATE_TEST_CASE_P(
SSE2, Trans32x32Test,
::testing::Values(
- make_tuple(&vp9_short_fdct32x32_sse2,
+ make_tuple(&vp9_fdct32x32_sse2,
&vp9_idct32x32_1024_add_sse2, 0),
- make_tuple(&vp9_short_fdct32x32_rd_sse2,
+ make_tuple(&vp9_fdct32x32_rd_sse2,
&vp9_idct32x32_1024_add_sse2, 1)));
#endif
} // namespace
--- a/vp9/common/vp9_rtcd_defs.sh
+++ b/vp9/common/vp9_rtcd_defs.sh
@@ -701,11 +701,11 @@
prototype void vp9_short_fdct4x4 "int16_t *InputData, int16_t *OutputData, int stride"
specialize vp9_short_fdct4x4 sse2
-prototype void vp9_short_fdct32x32 "int16_t *InputData, int16_t *OutputData, int stride"
-specialize vp9_short_fdct32x32 sse2
+prototype void vp9_fdct32x32 "int16_t *input, int16_t *output, int stride"
+specialize vp9_fdct32x32 sse2
-prototype void vp9_short_fdct32x32_rd "int16_t *InputData, int16_t *OutputData, int stride"
-specialize vp9_short_fdct32x32_rd sse2
+prototype void vp9_fdct32x32_rd "int16_t *input, int16_t *output, int stride"
+specialize vp9_fdct32x32_rd sse2
prototype void vp9_fdct16x16 "int16_t *input, int16_t *output, int stride"
specialize vp9_fdct16x16 sse2
--- a/vp9/encoder/vp9_dct.c
+++ b/vp9/encoder/vp9_dct.c
@@ -1311,7 +1311,7 @@
output[31] = dct_32_round(step[31] * cospi_31_64 + step[16] * -cospi_1_64);
}
-void vp9_short_fdct32x32_c(int16_t *input, int16_t *out, int stride) {+void vp9_fdct32x32_c(int16_t *input, int16_t *out, int stride) {int i, j;
int output[32 * 32];
@@ -1339,7 +1339,7 @@
// Note that although we use dct_32_round in dct32_1d computation flow,
// this 2d fdct32x32 for rate-distortion optimization loop is operating
// within 16 bits precision.
-void vp9_short_fdct32x32_rd_c(int16_t *input, int16_t *out, int stride) {+void vp9_fdct32x32_rd_c(int16_t *input, int16_t *out, int stride) {int i, j;
int output[32 * 32];
--- a/vp9/encoder/vp9_encodemb.c
+++ b/vp9/encoder/vp9_encodemb.c
@@ -365,9 +365,9 @@
yoff = 32 * (block >> twl);
src_diff = p->src_diff + 4 * bw * yoff + xoff;
if (x->use_lp32x32fdct)
- vp9_short_fdct32x32_rd(src_diff, coeff, bw * 4);
+ vp9_fdct32x32_rd(src_diff, coeff, bw * 4);
else
- vp9_short_fdct32x32(src_diff, coeff, bw * 4);
+ vp9_fdct32x32(src_diff, coeff, bw * 4);
vp9_quantize_b_32x32(coeff, 1024, x->skip_block, p->zbin, p->round,
p->quant, p->quant_shift, qcoeff, dqcoeff,
pd->dequant, p->zbin_extra, eob, scan, iscan);
@@ -532,9 +532,9 @@
vp9_subtract_block(32, 32, src_diff, bw * 4,
src, p->src.stride, dst, pd->dst.stride);
if (x->use_lp32x32fdct)
- vp9_short_fdct32x32_rd(src_diff, coeff, bw * 4);
+ vp9_fdct32x32_rd(src_diff, coeff, bw * 4);
else
- vp9_short_fdct32x32(src_diff, coeff, bw * 4);
+ vp9_fdct32x32(src_diff, coeff, bw * 4);
vp9_quantize_b_32x32(coeff, 1024, 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
@@ -2563,13 +2563,13 @@
write_buffer_16x16(output, in0, in1, 16);
}
-#define FDCT32x32_2D vp9_short_fdct32x32_rd_sse2
+#define FDCT32x32_2D vp9_fdct32x32_rd_sse2
#define FDCT32x32_HIGH_PRECISION 0
#include "vp9/encoder/x86/vp9_dct32x32_sse2.c"
#undef FDCT32x32_2D
#undef FDCT32x32_HIGH_PRECISION
-#define FDCT32x32_2D vp9_short_fdct32x32_sse2
+#define FDCT32x32_2D vp9_fdct32x32_sse2
#define FDCT32x32_HIGH_PRECISION 1
#include "vp9/encoder/x86/vp9_dct32x32_sse2.c" // NOLINT
#undef FDCT32x32_2D