AV1InvTxfm2d.RunRoundtripCheck: Add TX64X64 test. Small related fix in the test itself. BUG=aomedia:1114 Change-Id: I4a2d9c096e691e6b1a7aa9e4df93752aed8c0935
diff --git a/test/av1_inv_txfm2d_test.cc b/test/av1_inv_txfm2d_test.cc index 7a3257a..bbc3501 100644 --- a/test/av1_inv_txfm2d_test.cc +++ b/test/av1_inv_txfm2d_test.cc
@@ -57,7 +57,7 @@ for (int ci = 0; ci < count; ci++) { int16_t expected[64 * 64] = { 0 }; - ASSERT_LT(txfm2d_size, NELEMENTS(expected)); + ASSERT_LE(txfm2d_size, NELEMENTS(expected)); for (int ni = 0; ni < txfm2d_size; ++ni) { if (ci == 0) { @@ -69,11 +69,11 @@ } int32_t coeffs[64 * 64] = { 0 }; - ASSERT_LT(txfm2d_size, NELEMENTS(coeffs)); + ASSERT_LE(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)); + ASSERT_LE(txfm2d_size, NELEMENTS(actual)); inv_txfm_func(coeffs, actual, tx_w, tx_type_, bd); for (int ni = 0; ni < txfm2d_size; ++ni) { @@ -176,7 +176,12 @@ AV1InvTxfm2dParam(DCT_DCT, TX_32X32, 4, 0.4), AV1InvTxfm2dParam(ADST_DCT, TX_32X32, 4, 0.4), AV1InvTxfm2dParam(DCT_ADST, TX_32X32, 4, 0.4), - AV1InvTxfm2dParam(ADST_ADST, TX_32X32, 4, 0.4) + AV1InvTxfm2dParam(ADST_ADST, TX_32X32, 4, 0.4), +#if CONFIG_TX64X64 + // Large round trip error expected, because of inherent approximation in the + // transform. + AV1InvTxfm2dParam(DCT_DCT, TX_64X64, 900, 214), +#endif // CONFIG_TX64X64 }; INSTANTIATE_TEST_CASE_P(C, AV1InvTxfm2d,