Commit b0612009 authored by Angie Chiang's avatar Angie Chiang Committed by Gerrit Code Review
Browse files

Merge "Turn on flip in inverse txfm2d" into nextgenv2

parents 8c125eaf 6f28581b
......@@ -132,7 +132,7 @@ void VP10HighbdTrans16x16HT::RunBitexactCheck() {
ACMRandom rnd(ACMRandom::DeterministicSeed());
int i, j;
const int stride = 16;
const int num_tests = 200000;
const int num_tests = 1000;
for (i = 0; i < num_tests; ++i) {
for (j = 0; j < num_coeffs_; ++j) {
......@@ -208,6 +208,7 @@ const HighbdHt16x16Param kArrayHBDHt16x16Param_sse4_1[] = {
make_tuple(&vp10_fwd_txfm2d_16x16_sse4_1, 2, 12),
make_tuple(&vp10_fwd_txfm2d_16x16_sse4_1, 3, 10),
make_tuple(&vp10_fwd_txfm2d_16x16_sse4_1, 3, 12),
#if CONFIG_EXT_TX
make_tuple(&vp10_fwd_txfm2d_16x16_sse4_1, 4, 10),
make_tuple(&vp10_fwd_txfm2d_16x16_sse4_1, 4, 12),
make_tuple(&vp10_fwd_txfm2d_16x16_sse4_1, 5, 10),
......@@ -218,7 +219,6 @@ const HighbdHt16x16Param kArrayHBDHt16x16Param_sse4_1[] = {
make_tuple(&vp10_fwd_txfm2d_16x16_sse4_1, 7, 12),
make_tuple(&vp10_fwd_txfm2d_16x16_sse4_1, 8, 10),
make_tuple(&vp10_fwd_txfm2d_16x16_sse4_1, 8, 12),
#if CONFIG_EXT_TX
#endif // CONFIG_EXT_TX
};
INSTANTIATE_TEST_CASE_P(
......
......@@ -132,7 +132,7 @@ void VP10HighbdTrans4x4HT::RunBitexactCheck() {
ACMRandom rnd(ACMRandom::DeterministicSeed());
int i, j;
const int stride = 4;
const int num_tests = 200000;
const int num_tests = 1000;
const int num_coeffs = 16;
for (i = 0; i < num_tests; ++i) {
......
......@@ -131,7 +131,7 @@ void VP10HighbdTrans8x8HT::RunBitexactCheck() {
ACMRandom rnd(ACMRandom::DeterministicSeed());
int i, j;
const int stride = 8;
const int num_tests = 200000;
const int num_tests = 1000;
const int num_coeffs = 64;
for (i = 0; i < num_tests; ++i) {
......
......@@ -1297,7 +1297,8 @@ void vp10_highbd_inv_txfm_add_4x4(const tran_low_t *input, uint8_t *dest,
case FLIPADST_FLIPADST:
case ADST_FLIPADST:
case FLIPADST_ADST:
vp10_highbd_iht4x4_16_add(input, dest, stride, tx_type, bd);
vp10_inv_txfm2d_add_4x4_c(input, CONVERT_TO_SHORTPTR(dest), stride,
tx_type, bd);
break;
case V_DCT:
case H_DCT:
......@@ -1336,7 +1337,8 @@ void vp10_highbd_inv_txfm_add_8x8(const tran_low_t *input, uint8_t *dest,
case FLIPADST_FLIPADST:
case ADST_FLIPADST:
case FLIPADST_ADST:
vp10_highbd_iht8x8_64_add(input, dest, stride, tx_type, bd);
vp10_inv_txfm2d_add_8x8_c(input, CONVERT_TO_SHORTPTR(dest), stride,
tx_type, bd);
break;
case V_DCT:
case H_DCT:
......@@ -1375,7 +1377,8 @@ void vp10_highbd_inv_txfm_add_16x16(const tran_low_t *input, uint8_t *dest,
case FLIPADST_FLIPADST:
case ADST_FLIPADST:
case FLIPADST_ADST:
vp10_highbd_iht16x16_256_add(input, dest, stride, tx_type, bd);
vp10_inv_txfm2d_add_16x16_c(input, CONVERT_TO_SHORTPTR(dest), stride,
tx_type, bd);
break;
case V_DCT:
case H_DCT:
......
......@@ -997,6 +997,7 @@ void vp10_fwd_txfm2d_8x8_sse4_1(const int16_t *input, int32_t *coeff,
transpose_8x8(out, in);
write_buffer_8x8(in, coeff);
break;
#if CONFIG_EXT_TX
case FLIPADST_DCT:
cfg = &fwd_txfm_2d_cfg_adst_dct_8;
load_buffer_8x8(input, in, stride, 1, 0, cfg->shift[0]);
......@@ -1047,6 +1048,7 @@ void vp10_fwd_txfm2d_8x8_sse4_1(const int16_t *input, int32_t *coeff,
transpose_8x8(out, in);
write_buffer_8x8(in, coeff);
break;
#endif // CONFIG_EXT_TX
default:
assert(0);
}
......@@ -1893,6 +1895,7 @@ void vp10_fwd_txfm2d_16x16_sse4_1(const int16_t *input, int32_t *coeff,
transpose_16x16(out, in);
write_buffer_16x16(in, coeff);
break;
#if CONFIG_EXT_TX
case FLIPADST_DCT:
cfg = &fwd_txfm_2d_cfg_adst_dct_16;
load_buffer_16x16(input, in, stride, 1, 0, cfg->shift[0]);
......@@ -1943,6 +1946,7 @@ void vp10_fwd_txfm2d_16x16_sse4_1(const int16_t *input, int32_t *coeff,
transpose_16x16(out, in);
write_buffer_16x16(in, coeff);
break;
#endif // CONFIG_EXT_TX
default:
assert(0);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment