commit 5018f6a8cf8ccd480a7f556e34fdccd2bc910e1a
author Yaowu Xu <yaowu@google.com> Thu Mar 01 16:21:03 2018 -0800
committer Yaowu Xu <yaowu@google.com> Fri Mar 02 14:44:40 2018 +0000
tree b13b79456a126b787295d212c84cc1fcf87f6f09
parent 22729cd018ff1c0d503b13e8e76c206f5fce0530

Skip identical sequence headers after the first

BUG=aomedia:1480

Change-Id: I96b41b460aa19160af05715031e1d8e0bf2c1160

av1/decoder/obu.c

diff --git a/av1/decoder/obu.c b/av1/decoder/obu.c
index 5306c4c..5f09523 100644
--- a/av1/decoder/obu.c
+++ b/av1/decoder/obu.c
@@ -276,6 +276,8 @@
   int is_first_tg_obu_received = 1;
   int frame_header_received = 0;
   int frame_header_size = 0;
+  int seq_header_received = 0;
+  size_t seq_header_size = 0;
 #if CONFIG_SCALABILITY
   uint8_t obu_extension_header = 0;
 #endif
@@ -358,7 +360,19 @@
         obu_payload_size = read_temporal_delimiter_obu();
         break;
       case OBU_SEQUENCE_HEADER:
-        obu_payload_size = read_sequence_header_obu(pbi, &rb);
+        if (!seq_header_received) {
+          obu_payload_size = read_sequence_header_obu(pbi, &rb);
+          seq_header_size = obu_payload_size;
+          seq_header_received = 1;
+        } else {
+          // Seeing another sequence header, skip as all sequence headers
+          // are requred to be identical.
+          if (obu_size - obu_header_size != seq_header_size) {
+            cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+            return;
+          }
+          obu_payload_size = seq_header_size;
+        }
         break;
       case OBU_FRAME_HEADER:
         // Only decode first frame header received