commit 2518fb4057acaf78ebac94b5d6cd15c228f3e9c8
author Wan-Teh Chang <wtc@google.com> Sat Oct 27 11:36:29 2018 -0700
committer Wan-Teh Chang <wtc@google.com> Mon Oct 29 16:24:36 2018 +0000
tree cf0ed10cb4e7ede7c49af00fbb61d130716cb007
parent 0c8f7176a833f4bf3d45bf997d0d471df8c9f99b

Fix the ExtFBMD5Match test.

We need to set the allow_lowbitdepth decode config and calculate the MD5
digest in the high bit depth case correctly.

BUG=aomedia:1255

Change-Id: If02dcc53f14dd093bc50c9bc05855059d288d02f

test/external_frame_buffer_test.cc

diff --git a/test/external_frame_buffer_test.cc b/test/external_frame_buffer_test.cc
index c2af059..3b0d472 100644
--- a/test/external_frame_buffer_test.cc
+++ b/test/external_frame_buffer_test.cc
@@ -243,7 +243,23 @@
     expected_md5[32] = '\0';
 
     ::libaom_test::MD5 md5_res;
-    md5_res.Add(&img);
+#if !CONFIG_LOWBITDEPTH
+    const aom_img_fmt_t shifted_fmt =
+        (aom_img_fmt)(img.fmt & ~AOM_IMG_FMT_HIGHBITDEPTH);
+    if (img.bit_depth == 8 && shifted_fmt != img.fmt) {
+      aom_image_t *img_shifted =
+          aom_img_alloc(NULL, shifted_fmt, img.d_w, img.d_h, 16);
+      img_shifted->bit_depth = img.bit_depth;
+      img_shifted->monochrome = img.monochrome;
+      aom_img_downshift(img_shifted, &img, 0);
+      md5_res.Add(img_shifted);
+      aom_img_free(img_shifted);
+    } else {
+#endif
+      md5_res.Add(&img);
+#if !CONFIG_LOWBITDEPTH
+    }
+#endif
     const char *const actual_md5 = md5_res.Get();
 
     // Check md5 match.
@@ -377,8 +393,9 @@
 // needed. The md5 checksums are computed for each frame in the video file.
 // If md5 checksums match the correct md5 data, then the test is passed.
 // Otherwise, the test failed.
-TEST_P(ExternalFrameBufferMD5Test, DISABLED_ExtFBMD5Match) {
+TEST_P(ExternalFrameBufferMD5Test, ExtFBMD5Match) {
   const std::string filename = GET_PARAM(kVideoNameParam);
+  aom_codec_dec_cfg_t cfg = aom_codec_dec_cfg_t();
 
   // Number of buffers equals #AOM_MAXIMUM_REF_BUFFERS +
   // #AOM_MAXIMUM_WORK_BUFFERS + four jitter buffers.
@@ -407,8 +424,12 @@
   const std::string md5_filename = filename + ".md5";
   OpenMD5File(md5_filename);
 
+  // Set decode config.
+  cfg.allow_lowbitdepth = CONFIG_LOWBITDEPTH;
+  set_cfg(cfg);
+
   // Decode frame, and check the md5 matching.
-  ASSERT_NO_FATAL_FAILURE(RunLoop(video.get()));
+  ASSERT_NO_FATAL_FAILURE(RunLoop(video.get(), cfg));
 }
 
 #if CONFIG_WEBM_IO