commit ff86395f0bab5a3b76c883a33c01e8c48642f4ba
author Tom Finegan <tomfinegan@google.com> Fri Dec 22 11:41:14 2017 -0800
committer Tom Finegan <tomfinegan@google.com> Wed Dec 27 16:07:28 2017 +0000
tree f2c6e81fff79172570e273cfed8810d053390691
parent ba33d4ce5cf15e39b8b70d553505fda40c4300fa

Always prefix OBUs with a size field.

- Make the add_4bytes_obusize experiment part of the obu experiment.
- Remove the add_4bytes_obusize experiment flags.
- Update the encoder, decoder, and tooling sources.

BUG=aomedia:1125

Change-Id: Ia5c443c855e52618257b39c44ca2632703bf83fd

tools/obu_parser.cc

diff --git a/tools/obu_parser.cc b/tools/obu_parser.cc
index fb904ae..6c5f23b 100644
--- a/tools/obu_parser.cc
+++ b/tools/obu_parser.cc
@@ -13,13 +13,12 @@
 #include <string>
 
 // TODO(tomfinegan): Remove the aom_config.h include as soon as possible. At
-// present it's required because w/out aom_config.h it's impossible to know how
-// Obus are being written out by the library (because
-// CONFIG_ADD_4BYTES_OBUSIZE).
+// present it's required because aom_config.h determines if the library writes
+// OBUs.
 #include "./aom_config.h"
 
-#if !CONFIG_ADD_4BYTES_OBUSIZE || !CONFIG_OBU
-#error "obu_parser.cc requires CONFIG_ADD_4BYTES_OBUSIZE and CONFIG_OBU"
+#if !CONFIG_OBU
+#error "obu_parser.cc requires CONFIG_OBU"
 #endif
 
 #include "aom_ports/mem_ops.h"
@@ -153,7 +152,7 @@
 }
 
 bool DumpObu(const uint8_t *data, int length) {
-  const int kObuLengthFieldSizeBytes = 4;  // Assumes CONFIG_ADD_4BYTES_OBUSIZE.
+  const int kObuLengthFieldSizeBytes = 4;
   const int kObuHeaderLengthSizeBytes = 1;
   const int kMinimumBytesRequired =
       kObuLengthFieldSizeBytes + kObuHeaderLengthSizeBytes;