Skip to content

GitLab

A
aom-rav1e
Commit f8589863 authored by Soo-Chul Han's avatar Soo-Chul Han
Browse files
Options

add scalability experiment 

cmake: -DCONFIG_SCALABILITY=1

Change-Id: Ifa908f809bcf904bdf0ed87b351e1ef3accc2b3f
parent 4972ac81
Hide whitespace changes
Inline Side-by-side
Showing with 823 additions and 41 deletions
CMakeLists.txt
View file @ f8589863
......@@ -330,6 +330,12 @@ if (CONFIG_AV1_DECODER AND ENABLE_EXAMPLES)
"${AOM_ROOT}/examples/simple_decoder.c"
$<TARGET_OBJECTS:aom_common_app_util>
$<TARGET_OBJECTS:aom_decoder_app_util>)
if (CONFIG_SCALABILITY)
add_executable(scalable_decoder
"${AOM_ROOT}/examples/scalable_decoder.c"
$<TARGET_OBJECTS:aom_common_app_util>
$<TARGET_OBJECTS:aom_decoder_app_util>)
endif ()
if (CONFIG_ANALYZER)
add_executable(analyzer
......@@ -370,6 +376,11 @@ if (CONFIG_AV1_DECODER AND ENABLE_EXAMPLES)
set(AOM_DECODER_EXAMPLE_TARGETS ${AOM_DECODER_EXAMPLE_TARGETS}
aomdec decode_to_md5 decode_with_drops simple_decoder)
if (CONFIG_SCALABILITY)
set(AOM_DECODER_EXAMPLE_TARGETS ${AOM_DECODER_EXAMPLE_TARGETS}
scalable_decoder)
endif ()
# Add decoder examples to the app targets list.
set(AOM_APP_TARGETS ${AOM_APP_TARGETS} ${AOM_DECODER_EXAMPLE_TARGETS})
endif ()
......@@ -397,10 +408,22 @@ if (CONFIG_AV1_ENCODER)
"${AOM_ROOT}/examples/twopass_encoder.c"
$<TARGET_OBJECTS:aom_common_app_util>
$<TARGET_OBJECTS:aom_encoder_app_util>)
if (CONFIG_SCALABILITY)
add_executable(scalable_encoder
"${AOM_ROOT}/examples/scalable_encoder.c"
$<TARGET_OBJECTS:aom_common_app_util>
$<TARGET_OBJECTS:aom_encoder_app_util>)
endif ()
# Maintain a list of encoder example targets.
set(AOM_ENCODER_EXAMPLE_TARGETS
aomenc lossless_encoder set_maps simple_encoder twopass_encoder)
if (CONFIG_SCALABILITY)
set(AOM_ENCODER_EXAMPLE_TARGETS ${AOM_ENCODER_EXAMPLE_TARGETS}
scalable_encoder)
endif ()
endif ()
if (ENABLE_TOOLS)
......
aom/aom_codec.h
View file @ f8589863
......@@ -496,6 +496,7 @@ typedef enum {
OBU_METADATA_TYPE_PRIVATE_DATA = 0,
OBU_METADATA_TYPE_HDR_CLL = 1,
OBU_METADATA_TYPE_HDR_MDCV = 2,
OBU_METADATA_TYPE_SCALABILITY = 3,
} OBU_METADATA_TYPE;
/*!@} - end defgroup codec*/
......
aom/aom_decoder.h
View file @ f8589863
......@@ -83,9 +83,10 @@ extern "C" {
* stream.
*/
typedef struct aom_codec_stream_info {
unsigned int w; /**< Width (or 0 for unknown/default) */
unsigned int h; /**< Height (or 0 for unknown/default) */
unsigned int is_kf; /**< Current frame is a keyframe */
unsigned int w; /**< Width (or 0 for unknown/default) */
unsigned int h; /**< Height (or 0 for unknown/default) */
unsigned int is_kf; /**< Current frame is a keyframe */
unsigned int enhancement_layers_cnt; /**< Enhancement layers */
} aom_codec_stream_info_t;
/* REQUIRED FUNCTIONS
......
aom/aom_image.h
View file @ f8589863
......@@ -213,6 +213,9 @@ typedef struct aom_image {
int bps; /**< bits per sample (for packed formats) */
int temporal_id; /**< Temporal layer Id of image */
int enhancement_id; /**< Spatial layer Id of image */
/*!\brief The following member may be set by the application to associate
* data with this image.
*/
......
aom/aomcx.h
View file @ f8589863
......@@ -143,6 +143,10 @@ enum aome_enc_control_id {
*/
AOME_SET_SCALEMODE = 11,
/*!\brief Codec control function to set encoder enhancement layer id.
*/
AOME_SET_ENHANCEMENT_LAYER_ID = 12,
/*!\brief Codec control function to set encoder internal speed settings.
*
* Changes in this value influences, among others, the encoder's selection
......@@ -215,6 +219,10 @@ enum aome_enc_control_id {
*/
AOME_SET_MAX_INTRA_BITRATE_PCT,
/*!\brief Codec control function to set number of spatial layers.
*/
AOME_SET_NUMBER_SPATIAL_LAYERS,
/*!\brief Codec control function to set max data rate for Inter frames.
*
* This value controls additional clamping on the maximum size of an
......@@ -798,6 +806,9 @@ AOM_CTRL_USE_TYPE(AOME_SET_ACTIVEMAP, aom_active_map_t *)
AOM_CTRL_USE_TYPE(AOME_SET_SCALEMODE, aom_scaling_mode_t *)
#define AOM_CTRL_AOME_SET_SCALEMODE
AOM_CTRL_USE_TYPE(AOME_SET_ENHANCEMENT_LAYER_ID, int)
#define AOM_CTRL_AOME_SET_ENHANCEMENT_LAYER_ID
AOM_CTRL_USE_TYPE(AOME_SET_CPUUSED, int)
#define AOM_CTRL_AOME_SET_CPUUSED
AOM_CTRL_USE_TYPE(AOME_SET_DEVSF, int)
......@@ -847,6 +858,9 @@ AOM_CTRL_USE_TYPE(AOME_SET_MAX_INTRA_BITRATE_PCT, unsigned int)
AOM_CTRL_USE_TYPE(AOME_SET_MAX_INTER_BITRATE_PCT, unsigned int)
#define AOM_CTRL_AOME_SET_MAX_INTER_BITRATE_PCT
AOM_CTRL_USE_TYPE(AOME_SET_NUMBER_SPATIAL_LAYERS, int)
#define AOME_CTRL_AOME_SET_NUMBER_SPATIAL_LAYERS
AOM_CTRL_USE_TYPE(AV1E_SET_GF_CBR_BOOST_PCT, unsigned int)
#define AOM_CTRL_AV1E_SET_GF_CBR_BOOST_PCT
......
aomdec.c
View file @ f8589863
......@@ -255,7 +255,11 @@ static int read_frame(struct AvxDecInputContext *input, uint8_t **buf,
#if CONFIG_OBU_NO_IVF
case FILE_TYPE_OBU:
return obu_read_temporal_unit(input->aom_input_ctx->file, buf,
#if CONFIG_SCALABILITY
bytes_in_buffer, buffer_size, 0);
#else
bytes_in_buffer, buffer_size);
#endif
#endif
default: return 1;
}
......
av1/av1_cx_iface.c
View file @ f8589863
......@@ -29,6 +29,10 @@
#define MAG_SIZE (4)
#define MAX_INDEX_SIZE (256)
#if CONFIG_SCALABILITY
#define MAX_NUM_ENHANCEMENT_LAYERS 128
#endif
struct av1_extracfg {
int cpu_used; // available cpu percentage in 1/16
int dev_sf;
......@@ -1422,28 +1426,34 @@ static aom_codec_err_t encoder_encode(aom_codec_alg_priv_t *ctx,
pkt.data.frame.partition_id = -1;
#if CONFIG_OBU
// move data PRE_OBU_SIZE_BYTES + 1 bytes and insert OBU_TD preceded by
// 4 byte size
uint32_t obu_size = 1;
if (ctx->pending_cx_data) {
const size_t index_sz = PRE_OBU_SIZE_BYTES + 1;
memmove(ctx->pending_cx_data + index_sz, ctx->pending_cx_data,
ctx->pending_cx_data_sz);
}
obu_size = write_obu_header(
OBU_TEMPORAL_DELIMITER, 0,
(uint8_t *)(ctx->pending_cx_data + PRE_OBU_SIZE_BYTES));
obu_size += write_temporal_delimiter_obu();
int write_temporal_delimiter = 1;
#if CONFIG_SCALABILITY
// only write OBU_TD if base layer
write_temporal_delimiter = !cpi->common.enhancement_layer_id;
#endif // CONFIG_SCALABILITY
if (write_temporal_delimiter) {
// move data PRE_OBU_SIZE_BYTES + 1 bytes and insert OBU_TD preceded by
// optional 4 byte size
uint32_t obu_size = 1;
if (ctx->pending_cx_data) {
const size_t index_sz = PRE_OBU_SIZE_BYTES + 1;
memmove(ctx->pending_cx_data + index_sz, ctx->pending_cx_data,
ctx->pending_cx_data_sz);
}
obu_size = write_obu_header(
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;
// 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);
mem_put_le32(ctx->pending_cx_data, obu_size);
#endif // CONFIG_OBU_SIZING
pkt.data.frame.sz += (obu_size + PRE_OBU_SIZE_BYTES);
pkt.data.frame.sz += (obu_size + PRE_OBU_SIZE_BYTES);
}
#endif // CONFIG_OBU
pkt.data.frame.pts = ticks_to_timebase_units(timebase, dst_time_stamp);
......@@ -1610,6 +1620,36 @@ static aom_codec_err_t ctrl_set_scale_mode(aom_codec_alg_priv_t *ctx,
}
}
static aom_codec_err_t ctrl_set_enhancement_layer_id(aom_codec_alg_priv_t *ctx,
va_list args) {
#if CONFIG_SCALABILITY
const int enhancement_layer_id = va_arg(args, int);
if (enhancement_layer_id > MAX_NUM_ENHANCEMENT_LAYERS)
return AOM_CODEC_INVALID_PARAM;
ctx->cpi->common.enhancement_layer_id = enhancement_layer_id;
return AOM_CODEC_OK;
#else
(void)ctx;
(void)args;
return AOM_CODEC_UNSUP_FEATURE;
#endif
}
static aom_codec_err_t ctrl_set_number_spatial_layers(aom_codec_alg_priv_t *ctx,
va_list args) {
#if CONFIG_SCALABILITY
const int number_spatial_layers = va_arg(args, int);
if (number_spatial_layers > MAX_NUM_ENHANCEMENT_LAYERS)
return AOM_CODEC_INVALID_PARAM;
ctx->cpi->common.enhancement_layers_cnt = number_spatial_layers - 1;
return AOM_CODEC_OK;
#else
(void)ctx;
(void)args;
return AOM_CODEC_UNSUP_FEATURE;
#endif
}
static aom_codec_err_t ctrl_set_tune_content(aom_codec_alg_priv_t *ctx,
va_list args) {
struct av1_extracfg extra_cfg = ctx->extra_cfg;
......@@ -1709,6 +1749,7 @@ static aom_codec_ctrl_fn_map_t encoder_ctrl_maps[] = {
{ AOME_SET_ROI_MAP, ctrl_set_roi_map },
{ AOME_SET_ACTIVEMAP, ctrl_set_active_map },
{ AOME_SET_SCALEMODE, ctrl_set_scale_mode },
{ AOME_SET_ENHANCEMENT_LAYER_ID, ctrl_set_enhancement_layer_id },
{ AOME_SET_CPUUSED, ctrl_set_cpuused },
{ AOME_SET_DEVSF, ctrl_set_devsf },
{ AOME_SET_ENABLEAUTOALTREF, ctrl_set_enable_auto_alt_ref },
......@@ -1733,6 +1774,7 @@ static aom_codec_ctrl_fn_map_t encoder_ctrl_maps[] = {
{ AOME_SET_TUNING, ctrl_set_tuning },
{ AOME_SET_CQ_LEVEL, ctrl_set_cq_level },
{ AOME_SET_MAX_INTRA_BITRATE_PCT, ctrl_set_rc_max_intra_bitrate_pct },
{ AOME_SET_NUMBER_SPATIAL_LAYERS, ctrl_set_number_spatial_layers },
{ AV1E_SET_MAX_INTER_BITRATE_PCT, ctrl_set_rc_max_inter_bitrate_pct },
{ AV1E_SET_GF_CBR_BOOST_PCT, ctrl_set_rc_gf_cbr_boost_pct },
{ AV1E_SET_LOSSLESS, ctrl_set_lossless },
......
av1/av1_dx_iface.c
View file @ f8589863
......@@ -20,6 +20,9 @@
#include "aom/aom_decoder.h"
#include "aom_dsp/bitreader_buffer.h"
#include "aom_dsp/aom_dsp_common.h"
#if CONFIG_OBU
#include "aom_ports/mem_ops.h"
#endif
#include "aom_util/aom_thread.h"
#include "av1/common/alloccommon.h"
......@@ -327,10 +330,33 @@ static aom_codec_err_t decoder_peek_si_internal(const uint8_t *data,
{
#if CONFIG_OBU
// Proper fix needed
si->is_kf = 1;
intra_only_flag = 1;
si->h = 1;
struct aom_read_bit_buffer rb = { data + PRE_OBU_SIZE_BYTES, data + data_sz,
0, NULL, NULL };
mem_get_le32(data);
aom_rb_read_literal(&rb, 8); // obu_header
av1_read_profile(&rb); // profile
aom_rb_read_literal(&rb, 4); // level
#if CONFIG_SCALABILITY
int i;
si->enhancement_layers_cnt = aom_rb_read_literal(&rb, 2);
for (i = 1; i <= (int)si->enhancement_layers_cnt; i++) {
aom_rb_read_literal(&rb, 4); // level for each enhancement layer
}
#endif // CONFIG_SCALABILITY
#if CONFIG_FRAME_SIZE
int num_bits_width = aom_rb_read_literal(&rb, 4) + 1;
int num_bits_height = aom_rb_read_literal(&rb, 4) + 1;
int max_frame_width = aom_rb_read_literal(&rb, num_bits_width) + 1;
int max_frame_height = aom_rb_read_literal(&rb, num_bits_height) + 1;
si->w = max_frame_width;
si->h = max_frame_height;
#endif // CONFIG_FRAME_SIZE
#else
int show_frame;
int error_resilient;
......@@ -989,6 +1015,10 @@ static aom_image_t *decoder_get_frame(aom_codec_alg_priv_t *ctx,
ctx->img.fb_priv = frame_bufs[cm->new_fb_idx].raw_frame_buffer.priv;
img = &ctx->img;
#if CONFIG_SCALABILITY
img->temporal_id = cm->temporal_layer_id;
img->enhancement_id = cm->enhancement_layer_id;
#endif
#if CONFIG_FILM_GRAIN
return add_grain_if_needed(
img, ctx->image_with_grain,
......
av1/common/onyxc_int.h
View file @ f8589863
......@@ -608,6 +608,12 @@ typedef struct AV1Common {
DqType dq_type;
#endif // CONFIG_NEW_QUANT
#if CONFIG_SCALABILITY
int temporal_layer_id;
int enhancement_layer_id;
int enhancement_layers_cnt;
#endif
#if TXCOEFF_TIMER
int64_t cum_txcoeff_timer;
int64_t txcoeff_timer;
......
av1/decoder/obu.c
View file @ f8589863
......@@ -21,8 +21,29 @@
#include "av1/decoder/decoder.h"
#include "av1/decoder/decodeframe.h"
#if CONFIG_SCALABILITY
// picture prediction structures (0-12 are predefined) in scaiability metadata
typedef enum {
SCALABILITY_L1T2 = 0,
SCALABILITY_L1T3 = 1,
SCALABILITY_L2T1 = 2,
SCALABILITY_L2T2 = 3,
SCALABILITY_L2T3 = 4,
SCALABILITY_S2T1 = 5,
SCALABILITY_S2T2 = 6,
SCALABILITY_S2T3 = 7,
SCALABILITY_L2T2h = 8,
SCALABILITY_L2T3h = 9,
SCALABILITY_S2T1h = 10,
SCALABILITY_S2T2h = 11,
SCALABILITY_S2T3h = 12,
SCALABILITY_SS = 13
} SCALABILITY_STRUCTURES;
#endif
static OBU_TYPE read_obu_header(struct aom_read_bit_buffer *rb,
size_t *header_size) {
size_t *header_size,
uint8_t *obu_extension_header) {
*header_size = 1;
// first bit is obu_forbidden_bit (0) according to R19
......@@ -31,12 +52,17 @@ static OBU_TYPE read_obu_header(struct aom_read_bit_buffer *rb,
const OBU_TYPE obu_type = (OBU_TYPE)aom_rb_read_literal(rb, 4);
aom_rb_read_literal(rb, 2); // reserved
const int obu_extension_flag = aom_rb_read_bit(rb);
if (obu_extension_header) *obu_extension_header = 0;
if (obu_extension_flag) {
*header_size += 1;
#if !CONFIG_SCALABILITY
aom_rb_read_literal(rb, 3); // temporal_id
aom_rb_read_literal(rb, 2);
aom_rb_read_literal(rb, 2);
aom_rb_read_literal(rb, 1); // reserved
#else
*obu_extension_header = (uint8_t)aom_rb_read_literal(rb, 8);
#endif
}
return obu_type;
......@@ -48,10 +74,20 @@ static uint32_t read_sequence_header_obu(AV1Decoder *pbi,
struct aom_read_bit_buffer *rb) {
AV1_COMMON *const cm = &pbi->common;
uint32_t saved_bit_offset = rb->bit_offset;
#if CONFIG_SCALABILITY
int i;
#endif
cm->profile = av1_read_profile(rb);
aom_rb_read_literal(rb, 4); // level
#if CONFIG_SCALABILITY
pbi->common.enhancement_layers_cnt = aom_rb_read_literal(rb, 2);
for (i = 1; i <= pbi->common.enhancement_layers_cnt; i++) {
aom_rb_read_literal(rb, 4); // level for each enhancement layer
}
#endif
read_sequence_header(&cm->seq_params, rb);
av1_read_bitdepth_colorspace_sampling(cm, rb, pbi->allow_lowbitdepth);
......@@ -145,6 +181,51 @@ static void read_metadata_hdr_mdcv(const uint8_t *data) {
mem_get_le16(data);
}
#if CONFIG_SCALABILITY
static void scalability_structure(struct aom_read_bit_buffer *rb) {
int enhancement_layers_cnt = aom_rb_read_literal(rb, 2);
int enhancement_layer_dimensions_present_flag = aom_rb_read_literal(rb, 1);
int enhancement_layer_description_present_flag = aom_rb_read_literal(rb, 1);
int temporal_group_description_flag = aom_rb_read_literal(rb, 1);
aom_rb_read_literal(rb, 3); // reserved
if (enhancement_layer_dimensions_present_flag) {
int i;
for (i = 0; i < enhancement_layers_cnt + 1; i++) {
aom_rb_read_literal(rb, 16);
aom_rb_read_literal(rb, 16);
}
}
if (enhancement_layer_description_present_flag) {
int i;
for (i = 0; i < enhancement_layers_cnt + 1; i++) {
aom_rb_read_literal(rb, 8);
}
}
if (temporal_group_description_flag) {
int i, j, temporal_group_size;
temporal_group_size = aom_rb_read_literal(rb, 8);
for (i = 0; i < temporal_group_size; i++) {
aom_rb_read_literal(rb, 3);
aom_rb_read_literal(rb, 1);
int temporal_group_ref_cnt = aom_rb_read_literal(rb, 2);
aom_rb_read_literal(rb, 2);
for (j = 0; j < temporal_group_ref_cnt; j++) {
aom_rb_read_literal(rb, 8);
}
}
}
}
static void read_metadata_scalability(const uint8_t *data, size_t sz) {
struct aom_read_bit_buffer rb = { data, data + sz, 0, NULL, NULL };
int scalability_mode_idc = aom_rb_read_literal(&rb, 8);
if (scalability_mode_idc == SCALABILITY_SS) {
scalability_structure(&rb);
}
}
#endif
static size_t read_metadata(const uint8_t *data, size_t sz) {
assert(sz >= 2);
const OBU_METADATA_TYPE metadata_type = (OBU_METADATA_TYPE)mem_get_le16(data);
......@@ -155,11 +236,22 @@ static size_t read_metadata(const uint8_t *data, size_t sz) {
read_metadata_hdr_cll(data + 2);
} else if (metadata_type == OBU_METADATA_TYPE_HDR_MDCV) {
read_metadata_hdr_mdcv(data + 2);
#if CONFIG_SCALABILITY
} else if (metadata_type == OBU_METADATA_TYPE_SCALABILITY) {
read_metadata_scalability(data + 2, sz - 2);
#endif
}
return sz;
}
#if CONFIG_SCALABILITY
static const uint32_t kObuExtTemporalIdBitsMask = 0x7;
static const uint32_t kObuExtTemporalIdBitsShift = 5;
static const uint32_t kObuExtEnhancementIdBitsMask = 0x3;
static const uint32_t kObuExtEnhancementIdBitsShift = 3;
#endif
void av1_decode_frame_from_obus(struct AV1Decoder *pbi, const uint8_t *data,
const uint8_t *data_end,
const uint8_t **p_data_end) {
......@@ -168,6 +260,9 @@ void av1_decode_frame_from_obus(struct AV1Decoder *pbi, const uint8_t *data,
int is_first_tg_obu_received = 1;
int frame_header_received = 0;
int frame_header_size = 0;
#if CONFIG_SCALABILITY
uint8_t obu_extension_header = 0;
#endif
if (data_end < data) {
cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
......@@ -193,12 +288,28 @@ void av1_decode_frame_from_obus(struct AV1Decoder *pbi, const uint8_t *data,
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);
#if !CONFIG_SCALABILITY
const OBU_TYPE obu_type = read_obu_header(&rb, &obu_header_size, NULL);
#else
const OBU_TYPE obu_type =
read_obu_header(&rb, &obu_header_size, &obu_extension_header);
#endif
data += (PRE_OBU_SIZE_BYTES + obu_header_size);
if (data_end < data) {
cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
return;
}
#if CONFIG_SCALABILITY
cm->temporal_layer_id =
(obu_extension_header >> kObuExtTemporalIdBitsShift) &
kObuExtTemporalIdBitsMask;
cm->enhancement_layer_id =
(obu_extension_header >> kObuExtEnhancementIdBitsShift) &
kObuExtEnhancementIdBitsMask;
#endif
switch (obu_type) {
case OBU_TEMPORAL_DELIMITER:
obu_payload_size = read_temporal_delimiter_obu();
......
av1/encoder/bitstream.c
View file @ f8589863
......@@ -4513,7 +4513,13 @@ int write_uleb_obu_size(uint32_t obu_size, uint8_t *dest) {
}
#endif // CONFIG_OBU_SIZING
static uint32_t write_sequence_header_obu(AV1_COMP *cpi, uint8_t *const dst) {
static uint32_t write_sequence_header_obu(AV1_COMP *cpi, uint8_t *const dst
#if CONFIG_SCALABILITY
,
uint8_t enhancement_layers_cnt) {
#else
) {
#endif
AV1_COMMON *const cm = &cpi->common;
struct aom_write_bit_buffer wb = { dst, 0 };
uint32_t size = 0;
......@@ -4521,6 +4527,13 @@ static uint32_t write_sequence_header_obu(AV1_COMP *cpi, uint8_t *const dst) {
write_profile(cm->profile, &wb);
aom_wb_write_literal(&wb, 0, 4);
#if CONFIG_SCALABILITY
aom_wb_write_literal(&wb, enhancement_layers_cnt, 2);
int i;
for (i = 1; i <= enhancement_layers_cnt; i++) {
aom_wb_write_literal(&wb, 0, 4);
}
#endif
write_sequence_header(cpi, &wb);
......@@ -4594,7 +4607,8 @@ static uint32_t write_tiles_in_tg_obus(AV1_COMP *const cpi, uint8_t *const dst,
#if CONFIG_EXT_TILE
struct aom_write_bit_buffer *saved_wb,
#endif
int insert_frame_header_obu_flag) {
int insert_frame_header_obu_flag,
uint8_t obu_extension_header) {
AV1_COMMON *const cm = &cpi->common;
const int num_planes = av1_num_planes(cm);
aom_writer mode_bc;
......@@ -4761,8 +4775,8 @@ static uint32_t write_tiles_in_tg_obus(AV1_COMP *const cpi, uint8_t *const dst,
data = dst + total_size;
// A new tile group begins at this tile. Write the obu header and
// tile group header
curr_tg_data_size =
write_obu_header(OBU_TILE_GROUP, 0, data + PRE_OBU_SIZE_BYTES);
curr_tg_data_size = write_obu_header(
OBU_TILE_GROUP, obu_extension_header, data + PRE_OBU_SIZE_BYTES);
if (n_log2_tiles)
curr_tg_data_size += write_tile_group_header(
data + curr_tg_data_size + PRE_OBU_SIZE_BYTES, tile_idx,
......@@ -4845,13 +4859,20 @@ int av1_pack_bitstream(AV1_COMP *const cpi, uint8_t *dst, size_t *size) {
uint32_t data_size;
unsigned int max_tile_size;
unsigned int max_tile_col_size;
AV1_COMMON *const cm = &cpi->common;
#if CONFIG_OBU
AV1_COMMON *const cm = &cpi->common;
uint32_t obu_size;
uint8_t *frame_header_location;
uint32_t frame_header_size;
#if CONFIG_SCALABILITY
const uint8_t enhancement_layers_cnt = cm->enhancement_layers_cnt;
const uint8_t obu_extension_header =
cm->temporal_layer_id << 5 | cm->enhancement_layer_id << 3 | 0;
#else
uint8_t obu_extension_header = 0;
#endif // CONFIG_SCALABILITY
#endif // CONFIG_OBU
(void)cm;
#if CONFIG_BITSTREAM_DEBUG
bitstream_queue_reset_write();
#endif
......@@ -4863,8 +4884,13 @@ int av1_pack_bitstream(AV1_COMP *const cpi, uint8_t *dst, size_t *size) {
if (cm->frame_type == KEY_FRAME) {
obu_size =
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);
obu_size += write_sequence_header_obu(
#if CONFIG_SCALABILITY
cpi, data + PRE_OBU_SIZE_BYTES + obu_size, enhancement_layers_cnt);
#else
cpi, data + PRE_OBU_SIZE_BYTES + obu_size);
#endif // CONFIG_SCALABILITY
#if CONFIG_OBU_SIZING
if (write_uleb_obu_size(obu_size, data) != AOM_CODEC_OK)
......@@ -4882,7 +4908,8 @@ int av1_pack_bitstream(AV1_COMP *const cpi, uint8_t *dst, size_t *size) {
// write frame header obu, preceded by 4-byte size
frame_header_location = data + PRE_OBU_SIZE_BYTES;
obu_size = write_obu_header(OBU_FRAME_HEADER, 0, frame_header_location);
obu_size = write_obu_header(OBU_FRAME_HEADER, obu_extension_header,
frame_header_location);
frame_header_size =
write_frame_header_obu(cpi,
#if CONFIG_EXT_TILE
......@@ -4905,17 +4932,17 @@ int av1_pack_bitstream(AV1_COMP *const cpi, uint8_t *dst, size_t *size) {
} else {
// Each tile group obu will be preceded by 4-byte size of the tile group
// obu
data_size =
write_tiles_in_tg_obus(cpi, data, &max_tile_size, &max_tile_col_size,
frame_header_location - PRE_OBU_SIZE_BYTES,
obu_size + PRE_OBU_SIZE_BYTES,
data_size = write_tiles_in_tg_obus(
cpi, data, &max_tile_size, &max_tile_col_size,
frame_header_location - PRE_OBU_SIZE_BYTES,
obu_size + PRE_OBU_SIZE_BYTES,
#if CONFIG_EXT_TILE
&saved_wb,
&saved_wb,
#endif
1 /* cm->error_resilient_mode */);
1 /* cm->error_resilient_mode */, obu_extension_header);
}
#endif
#endif // CONFIG_OBU
#if CONFIG_EXT_TILE && !CONFIG_OBU
uint32_t uncompressed_hdr_size;
......