commit 5427be1c1f9a31e95402be8bdd475e4c9b0ec348
author Tom Finegan <tomfinegan@google.com> Wed Mar 14 18:45:39 2018 -0700
committer Tom Finegan <tomfinegan@google.com> Tue Mar 20 04:39:20 2018 +0000
tree c3dcbdeb34f5975b1cd0662fc8a16f0c5d353cbb
parent 492c545fad1e1f980d23d79d0372857c60d31458

Remove CONFIG_OBU_SIZE_AFTER_HEADER preproc guards.

obu_size_after_header is fully adopted and part of AV1.

- Remove the guards and clear out the unused code.
- Disable the dump_obu shell test. The obu_parser sources need
  fixes to work with obu_size_after_header.

BUG=aomedia:1618

Change-Id: I0160a82ab1ef774650500865147e6d706c56b219

av1/decoder/obu.c

diff --git a/av1/decoder/obu.c b/av1/decoder/obu.c
index 4b71604..7dba01f 100644
--- a/av1/decoder/obu.c
+++ b/av1/decoder/obu.c
@@ -105,17 +105,13 @@
 
   if (!valid_obu_type(header->type)) return AOM_CODEC_CORRUPT_FRAME;
 
-#if CONFIG_OBU_SIZE_AFTER_HEADER
   header->has_extension = aom_rb_read_bit(rb);
   if (!aom_rb_read_bit(rb)) {  // obu_has_payload_length_field
     // libaom does not support streams with this bit set to 0.
     return AOM_CODEC_UNSUP_BITSTREAM;
   }
+
   aom_rb_read_bit(rb);  // reserved
-#else
-  aom_rb_read_literal(rb, 2);  // reserved
-  header->has_extension = aom_rb_read_bit(rb);
-#endif
 
   if (header->has_extension) {
     header->size += 1;
@@ -382,18 +378,7 @@
       return;
     }
 
-#if CONFIG_OBU_SIZE_AFTER_HEADER
     size_t length_field_size = 0;
-#else
-    size_t length_field_size;
-    size_t obu_size;
-    if (read_obu_size(data, bytes_available, &obu_size, &length_field_size) !=
-        AOM_CODEC_OK) {
-      cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
-      return;
-    }
-#endif  // CONFIG_OBU_SIZE_AFTER_HEADER
-
     if (data_end < data + length_field_size) {
       cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
       return;
@@ -406,7 +391,6 @@
       return;
     }
 
-#if CONFIG_OBU_SIZE_AFTER_HEADER
     if (read_obu_size(data + obu_header.size, bytes_available - obu_header.size,
                       &payload_size, &length_field_size) != AOM_CODEC_OK) {
       cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
@@ -414,9 +398,6 @@
     }
     av1_init_read_bit_buffer(
         pbi, &rb, data + length_field_size + obu_header.size, data_end);
-#else
-    payload_size = obu_size - obu_header.size;
-#endif  // CONFIG_OBU_SIZE_AFTER_HEADER
 
     data += length_field_size + obu_header.size;
     if (data_end < data) {