Google Git
Sign in
aomedia/aom/e6aece8677b4dcf7c418b3bf49a6086243c992fe^!/.
commit
e6aece8677b4dcf7c418b3bf49a6086243c992fe
[log]
author
Angie Chiang <angiebird@google.com>
Mon Jan 09 17:27:56 2017 -0800
committer
Angie Chiang <angiebird@google.com>
Tue Jan 10 19:13:44 2017 +0000
tree
7d484d812e4f28d5e2b1335e66b77e91aa15d4fa
parent
b9f757c7bf5199bf8247932a8ca5f98ee32bf3a0 [diff]
Fix RunAccuracyCheck failure

Measure the accuracy of each transform in terms of per coefficient basis.
Set up a accuracy limit corresponding to current transform
implementation.

Change-Id: Ib7db9680c963427e94e728bf453b66180ce30b89

diff --git a/test/av1_fht16x16_test.cc b/test/av1_fht16x16_test.cc
index 1127c22..e46645a 100644
--- a/test/av1_fht16x16_test.cc
+++ b/test/av1_fht16x16_test.cc

@@ -87,7 +87,7 @@
 };
 
 TEST_P(AV1Trans16x16HT, MemCheck) { RunMemCheck(); }
-TEST_P(AV1Trans16x16HT, AccuracyCheck) { RunAccuracyCheck(1); }
+TEST_P(AV1Trans16x16HT, AccuracyCheck) { RunAccuracyCheck(1, 0.001); }
 TEST_P(AV1Trans16x16HT, InvAccuracyCheck) { RunInvAccuracyCheck(1); }
 TEST_P(AV1Trans16x16HT, CoeffCheck) { RunCoeffCheck(); }
 TEST_P(AV1Trans16x16HT, InvCoeffCheck) { RunInvCoeffCheck(); }

diff --git a/test/av1_fht16x32_test.cc b/test/av1_fht16x32_test.cc
index e07f4d0..ca9b91b 100644
--- a/test/av1_fht16x32_test.cc
+++ b/test/av1_fht16x32_test.cc

@@ -70,11 +70,11 @@
   IhtFunc inv_txfm_;
 };
 
-TEST_P(AV1Trans16x32HT, AccuracyCheck) { RunAccuracyCheck(1); }
+TEST_P(AV1Trans16x32HT, AccuracyCheck) { RunAccuracyCheck(4, 0.2); }
 TEST_P(AV1Trans16x32HT, CoeffCheck) { RunCoeffCheck(); }
 TEST_P(AV1Trans16x32HT, MemCheck) { RunMemCheck(); }
 TEST_P(AV1Trans16x32HT, InvCoeffCheck) { RunInvCoeffCheck(); }
-TEST_P(AV1Trans16x32HT, InvAccuracyCheck) { RunInvAccuracyCheck(1); }
+TEST_P(AV1Trans16x32HT, InvAccuracyCheck) { RunInvAccuracyCheck(4); }
 
 using std::tr1::make_tuple;
 const Ht16x32Param kArrayHt16x32Param_c[] = {

diff --git a/test/av1_fht16x8_test.cc b/test/av1_fht16x8_test.cc
index c92eba7..e0fbb95 100644
--- a/test/av1_fht16x8_test.cc
+++ b/test/av1_fht16x8_test.cc

@@ -70,7 +70,7 @@
   IhtFunc inv_txfm_;
 };
 
-TEST_P(AV1Trans16x8HT, AccuracyCheck) { RunAccuracyCheck(1); }
+TEST_P(AV1Trans16x8HT, AccuracyCheck) { RunAccuracyCheck(1, 0.001); }
 TEST_P(AV1Trans16x8HT, CoeffCheck) { RunCoeffCheck(); }
 TEST_P(AV1Trans16x8HT, MemCheck) { RunMemCheck(); }
 TEST_P(AV1Trans16x8HT, InvCoeffCheck) { RunInvCoeffCheck(); }

diff --git a/test/av1_fht32x16_test.cc b/test/av1_fht32x16_test.cc
index d85dfea..adf824c 100644
--- a/test/av1_fht32x16_test.cc
+++ b/test/av1_fht32x16_test.cc

@@ -71,10 +71,10 @@
 };
 
 TEST_P(AV1Trans32x16HT, MemCheck) { RunMemCheck(); }
-TEST_P(AV1Trans32x16HT, AccuracyCheck) { RunAccuracyCheck(1); }
+TEST_P(AV1Trans32x16HT, AccuracyCheck) { RunAccuracyCheck(4, 0.2); }
 TEST_P(AV1Trans32x16HT, CoeffCheck) { RunCoeffCheck(); }
 TEST_P(AV1Trans32x16HT, InvCoeffCheck) { RunInvCoeffCheck(); }
-TEST_P(AV1Trans32x16HT, InvAccuracyCheck) { RunInvAccuracyCheck(1); }
+TEST_P(AV1Trans32x16HT, InvAccuracyCheck) { RunInvAccuracyCheck(4); }
 
 using std::tr1::make_tuple;
 const Ht32x16Param kArrayHt32x16Param_c[] = {

diff --git a/test/av1_fht4x8_test.cc b/test/av1_fht4x8_test.cc
index 4962ec3..ddb2929 100644
--- a/test/av1_fht4x8_test.cc
+++ b/test/av1_fht4x8_test.cc

@@ -70,7 +70,7 @@
   IhtFunc inv_txfm_;
 };
 
