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
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c index 23073e8..15adb74 100644 --- a/av1/decoder/decodeframe.c +++ b/av1/decoder/decodeframe.c
@@ -1797,12 +1797,7 @@ aom_internal_error(error_info, AOM_CODEC_CORRUPT_FRAME, "Truncated packet or corrupt tile size"); } else { -#if !CONFIG_OBU || CONFIG_ADD_4BYTES_OBUSIZE size = data_end - *data; -#else - size = mem_get_varsize(*data, tile_size_bytes); - *data += tile_size_bytes; -#endif } buf->data = *data; @@ -1838,6 +1833,7 @@ for (int r = 0; r < tile_rows; ++r) { for (int c = 0; c < tile_cols; ++c, ++tc) { TileBufferDec *const buf = &tile_buffers[r][c]; + #if CONFIG_OBU const int is_last = (tc == endTile); const size_t hdr_offset = 0;