Update aom to commit id e87fb2378f01103d5d6e477a4ef6892dc714e614

1 files changed, 80 insertions, 13 deletions

diff --git a/third_party/aom/test/av1_inv_txfm2d_test.cc b/third_party/aom/test/av1_inv_txfm2d_test.cc
index 5185c1ca8..bccbdeebf 100644
--- a/third_party/aom/test/av1_inv_txfm2d_test.cc
+++ b/third_party/aom/test/av1_inv_txfm2d_test.cc
@@ -40,11 +40,12 @@ class AV1InvTxfm2d : public ::testing::TestWithParam<AV1InvTxfm2dParam> {
     tx_size_ = GET_PARAM(1);
     max_error_ = GET_PARAM(2);
     max_avg_error_ = GET_PARAM(3);
-    txfm1d_size_ = libaom_test::get_txfm1d_size(tx_size_);
-    txfm2d_size_ = txfm1d_size_ * txfm1d_size_;
   }
 
   void RunRoundtripCheck() {
+    int tx_w = tx_size_wide[tx_size_];
+    int tx_h = tx_size_high[tx_size_];
+    int txfm2d_size = tx_w * tx_h;
     const Fwd_Txfm2d_Func fwd_txfm_func =
         libaom_test::fwd_txfm_func_ls[tx_size_];
     const Inv_Txfm2d_Func inv_txfm_func =
@@ -56,9 +57,9 @@ class AV1InvTxfm2d : public ::testing::TestWithParam<AV1InvTxfm2dParam> {
 
     for (int ci = 0; ci < count; ci++) {
       int16_t expected[64 * 64] = { 0 };
-      ASSERT_LT(txfm2d_size_, NELEMENTS(expected));
+      ASSERT_LT(txfm2d_size, NELEMENTS(expected));
 
-      for (int ni = 0; ni < txfm2d_size_; ++ni) {
+      for (int ni = 0; ni < txfm2d_size; ++ni) {
         if (ci == 0) {
           int extreme_input = input_base - 1;
           expected[ni] = extreme_input;  // extreme case
@@ -68,25 +69,26 @@ class AV1InvTxfm2d : public ::testing::TestWithParam<AV1InvTxfm2dParam> {
       }
 
       int32_t coeffs[64 * 64] = { 0 };
-      ASSERT_LT(txfm2d_size_, NELEMENTS(coeffs));
-      fwd_txfm_func(expected, coeffs, txfm1d_size_, tx_type_, bd);
+      ASSERT_LT(txfm2d_size, NELEMENTS(coeffs));
+      fwd_txfm_func(expected, coeffs, tx_w, tx_type_, bd);
 
       uint16_t actual[64 * 64] = { 0 };
-      ASSERT_LT(txfm2d_size_, NELEMENTS(actual));
-      inv_txfm_func(coeffs, actual, txfm1d_size_, tx_type_, bd);
+      ASSERT_LT(txfm2d_size, NELEMENTS(actual));
+      inv_txfm_func(coeffs, actual, tx_w, tx_type_, bd);
 
-      for (int ni = 0; ni < txfm2d_size_; ++ni) {
+      for (int ni = 0; ni < txfm2d_size; ++ni) {
         EXPECT_GE(max_error_, abs(expected[ni] - actual[ni]));
       }
       avg_abs_error += compute_avg_abs_error<int16_t, uint16_t>(
-          expected, actual, txfm2d_size_);
+          expected, actual, txfm2d_size);
     }
 
     avg_abs_error /= count;
     // max_abs_avg_error comes from upper bound of
     // printf("txfm1d_size: %d accuracy_avg_abs_error: %f\n",
     // txfm1d_size_, avg_abs_error);
-    EXPECT_GE(max_avg_error_, avg_abs_error);
+    EXPECT_GE(max_avg_error_, avg_abs_error)
+        << " tx_w: " << tx_w << " tx_h " << tx_h << " tx_type: " << tx_type_;
   }
 
  private:
@@ -94,14 +96,53 @@ class AV1InvTxfm2d : public ::testing::TestWithParam<AV1InvTxfm2dParam> {
   double max_avg_error_;
   TX_TYPE tx_type_;
   TX_SIZE tx_size_;
-  int txfm1d_size_;
-  int txfm2d_size_;
 };
 
 TEST_P(AV1InvTxfm2d, RunRoundtripCheck) { RunRoundtripCheck(); }
 
 const AV1InvTxfm2dParam av1_inv_txfm2d_param[] = {
 #if CONFIG_EXT_TX
+#if CONFIG_RECT_TX
+  AV1InvTxfm2dParam(DCT_DCT, TX_4X8, 2, 0.007),
+  AV1InvTxfm2dParam(ADST_DCT, TX_4X8, 2, 0.012),
+  AV1InvTxfm2dParam(DCT_ADST, TX_4X8, 2, 0.012),
+  AV1InvTxfm2dParam(ADST_ADST, TX_4X8, 2, 0.012),
+  AV1InvTxfm2dParam(FLIPADST_DCT, TX_4X8, 2, 0.012),
+  AV1InvTxfm2dParam(DCT_FLIPADST, TX_4X8, 2, 0.012),
+  AV1InvTxfm2dParam(FLIPADST_FLIPADST, TX_4X8, 2, 0.012),
+  AV1InvTxfm2dParam(ADST_FLIPADST, TX_4X8, 2, 0.012),
+  AV1InvTxfm2dParam(FLIPADST_ADST, TX_4X8, 2, 0.012),
+
+  AV1InvTxfm2dParam(DCT_DCT, TX_8X4, 2, 0.007),
+  AV1InvTxfm2dParam(ADST_DCT, TX_8X4, 2, 0.012),
+  AV1InvTxfm2dParam(DCT_ADST, TX_8X4, 2, 0.012),
+  AV1InvTxfm2dParam(ADST_ADST, TX_8X4, 2, 0.012),
+  AV1InvTxfm2dParam(FLIPADST_DCT, TX_8X4, 2, 0.007),
+  AV1InvTxfm2dParam(DCT_FLIPADST, TX_8X4, 2, 0.012),
+  AV1InvTxfm2dParam(FLIPADST_FLIPADST, TX_8X4, 2, 0.012),
+  AV1InvTxfm2dParam(ADST_FLIPADST, TX_8X4, 2, 0.012),
+  AV1InvTxfm2dParam(FLIPADST_ADST, TX_8X4, 2, 0.012),
+
+  AV1InvTxfm2dParam(DCT_DCT, TX_8X16, 2, 0.025),
+  AV1InvTxfm2dParam(ADST_DCT, TX_8X16, 2, 0.020),
+  AV1InvTxfm2dParam(DCT_ADST, TX_8X16, 2, 0.027),
+  AV1InvTxfm2dParam(ADST_ADST, TX_8X16, 2, 0.023),
+  AV1InvTxfm2dParam(FLIPADST_DCT, TX_8X16, 2, 0.020),
+  AV1InvTxfm2dParam(DCT_FLIPADST, TX_8X16, 2, 0.027),
+  AV1InvTxfm2dParam(FLIPADST_FLIPADST, TX_8X16, 2, 0.032),
+  AV1InvTxfm2dParam(ADST_FLIPADST, TX_8X16, 2, 0.023),
+  AV1InvTxfm2dParam(FLIPADST_ADST, TX_8X16, 2, 0.023),
+
+  AV1InvTxfm2dParam(DCT_DCT, TX_16X8, 2, 0.007),
+  AV1InvTxfm2dParam(ADST_DCT, TX_16X8, 2, 0.012),
+  AV1InvTxfm2dParam(DCT_ADST, TX_16X8, 2, 0.024),
+  AV1InvTxfm2dParam(ADST_ADST, TX_16X8, 2, 0.033),
+  AV1InvTxfm2dParam(FLIPADST_DCT, TX_16X8, 2, 0.015),
+  AV1InvTxfm2dParam(DCT_FLIPADST, TX_16X8, 2, 0.032),
+  AV1InvTxfm2dParam(FLIPADST_FLIPADST, TX_16X8, 2, 0.032),
+  AV1InvTxfm2dParam(ADST_FLIPADST, TX_16X8, 2, 0.033),
+  AV1InvTxfm2dParam(FLIPADST_ADST, TX_16X8, 2, 0.032),
+#endif
   AV1InvTxfm2dParam(FLIPADST_DCT, TX_4X4, 2, 0.002),
   AV1InvTxfm2dParam(DCT_FLIPADST, TX_4X4, 2, 0.002),
   AV1InvTxfm2dParam(FLIPADST_FLIPADST, TX_4X4, 2, 0.002),
@@ -144,6 +185,32 @@ const AV1InvTxfm2dParam av1_inv_txfm2d_param[] = {
 INSTANTIATE_TEST_CASE_P(C, AV1InvTxfm2d,
                         ::testing::ValuesIn(av1_inv_txfm2d_param));
 
+TEST(AV1InvTxfm2d, CfgTest) {
+  for (int bd_idx = 0; bd_idx < BD_NUM; ++bd_idx) {
+    int bd = libaom_test::bd_arr[bd_idx];
+    int8_t low_range = libaom_test::low_range_arr[bd_idx];
+    int8_t high_range = libaom_test::high_range_arr[bd_idx];
+    // TODO(angiebird): include rect txfm in this test
+    for (int tx_size = 0; tx_size < TX_SIZES; ++tx_size) {
+      for (int tx_type = 0; tx_type < TX_TYPES; ++tx_type) {
+        TXFM_2D_FLIP_CFG cfg = av1_get_inv_txfm_cfg(
+            static_cast<TX_TYPE>(tx_type), static_cast<TX_SIZE>(tx_size));
+        int8_t stage_range_col[MAX_TXFM_STAGE_NUM];
+        int8_t stage_range_row[MAX_TXFM_STAGE_NUM];
+        av1_gen_inv_stage_range(stage_range_col, stage_range_row, &cfg,
+                                fwd_shift_sum[tx_size], bd);
+        const TXFM_1D_CFG *col_cfg = cfg.col_cfg;
+        const TXFM_1D_CFG *row_cfg = cfg.row_cfg;
+        libaom_test::txfm_stage_range_check(stage_range_col, col_cfg->stage_num,
+                                            col_cfg->cos_bit, low_range,
+                                            high_range);
+        libaom_test::txfm_stage_range_check(stage_range_row, row_cfg->stage_num,
+                                            row_cfg->cos_bit, low_range,
+                                            high_range);
+      }
+    }
+  }
+}
 #endif  // CONFIG_HIGHBITDEPTH
 
 }  // namespace