Merge "Renaming vp9_short_fdct8x8 to vp9_fdct8x8."
This commit is contained in:
commit
a9c8251b9d
@ -35,7 +35,7 @@ typedef void (*iht_t) (const int16_t *in, uint8_t *dst, int stride,
|
||||
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 @@ using std::tr1::make_tuple;
|
||||
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(
|
||||
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(
|
||||
|
@ -695,8 +695,8 @@ specialize vp9_short_fht8x8 sse2
|
||||
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
|
||||
|
@ -525,7 +525,7 @@ void vp9_idct8x8_64_add_sse2(const int16_t *input, uint8_t *dest, int stride) {
|
||||
|
||||
// 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 @@ static void idct8_1d_sse2(__m128i *in) {
|
||||
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);
|
||||
|
||||
|
@ -229,7 +229,7 @@ static void fdct8(const int16_t *input, int16_t *output) {
|
||||
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];
|
||||
|
||||
|
@ -391,7 +391,7 @@ void vp9_xform_quant(int plane, int block, BLOCK_SIZE plane_bsize,
|
||||
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 @@ void vp9_encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
|
||||
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);
|
||||
|
@ -270,7 +270,7 @@ void vp9_short_fht4x4_sse2(int16_t *input, int16_t *output,
|
||||
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
|
||||
|
Loading…
x
Reference in New Issue
Block a user