Allow encoder to count the number of frame headers
The number of frame headers will be used to calculate frame header rate,
which is part of the bitstream level definition.
BUG=aomedia:2332
Change-Id: I69c8b21654fbba84476d38b233052367dc1e3bf8
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index 4d60a44..e8cd508 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -1771,8 +1771,8 @@
frame_size);
}
const uint32_t obu_header_offset = 0;
- obu_header_size = write_obu_header(
- OBU_TEMPORAL_DELIMITER, 0,
+ obu_header_size = av1_write_obu_header(
+ cpi, OBU_TEMPORAL_DELIMITER, 0,
(uint8_t *)(ctx->pending_cx_data + obu_header_offset));
// OBUs are preceded/succeeded by an unsigned leb128 coded integer.
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index d42e110..cbac2b2 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3234,8 +3234,12 @@
return wpos;
}
-uint32_t write_obu_header(OBU_TYPE obu_type, int obu_extension,
- uint8_t *const dst) {
+uint32_t av1_write_obu_header(AV1_COMP *const cpi, OBU_TYPE obu_type,
+ int obu_extension, uint8_t *const dst) {
+ if (cpi->keep_level_stats &&
+ (obu_type == OBU_FRAME || obu_type == OBU_FRAME_HEADER))
+ ++cpi->frame_header_count;
+
struct aom_write_bit_buffer wb = { dst, 0 };
uint32_t size = 0;
@@ -3433,7 +3437,7 @@
// For large_scale_tile case, we always have only one tile group, so it can
// be written as an OBU_FRAME.
const OBU_TYPE obu_type = OBU_FRAME;
- const uint32_t tg_hdr_size = write_obu_header(obu_type, 0, data);
+ const uint32_t tg_hdr_size = av1_write_obu_header(cpi, obu_type, 0, data);
data += tg_hdr_size;
const uint32_t frame_header_size =
@@ -3588,7 +3592,7 @@
const OBU_TYPE obu_type =
(num_tg_hdrs == 1) ? OBU_FRAME : OBU_TILE_GROUP;
curr_tg_data_size =
- write_obu_header(obu_type, obu_extension_header, data);
+ av1_write_obu_header(cpi, obu_type, obu_extension_header, data);
obu_header_size = curr_tg_data_size;
if (num_tg_hdrs == 1) {
@@ -3674,8 +3678,9 @@
// Rewrite the OBU header to change the OBU type to Redundant Frame
// Header.
- write_obu_header(OBU_REDUNDANT_FRAME_HEADER, obu_extension_header,
- &data[fh_info->obu_header_byte_offset]);
+ av1_write_obu_header(cpi, OBU_REDUNDANT_FRAME_HEADER,
+ obu_extension_header,
+ &data[fh_info->obu_header_byte_offset]);
data += fh_info->total_length;
@@ -3754,11 +3759,13 @@
bitstream_queue_reset_write();
#endif
+ cpi->frame_header_count = 0;
+
// The TD is now written outside the frame encode loop
// write sequence header obu if KEY_FRAME, preceded by 4-byte size
if (cm->current_frame.frame_type == KEY_FRAME && cm->show_frame) {
- obu_header_size = write_obu_header(OBU_SEQUENCE_HEADER, 0, data);
+ obu_header_size = av1_write_obu_header(cpi, OBU_SEQUENCE_HEADER, 0, data);
obu_payload_size = write_sequence_header_obu(cpi, data + obu_header_size);
const size_t length_field_size =
@@ -3778,7 +3785,7 @@
// Write Frame Header OBU.
fh_info.frame_header = data;
obu_header_size =
- write_obu_header(OBU_FRAME_HEADER, obu_extension_header, data);
+ av1_write_obu_header(cpi, OBU_FRAME_HEADER, obu_extension_header, data);
obu_payload_size =
write_frame_header_obu(cpi, &saved_wb, data + obu_header_size, 1);
diff --git a/av1/encoder/bitstream.h b/av1/encoder/bitstream.h
index 153026a..b05d0d5 100644
--- a/av1/encoder/bitstream.h
+++ b/av1/encoder/bitstream.h
@@ -27,8 +27,8 @@
// Writes the OBU header byte, and the OBU header extension byte when
// 'obu_extension' is non-zero. Returns number of bytes written to 'dst'.
-uint32_t write_obu_header(OBU_TYPE obu_type, int obu_extension,
- uint8_t *const dst);
+uint32_t av1_write_obu_header(AV1_COMP *const cpi, OBU_TYPE obu_type,
+ int obu_extension, uint8_t *const dst);
int write_uleb_obu_size(uint32_t obu_header_size, uint32_t obu_payload_size,
uint8_t *dest);
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index d138cd6..542fcd5 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -5694,7 +5694,7 @@
if (payload_offset + sequence_header_size > sizeof(header_buf)) return NULL;
memmove(&header_buf[payload_offset], &header_buf[0], sequence_header_size);
- if (write_obu_header(OBU_SEQUENCE_HEADER, 0, &header_buf[0]) !=
+ if (av1_write_obu_header(cpi, OBU_SEQUENCE_HEADER, 0, &header_buf[0]) !=
obu_header_size) {
return NULL;
}
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index e971271..d5259a2 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -993,6 +993,8 @@
AV1_LEVEL target_seq_level_idx[MAX_NUM_OPERATING_POINTS];
int keep_level_stats;
AV1LevelInfo level_info[MAX_NUM_OPERATING_POINTS];
+ // Count the number of OBU_FRAME and OBU_FRAME_HEADER for level calculation.
+ int frame_header_count;
} AV1_COMP;
typedef struct {