-TEST_P(AV1Trans4x8HT, AccuracyCheck) { RunAccuracyCheck(0); }
+TEST_P(AV1Trans4x8HT, AccuracyCheck) { RunAccuracyCheck(0, 0.00001); }
 TEST_P(AV1Trans4x8HT, CoeffCheck) { RunCoeffCheck(); }
 TEST_P(AV1Trans4x8HT, MemCheck) { RunMemCheck(); }
 TEST_P(AV1Trans4x8HT, InvCoeffCheck) { RunInvCoeffCheck(); }

diff --git a/test/av1_fht8x16_test.cc b/test/av1_fht8x16_test.cc
index 88c38ac..9e92913 100644
--- a/test/av1_fht8x16_test.cc
+++ b/test/av1_fht8x16_test.cc

@@ -69,7 +69,7 @@
   IhtFunc inv_txfm_;
 };
 
-TEST_P(AV1Trans8x16HT, AccuracyCheck) { RunAccuracyCheck(1); }
+TEST_P(AV1Trans8x16HT, AccuracyCheck) { RunAccuracyCheck(1, 0.001); }
 TEST_P(AV1Trans8x16HT, MemCheck) { RunMemCheck(); }
 TEST_P(AV1Trans8x16HT, CoeffCheck) { RunCoeffCheck(); }
 TEST_P(AV1Trans8x16HT, InvCoeffCheck) { RunInvCoeffCheck(); }

diff --git a/test/av1_fht8x4_test.cc b/test/av1_fht8x4_test.cc
index 83a2d0e..dc63c0b 100644
--- a/test/av1_fht8x4_test.cc
+++ b/test/av1_fht8x4_test.cc

@@ -69,7 +69,7 @@
   IhtFunc inv_txfm_;
 };
 
-TEST_P(AV1Trans8x4HT, AccuracyCheck) { RunAccuracyCheck(0); }
+TEST_P(AV1Trans8x4HT, AccuracyCheck) { RunAccuracyCheck(0, 0.00001); }
 TEST_P(AV1Trans8x4HT, CoeffCheck) { RunCoeffCheck(); }
 TEST_P(AV1Trans8x4HT, MemCheck) { RunMemCheck(); }
 TEST_P(AV1Trans8x4HT, InvCoeffCheck) { RunInvCoeffCheck(); }

diff --git a/test/fdct4x4_test.cc b/test/fdct4x4_test.cc
index f7b0932..d8dcaf8 100644
--- a/test/fdct4x4_test.cc
+++ b/test/fdct4x4_test.cc

@@ -120,7 +120,7 @@
   IdctFunc inv_txfm_;
 };
 
-TEST_P(Trans4x4DCT, AccuracyCheck) { RunAccuracyCheck(1); }
+TEST_P(Trans4x4DCT, AccuracyCheck) { RunAccuracyCheck(0, 0.00001); }
 
 TEST_P(Trans4x4DCT, CoeffCheck) { RunCoeffCheck(); }
 
@@ -159,7 +159,7 @@
   IhtFunc inv_txfm_;
 };
 
-TEST_P(Trans4x4HT, AccuracyCheck) { RunAccuracyCheck(1); }
+TEST_P(Trans4x4HT, AccuracyCheck) { RunAccuracyCheck(0, 0.00001); }
 
 TEST_P(Trans4x4HT, CoeffCheck) { RunCoeffCheck(); }
 
@@ -197,7 +197,7 @@
   IdctFunc inv_txfm_;
 };
 
-TEST_P(Trans4x4WHT, AccuracyCheck) { RunAccuracyCheck(0); }
+TEST_P(Trans4x4WHT, AccuracyCheck) { RunAccuracyCheck(0, 0.00001); }
 
 TEST_P(Trans4x4WHT, CoeffCheck) { RunCoeffCheck(); }
 

diff --git a/test/transform_test_base.h b/test/transform_test_base.h
index a882235..b2ab4a9 100644
--- a/test/transform_test_base.h
+++ b/test/transform_test_base.h

@@ -42,7 +42,7 @@
 
   virtual void RunInvTxfm(const tran_low_t *out, uint8_t *dst, int stride) = 0;
 
-  void RunAccuracyCheck(int limit) {
+  void RunAccuracyCheck(uint32_t ref_max_error, double ref_avg_error) {
     ACMRandom rnd(ACMRandom::DeterministicSeed());
     uint32_t max_error = 0;
     int64_t total_error = 0;
@@ -104,11 +104,14 @@
       }
     }
 
-    EXPECT_GE(static_cast<uint32_t>(limit), max_error)
-        << "Error: FHT/IHT has an individual round trip error > " << limit;
+    double avg_error = total_error * 1. / count_test_block / num_coeffs_;
 
-    EXPECT_GE(count_test_block * limit, total_error)
-        << "Error: FHT/IHT has average round trip error > " << limit
+    EXPECT_GE(ref_max_error, max_error)
+        << "Error: FHT/IHT has an individual round trip error > "
+        << ref_max_error;
+
+    EXPECT_GE(ref_avg_error, avg_error)
+        << "Error: FHT/IHT has average round trip error > " << ref_avg_error
         << " per block";
 
     aom_free(test_input_block);