Add obu_sizing experiment.
Writes PRE_OBU_SIZE_BYTES (currently 4) bytes padded unsigned LEB128
encoded integers in OBU size fields when enabled:
$ cmake path/to/aom -DCONFIG_OBU=1 -DCONFIG_OBU_SIZING=1 && cmake --build .
Requires CONFIG_OBU.
BUG=aomedia:1125
Change-Id: I4d184ef0c8587d24e9c8c3e63237ea5003386c6a
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index 385111d..2eb0344 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -1400,7 +1400,7 @@
#if CONFIG_OBU
// move data PRE_OBU_SIZE_BYTES + 1 bytes and insert OBU_TD preceded by
- // optional 4 byte size
+ // 4 byte size
uint32_t obu_size = 1;
if (ctx->pending_cx_data) {
const size_t index_sz = PRE_OBU_SIZE_BYTES + 1;
@@ -1411,9 +1411,17 @@
OBU_TEMPORAL_DELIMITER, 0,
(uint8_t *)(ctx->pending_cx_data + PRE_OBU_SIZE_BYTES));
obu_size += write_temporal_delimiter_obu();
+#if CONFIG_OBU_SIZING
+ // OBUs are preceded by an unsigned leb128 coded unsigned integer padded
+ // to PRE_OBU_SIZE_BYTES bytes.
+ if (write_uleb_obu_size(obu_size, ctx->pending_cx_data) != AOM_CODEC_OK)
+ return AOM_CODEC_ERROR;
+#else
mem_put_le32(ctx->pending_cx_data, obu_size);
+#endif // CONFIG_OBU_SIZING
+
pkt.data.frame.sz += (obu_size + PRE_OBU_SIZE_BYTES);
-#endif
+#endif // CONFIG_OBU
pkt.data.frame.pts = ticks_to_timebase_units(timebase, dst_time_stamp);
pkt.data.frame.flags = get_frame_pkt_flags(cpi, lib_flags);
diff --git a/av1/decoder/obu.c b/av1/decoder/obu.c
index 2586ed5..ef183b9 100644
--- a/av1/decoder/obu.c
+++ b/av1/decoder/obu.c
@@ -175,10 +175,20 @@
struct aom_read_bit_buffer rb;
size_t obu_header_size, obu_payload_size = 0;
av1_init_read_bit_buffer(pbi, &rb, data + PRE_OBU_SIZE_BYTES, data_end);
+
+#if CONFIG_OBU_SIZING
+ // OBUs are preceded by an unsigned leb128 coded unsigned integer padded to
+ // PRE_OBU_SIZE_BYTES bytes.
+ uint32_t u_obu_size = 0;
+ aom_uleb_decode(data, PRE_OBU_SIZE_BYTES, &u_obu_size);
+ const size_t obu_size = (size_t)u_obu_size;
+#else
// every obu is preceded by PRE_OBU_SIZE_BYTES-byte size of obu (obu header
// + payload size)
// The obu size is only needed for tile group OBUs
const size_t obu_size = mem_get_le32(data);
+#endif // CONFIG_OBU_SIZING
+
const OBU_TYPE obu_type = read_obu_header(&rb, &obu_header_size);
data += (PRE_OBU_SIZE_BYTES + obu_header_size);
if (data_end < data) {
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 8fa0ac5..1f2a33c 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -4367,6 +4367,22 @@
return size;
}
+#if CONFIG_OBU_SIZING
+int write_uleb_obu_size(uint32_t obu_size, uint8_t *dest) {
+ size_t coded_obu_size = 0;
+
+ // Encode an unsigned leb128 coded unsigned integer padded to
+ // PRE_OBU_SIZE_BYTES bytes.
+ if (aom_uleb_encode_fixed_size(obu_size, PRE_OBU_SIZE_BYTES,
+ PRE_OBU_SIZE_BYTES, dest, &coded_obu_size) ||
+ coded_obu_size != PRE_OBU_SIZE_BYTES) {
+ return AOM_CODEC_ERROR;
+ }
+
+ return AOM_CODEC_OK;
+}
+#endif // CONFIG_OBU_SIZING
+
static uint32_t write_sequence_header_obu(AV1_COMP *cpi, uint8_t *const dst) {
AV1_COMMON *const cm = &cpi->common;
struct aom_write_bit_buffer wb = { dst, 0 };
@@ -4670,8 +4686,13 @@
// size of this tile
mem_put_le32(buf->data, tile_size);
} else {
- // write current tile group size
- mem_put_le32(data, curr_tg_data_size);
+// write current tile group size
+#if CONFIG_OBU_SIZING
+ if (write_uleb_obu_size(curr_tg_data_size, data) != AOM_CODEC_OK)
+ assert(0);
+#else
+ mem_put_le32(data, curr_tg_data_size);
+#endif // CONFIG_OBU_SIZING
}
total_size += tile_size;
@@ -4683,7 +4704,7 @@
return (uint32_t)total_size;
}
-#endif
+#endif // CONFIG_OBU
int av1_pack_bitstream(AV1_COMP *const cpi, uint8_t *dst, size_t *size) {
uint8_t *data = dst;
@@ -4695,7 +4716,7 @@
uint32_t obu_size;
uint8_t *frame_header_location;
uint32_t frame_header_size;
-#endif
+#endif // CONFIG_OBU
(void)cm;
#if CONFIG_BITSTREAM_DEBUG
bitstream_queue_reset_write();
@@ -4710,7 +4731,14 @@
write_obu_header(OBU_SEQUENCE_HEADER, 0, data + PRE_OBU_SIZE_BYTES);
obu_size +=
write_sequence_header_obu(cpi, data + PRE_OBU_SIZE_BYTES + obu_size);
+
+#if CONFIG_OBU_SIZING
+ if (write_uleb_obu_size(obu_size, data) != AOM_CODEC_OK)
+ return AOM_CODEC_ERROR;
+#else
mem_put_le32(data, obu_size);
+#endif // CONFIG_OBU_SIZING
+
data += obu_size + PRE_OBU_SIZE_BYTES;
}
@@ -4728,7 +4756,14 @@
#endif
data + PRE_OBU_SIZE_BYTES + obu_size);
obu_size += frame_header_size;
+
+#if CONFIG_OBU_SIZING
+ if (write_uleb_obu_size(obu_size, data) != AOM_CODEC_OK)
+ return AOM_CODEC_ERROR;
+#else
mem_put_le32(data, obu_size);
+#endif // CONFIG_OBU_SIZING
+
data += obu_size + PRE_OBU_SIZE_BYTES;
if (cm->show_existing_frame) {
diff --git a/av1/encoder/bitstream.h b/av1/encoder/bitstream.h
index 51ea9b6..c7fe509 100644
--- a/av1/encoder/bitstream.h
+++ b/av1/encoder/bitstream.h
@@ -27,7 +27,11 @@
#if CONFIG_OBU
uint32_t write_obu_header(OBU_TYPE obu_type, int obu_extension,
uint8_t *const dst);
-#endif
+
+#if CONFIG_OBU_SIZING
+int write_uleb_obu_size(uint32_t obu_size, uint8_t *dest);
+#endif // CONFIG_OBU_SIZING
+#endif // CONFIG_OBU
int av1_pack_bitstream(AV1_COMP *const cpi, uint8_t *dest, size_t *size);
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 1ae86b9..2efe62f 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -148,6 +148,7 @@
set(CONFIG_NO_FRAME_CONTEXT_SIGNALING 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_OBU 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_OBU_NO_IVF 0 CACHE NUMBER "AV1 experiment flag.")
+set(CONFIG_OBU_SIZING 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_OPT_REF_MV 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_PALETTE_THROUGHPUT 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_PARALLEL_DEBLOCKING 1 CACHE NUMBER "AV1 experiment flag.")
diff --git a/obudec.c b/obudec.c
index 9cc907a..8f1ca00 100644
--- a/obudec.c
+++ b/obudec.c
@@ -60,8 +60,13 @@
break;
}
- // otherwise, read the OBU payload into memory
+// otherwise, read the OBU payload into memory
+#if CONFIG_OBU_SIZING
+ aom_uleb_decode(data, PRE_OBU_SIZE_BYTES, &obu_size);
+#else
obu_size = mem_get_le32(data);
+#endif // CONFIG_OBU_SIZING
+
// fprintf(stderr, "Found OBU of type %d and size %d\n",
// ((data[PRE_OBU_SIZE_BYTES] >> 3) & 0xF), obu_size);
obu_size--; // removing the byte of the header already read
@@ -82,7 +87,7 @@
int file_is_obu(struct AvxInputContext *input_ctx) {
uint8_t obutd[PRE_OBU_SIZE_BYTES + OBU_HEADER_SIZE_BYTES];
- int size;
+ uint32_t size;
#if !CONFIG_OBU
warn("obudec.c requires CONFIG_OBU");
@@ -91,7 +96,13 @@
// Reading the first OBU TD to enable TU end detection at TD start.
fread(obutd, 1, PRE_OBU_SIZE_BYTES + OBU_HEADER_SIZE_BYTES, input_ctx->file);
+
+#if CONFIG_OBU_SIZING
+ aom_uleb_decode(obutd, PRE_OBU_SIZE_BYTES, &size);
+#else
size = mem_get_le32(obutd);
+#endif // CONFIG_OBU_SIZING
+
if (size != 1) {
warn("Expected first OBU size to be 1, got %d", size);
return 0;
diff --git a/tools/obu_parser.cc b/tools/obu_parser.cc
index 6c5f23b..d63a484 100644
--- a/tools/obu_parser.cc
+++ b/tools/obu_parser.cc
@@ -21,6 +21,7 @@
#error "obu_parser.cc requires CONFIG_OBU"
#endif
+#include "aom/aom_integer.h"
#include "aom_ports/mem_ops.h"
#include "tools/obu_parser.h"
@@ -170,7 +171,14 @@
return false;
}
+#if CONFIG_OBU_SIZING
+ uint32_t obu_size = 0;
+ aom_uleb_decode(data + consumed, kObuLengthFieldSizeBytes, &obu_size);
+ const int current_obu_length = static_cast<int>(obu_size);
+#else
const int current_obu_length = mem_get_le32(data + consumed);
+#endif // CONFIG_OBU_SIZING
+
if (current_obu_length > remaining) {
fprintf(stderr,
"OBU parsing failed at offset %d with bad length of %d "
