commit 835be843aeb1fa050ec85f7d23f4d149469ccff0
author Urvang Joshi <urvang@google.com> Mon Oct 19 15:20:23 2020 -0700
committer Urvang Joshi <urvang@google.com> Mon Oct 19 15:50:59 2020 -0700
tree e7bbcc0a3e578a6dbf3c0f77f1f4184b9bde0877
parent e198bf141f7c1dfdbb2995dbd880ca723d99e490

Superres test: Tighten PSNR thresholds.

Also, separate (higher) PSNR thresholds for SUPERRES_AUTO.

This is to avoid regressions in future.

BUG=aomedia:2844

Change-Id: Id25c75e38c3774ebccf2562d188f2b6e9528ccfe
(cherry picked from commit a194fc6812d025ec2cd9ddea0c232cfb6083ec07)

test/horz_superres_test.cc

diff --git a/test/horz_superres_test.cc b/test/horz_superres_test.cc
index 39d94d4..fd03259 100644
--- a/test/horz_superres_test.cc
+++ b/test/horz_superres_test.cc
@@ -39,7 +39,8 @@
   unsigned int profile;
   unsigned int limit;
   unsigned int screen_content;
-  double psnr_threshold;
+  double psnr_threshold;   // used by modes other than AOM_SUPERRES_AUTO
+  double psnr_threshold2;  // used by AOM_SUPERRES_AUTO
 } TestVideoParam;
 
 std::ostream &operator<<(std::ostream &os, const TestVideoParam &test_arg) {
@@ -51,14 +52,16 @@
 }
 
 const TestVideoParam kTestVideoVectors[] = {
-  { "park_joy_90p_8_420.y4m", AOM_IMG_FMT_I420, AOM_BITS_8, 0, 5, 0, 12.5 },
+  { "park_joy_90p_8_420.y4m", AOM_IMG_FMT_I420, AOM_BITS_8, 0, 5, 0, 26.0,
+    45.0 },
 #if CONFIG_AV1_HIGHBITDEPTH
-  { "park_joy_90p_10_444.y4m", AOM_IMG_FMT_I44416, AOM_BITS_10, 1, 5, 0,
-    27.74 },
+  { "park_joy_90p_10_444.y4m", AOM_IMG_FMT_I44416, AOM_BITS_10, 1, 5, 0, 28.0,
+    48.0 },
 #endif
-  { "screendata.y4m", AOM_IMG_FMT_I420, AOM_BITS_8, 0, 4, 1, 20.0 },
+  { "screendata.y4m", AOM_IMG_FMT_I420, AOM_BITS_8, 0, 4, 1, 23.0, 56.0 },
   // Image coding (single frame).
-  { "niklas_1280_720_30.y4m", AOM_IMG_FMT_I420, AOM_BITS_8, 0, 1, 0, 32.0 },
+  { "niklas_1280_720_30.y4m", AOM_IMG_FMT_I420, AOM_BITS_8, 0, 1, 0, 32.0,
+    49.0 },
 };
 
 // Modes with extra params have their own tests.
@@ -159,12 +162,13 @@
     ASSERT_TRUE(video.get() != NULL);
 
     ASSERT_NO_FATAL_FAILURE(RunLoop(video.get()));
+    const double psnr_thresh = (superres_mode_ == AOM_SUPERRES_AUTO)
+                                   ? test_video_param_.psnr_threshold2
+                                   : test_video_param_.psnr_threshold;
     const double psnr = GetAveragePsnr();
-    EXPECT_GT(psnr, test_video_param_.psnr_threshold)
-        << "superres_mode_ = " << superres_mode_;
+    EXPECT_GT(psnr, psnr_thresh);
 
-    EXPECT_EQ(test_video_param_.limit, frame_count_)
-        << "superres_mode_ = " << superres_mode_;
+    EXPECT_EQ(test_video_param_.limit, frame_count_);
   }
 
   TestVideoParam test_video_param_;