commit 20c102fe62d55ee9a33a7cf2c2dc401ccd4eb63d
author Wan-Teh Chang <wtc@google.com> Thu Jul 12 13:30:04 2018 -0700
committer Wan-Teh Chang <wtc@google.com> Fri Jul 27 21:42:18 2018 +0000
tree 18dc1964ac099247094aafdf5d388745564be6a3
parent 0e41f76944abacdbd6102530d621f15aa832aa3b

Add support for "don't care" in the result file.

The result file (with the file extension .res) stores a numeric
aom_codec_err_t value on each line. Since all aom_codec_err_t values are
0 (AOM_CODEC_OK) or positive, we can use the value -1 to indicate a
wildcard, "don't care" value. This special value is considered to match
any decode result.

Use case: Depeding on whether libaom is compiled with
-DAOM_MAX_ALLOCABLE_MEMORY=1073741824, the decoding of an invalid frame
may fail with AOM_CODEC_MEM_ERROR or AOM_CODEC_CORRUPT_FRAME. We need a
way to match either decode result value.

Change-Id: Ia3e3d99a713a309cf07832bfe511de5d2715f0bb

test/invalid_file_test.cc

diff --git a/test/invalid_file_test.cc b/test/invalid_file_test.cc
index 131fa7b..2ce824c 100644
--- a/test/invalid_file_test.cc
+++ b/test/invalid_file_test.cc
@@ -49,29 +49,31 @@
       const libaom_test::CompressedVideoSource &video,
       libaom_test::Decoder *decoder) {
     EXPECT_TRUE(res_file_ != NULL);
-    int expected_res_dec;
+    int expected_res_dec = -1;
 
     // Read integer result.
     const int res = fscanf(res_file_, "%d", &expected_res_dec);
     EXPECT_NE(res, EOF) << "Read result data failed";
 
-    // Check results match.
-    const DecodeParam input = GET_PARAM(1);
-    if (input.threads > 1) {
-      // The serial decode check is too strict for tile-threaded decoding as
-      // there is no guarantee on the decode order nor which specific error
-      // will take precedence. Currently a tile-level error is not forwarded so
-      // the frame will simply be marked corrupt.
-      EXPECT_TRUE(res_dec == expected_res_dec ||
-                  res_dec == AOM_CODEC_CORRUPT_FRAME)
-          << "Results don't match: frame number = " << video.frame_number()
-          << ". (" << decoder->DecodeError()
-          << "). Expected: " << expected_res_dec << " or "
-          << AOM_CODEC_CORRUPT_FRAME;
-    } else {
-      EXPECT_EQ(expected_res_dec, res_dec)
-          << "Results don't match: frame number = " << video.frame_number()
-          << ". (" << decoder->DecodeError() << ")";
+    if (expected_res_dec != -1) {
+      // Check results match.
+      const DecodeParam input = GET_PARAM(1);
+      if (input.threads > 1) {
+        // The serial decode check is too strict for tile-threaded decoding as
+        // there is no guarantee on the decode order nor which specific error
+        // will take precedence. Currently a tile-level error is not forwarded
+        // so the frame will simply be marked corrupt.
+        EXPECT_TRUE(res_dec == expected_res_dec ||
+                    res_dec == AOM_CODEC_CORRUPT_FRAME)
+            << "Results don't match: frame number = " << video.frame_number()
+            << ". (" << decoder->DecodeError()
+            << "). Expected: " << expected_res_dec << " or "
+            << AOM_CODEC_CORRUPT_FRAME;
+      } else {
+        EXPECT_EQ(expected_res_dec, res_dec)
+            << "Results don't match: frame number = " << video.frame_number()
+            << ". (" << decoder->DecodeError() << ")";
+      }
     }
 
     return !HasFailure();