Turn on flip in inverse txfm2d

Fix build failed
Reduce txfm test time

Change-Id: Ieaf6b27f3a272d06286f817f01230413fa8adcf6

diff --git a/test/vp10_fht16x16_test.cc b/test/vp10_fht16x16_test.cc
index 97f2c024f1bc41ce23cd942533200cb94f05f871..deccc813e06f70a1fff1dd0ecb2f5c89160c73cf 100644 (file)
--- a/test/vp10_fht16x16_test.cc
+++ b/test/vp10_fht16x16_test.cc
@@ -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(

diff --git a/test/vp10_fht4x4_test.cc b/test/vp10_fht4x4_test.cc
index 130982790cb5759a21868d800e4ceb9b49750ed0..c5a43828c7a64f4511e711aa0e139493d7af878a 100644 (file)
--- a/test/vp10_fht4x4_test.cc
+++ b/test/vp10_fht4x4_test.cc
@@ -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) {

diff --git a/test/vp10_fht8x8_test.cc b/test/vp10_fht8x8_test.cc
index 2c3393923761ea0fd0cd68054f02cc2a8f43da40..da278c49d98ba211c1af8ed63d99451cc3e6d8a9 100644 (file)
--- a/test/vp10_fht8x8_test.cc
+++ b/test/vp10_fht8x8_test.cc
@@ -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) {

diff --git a/vp10/common/idct.c b/vp10/common/idct.c
index a5d50bbdbb45a8ccd2e18621cbb300d5a514ede9..717c914290e9c67fd080a851a536e196fb63d307 100644 (file)
--- a/vp10/common/idct.c
+++ b/vp10/common/idct.c
@@ -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:

diff --git a/vp10/encoder/x86/highbd_fwd_txfm_sse4.c b/vp10/encoder/x86/highbd_fwd_txfm_sse4.c
index 2ad59cf3fb56de3a04fb64d414e361a1a67d73bf..8b27f5569895e9648c33bf25ba40d1faecaa10ed 100644 (file)
--- a/vp10/encoder/x86/highbd_fwd_txfm_sse4.c
+++ b/vp10/encoder/x86/highbd_fwd_txfm_sse4.c
@@ -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);
   }