commit 380a9ca3b1ffc8b9a35935bca84175ef2e20fcef
author Wan-Teh Chang <wtc@google.com> Thu Nov 14 22:57:56 2019 +0000
committer Wan-Teh Chang <wtc@google.com> Fri Nov 15 00:06:21 2019 +0000
tree 66b17446160930cccd7aca24bdb955b79dd7dcdd
parent da8da7fa94a6288f906bee40a3d9ae152182839a

Revert "Implement the frame_header_copy check in the spec."

This reverts commit 8b0de61c270ed82ab1162b925bdc896f71c34cf4.

Reason for revert: Four test vectors have a redundant frame header OBU that differs from the previous frame header OBU. The MD5 files for these four vectors need to be regenerated.

BUG=aomedia:2539

Change-Id: Iabf0950577906dea90f6f69b9318ac2f2d7c400c

av1/decoder/obu.c

diff --git a/av1/decoder/obu.c b/av1/decoder/obu.c
index ad7a955..3619264 100644
--- a/av1/decoder/obu.c
+++ b/av1/decoder/obu.c
@@ -751,16 +751,6 @@
   AV1_COMMON *const cm = &pbi->common;
   int frame_decoding_finished = 0;
   int is_first_tg_obu_received = 1;
-  // Whenever pbi->seen_frame_header is set to 1, frame_header is set to the
-  // beginning of the frame_header_obu and frame_header_size is set to its
-  // size. This allows us to check if a redundant frame_header_obu is a copy
-  // of the previous frame_header_obu.
-  //
-  // Initialize frame_header to a dummy nonnull pointer, otherwise the Clang
-  // Static Analyzer in clang 7.0.1 will falsely warn that a null pointer is
-  // passed as an argument to a 'nonnull' parameter of memcmp(). The initial
-  // value will not be used.
-  const uint8_t *frame_header = data;
   uint32_t frame_header_size = 0;
   ObuHeader obu_header;
   memset(&obu_header, 0, sizeof(obu_header));
@@ -862,15 +852,14 @@
             (cm->large_scale_tile && !pbi->camera_frame_header_ready)) {
           frame_header_size = read_frame_header_obu(
               pbi, &rb, data, p_data_end, obu_header.type != OBU_FRAME);
-          frame_header = data;
           pbi->seen_frame_header = 1;
           if (!pbi->ext_tile_debug && cm->large_scale_tile)
             pbi->camera_frame_header_ready = 1;
         } else {
-          // Verify that the frame_header_obu is identical to the original
-          // frame_header_obu.
-          if (frame_header_size > payload_size ||
-              memcmp(data, frame_header, frame_header_size) != 0) {
+          // TODO(wtc): Verify that the frame_header_obu is identical to the
+          // original frame_header_obu. For now just skip frame_header_size
+          // bytes in the bit buffer.
+          if (frame_header_size > payload_size) {
             cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
             return -1;
           }