Remove CONFIG_REFERENCE_BUFFER flag
Now SequenceHeader is no need of a flag to access.
Change-Id: I3c76249f9b21d391bf4733ea4cf16f11da6c9c18
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index 0d0772a..1ae94ef 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -1348,14 +1348,12 @@
-1 != av1_get_compressed_data(cpi, &lib_flags, &frame_size, cx_data,
&dst_time_stamp, &dst_end_time_stamp,
!img)) {
-#if CONFIG_REFERENCE_BUFFER
if (cpi->common.seq_params.frame_id_numbers_present_flag) {
if (cpi->common.invalid_delta_frame_id_minus1) {
ctx->base.err_detail = "Invalid delta_frame_id_minus1";
return AOM_CODEC_ERROR;
}
}
-#endif // CONFIG_REFERENCE_BUFFER
if (frame_size) {
if (ctx->pending_cx_data == 0) ctx->pending_cx_data = cx_data;
diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index 28ebcb2..e857b60 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -67,11 +67,9 @@
// normal reference pool.
#define FRAME_BUFFERS (REF_FRAMES + 7)
-#if CONFIG_REFERENCE_BUFFER
/* Constant values while waiting for the sequence header */
#define FRAME_ID_LENGTH 15
#define DELTA_FRAME_ID_LENGTH 14
-#endif // CONFIG_REFERENCE_BUFFER
#if CONFIG_NO_FRAME_CONTEXT_SIGNALING
#define FRAME_CONTEXTS (FRAME_BUFFERS + 1)
@@ -206,7 +204,6 @@
typedef int BASE_CTX_TABLE[2 /*col*/][3 /*sig_map*/]
[BASE_CONTEXT_POSITION_NUM + 1];
-#if CONFIG_REFERENCE_BUFFER
/* Initial version of sequence header structure */
typedef struct SequenceHeader {
#if CONFIG_FRAME_SIZE
@@ -237,7 +234,6 @@
// 1 - enable it
#endif
} SequenceHeader;
-#endif // CONFIG_REFERENCE_BUFFER
typedef struct AV1Common {
struct aom_internal_error_info error;
@@ -587,14 +583,12 @@
int delta_lf_multi;
#endif
int num_tg;
-#if CONFIG_REFERENCE_BUFFER
SequenceHeader seq_params;
int current_frame_id;
int ref_frame_id[REF_FRAMES];
int valid_for_referencing[REF_FRAMES];
int refresh_mask;
int invalid_delta_frame_id_minus1;
-#endif // CONFIG_REFERENCE_BUFFER
LV_MAP_CTX_TABLE coeff_ctx_table;
#if CONFIG_MFMV
TPL_MV_REF *tpl_mvs;
@@ -1403,12 +1397,7 @@
}
static INLINE void set_use_reference_buffer(AV1_COMMON *const cm, int use) {
-#if CONFIG_REFERENCE_BUFFER
cm->seq_params.frame_id_numbers_present_flag = use;
-#else
- (void)cm;
- (void)use;
-#endif
}
static INLINE void set_sb_size(SequenceHeader *const seq_params,
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 32afd66..84f6093 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -2524,7 +2524,6 @@
cm->cur_frame->intra_only = 1;
-#if CONFIG_REFERENCE_BUFFER
if (cm->seq_params.frame_id_numbers_present_flag) {
/* If bitmask is set, update reference frame id values and
mark frames as valid for reference */
@@ -2536,7 +2535,6 @@
}
}
}
-#endif // CONFIG_REFERENCE_BUFFER
cm->refresh_frame_context = REFRESH_FRAME_CONTEXT_DISABLED;
@@ -2592,7 +2590,6 @@
// Show an existing frame directly.
const int existing_frame_idx = aom_rb_read_literal(rb, 3);
const int frame_to_show = cm->ref_frame_map[existing_frame_idx];
-#if CONFIG_REFERENCE_BUFFER
if (cm->seq_params.frame_id_numbers_present_flag) {
int frame_id_length = cm->seq_params.frame_id_length;
int display_frame_id = aom_rb_read_literal(rb, frame_id_length);
@@ -2606,7 +2603,6 @@
cm->current_frame_id = display_frame_id;
#endif // CONFIG_FWD_KF
}
-#endif // CONFIG_REFERENCE_BUFFER
lock_buffer_pool(pool);
if (frame_to_show < 0 || frame_bufs[frame_to_show].ref_count < 1) {
unlock_buffer_pool(pool);
@@ -2651,8 +2647,6 @@
cm->intra_only = cm->frame_type == INTRA_ONLY_FRAME;
cm->error_resilient_mode = aom_rb_read_bit(rb);
-#if CONFIG_REFERENCE_BUFFER
-
#if CONFIG_INTRA_EDGE2
if (frame_is_intra_only(cm)) {
cm->disable_intra_edge_filter = aom_rb_read_bit(rb);
@@ -2717,7 +2711,6 @@
}
}
}
-#endif // CONFIG_REFERENCE_BUFFER
#if CONFIG_FRAME_SIZE
int frame_size_override_flag = aom_rb_read_literal(rb, 1);
@@ -2884,7 +2877,6 @@
// ref_frame_sign_bias will be reset based on frame offsets.
cm->ref_frame_sign_bias[LAST_FRAME + i] = 0;
-#if CONFIG_REFERENCE_BUFFER
if (cm->seq_params.frame_id_numbers_present_flag) {
int frame_id_length = cm->seq_params.frame_id_length;
int diff_len = cm->seq_params.delta_frame_id_length;
@@ -2900,7 +2892,6 @@
aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
"Reference buffer frame ID mismatch");
}
-#endif // CONFIG_REFERENCE_BUFFER
}
#if CONFIG_FRAME_SIZE
@@ -2959,7 +2950,6 @@
cm->cur_frame->intra_only = cm->frame_type == KEY_FRAME || cm->intra_only;
cm->cur_frame->frame_type = cm->frame_type;
-#if CONFIG_REFERENCE_BUFFER
if (cm->seq_params.frame_id_numbers_present_flag) {
/* If bitmask is set, update reference frame id values and
mark frames as valid for reference */
@@ -2971,7 +2961,6 @@
}
}
}
-#endif // CONFIG_REFERENCE_BUFFER
get_frame_new_buffer(cm)->bit_depth = cm->bit_depth;
get_frame_new_buffer(cm)->color_primaries = cm->color_primaries;
diff --git a/av1/decoder/decodeframe.h b/av1/decoder/decodeframe.h
index 8a4bed6..b461a7b 100644
--- a/av1/decoder/decodeframe.h
+++ b/av1/decoder/decodeframe.h
@@ -19,11 +19,9 @@
struct AV1Decoder;
struct aom_read_bit_buffer;
-#if CONFIG_REFERENCE_BUFFER
/* Placeholder for now */
void read_sequence_header(SequenceHeader *seq_params,
struct aom_read_bit_buffer *rb);
-#endif
#if CONFIG_FRAME_SIZE
void av1_read_frame_size(struct aom_read_bit_buffer *rb, int num_bits_width,
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 293722b..b2a816b 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3170,7 +3170,6 @@
aom_wb_write_bit(wb, 1); // show_existing_frame
aom_wb_write_literal(wb, cpi->existing_fb_idx_to_show, 3);
-#if CONFIG_REFERENCE_BUFFER
if (cm->seq_params.frame_id_numbers_present_flag) {
int frame_id_len = cm->seq_params.frame_id_length;
int display_frame_id = cm->ref_frame_id[cpi->existing_fb_idx_to_show];
@@ -3180,7 +3179,6 @@
/* Consider to have this logic only one place */
aom_wb_write_literal(wb, 0, 8);
}
-#endif // CONFIG_REFERENCE_BUFFER
#if CONFIG_FILM_GRAIN
if (cm->film_grain_params_present && cm->show_frame) {
@@ -3244,13 +3242,11 @@
}
#endif // CONFIG_AMVR
-#if CONFIG_REFERENCE_BUFFER
cm->invalid_delta_frame_id_minus1 = 0;
if (cm->seq_params.frame_id_numbers_present_flag) {
int frame_id_len = cm->seq_params.frame_id_length;
aom_wb_write_literal(wb, cm->current_frame_id, frame_id_len);
}
-#endif // CONFIG_REFERENCE_BUFFER
#if CONFIG_FRAME_SIZE
if (cm->width > cm->seq_params.max_frame_width ||
@@ -3375,7 +3371,7 @@
if (cm->frame_type == S_FRAME) {
assert(cm->ref_frame_sign_bias[ref_frame] == 0);
}
-#if CONFIG_REFERENCE_BUFFER
+
if (cm->seq_params.frame_id_numbers_present_flag) {
int i = get_ref_frame_map_idx(cpi, ref_frame);
int frame_id_len = cm->seq_params.frame_id_length;
@@ -3390,7 +3386,6 @@
cm->invalid_delta_frame_id_minus1 = 1;
aom_wb_write_literal(wb, delta_frame_id_minus1, diff_len);
}
-#endif // CONFIG_REFERENCE_BUFFER
}
#if CONFIG_FRAME_SIZE
@@ -3431,12 +3426,10 @@
aom_wb_write_literal(wb, arf_offset, FRAME_OFFSET_BITS);
}
-#if CONFIG_REFERENCE_BUFFER
if (cm->seq_params.frame_id_numbers_present_flag) {
cm->refresh_mask =
cm->frame_type == KEY_FRAME ? 0xFF : get_refresh_mask(cpi);
}
-#endif // CONFIG_REFERENCE_BUFFER
#if CONFIG_EXT_TILE
const int might_bwd_adapt =
diff --git a/av1/encoder/bitstream.h b/av1/encoder/bitstream.h
index f5d2e56..319bb2e 100644
--- a/av1/encoder/bitstream.h
+++ b/av1/encoder/bitstream.h
@@ -20,9 +20,7 @@
struct aom_write_bit_buffer;
-#if CONFIG_REFERENCE_BUFFER
void write_sequence_header(AV1_COMP *cpi, struct aom_write_bit_buffer *wb);
-#endif
uint32_t write_obu_header(OBU_TYPE obu_type, int obu_extension,
uint8_t *const dst);
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index fd3d83d..01dee7d 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -341,9 +341,7 @@
cpi->refresh_alt_ref_frame = 1;
av1_zero(cpi->interp_filter_selected);
set_sb_size(&cm->seq_params, select_sb_size(cpi));
-#if CONFIG_REFERENCE_BUFFER
set_use_reference_buffer(cm, 0);
-#endif // CONFIG_REFERENCE_BUFFER
#if CONFIG_NO_FRAME_CONTEXT_SIGNALING
cm->pre_fc = &cm->frame_contexts[FRAME_CONTEXT_DEFAULTS];
#else
@@ -5939,9 +5937,7 @@
#if CONFIG_EXT_TILE
cm->large_scale_tile = cpi->oxcf.large_scale_tile;
cm->single_tile_decoding = cpi->oxcf.single_tile_decoding;
-#if CONFIG_REFERENCE_BUFFER
if (cm->large_scale_tile) cm->seq_params.frame_id_numbers_present_flag = 0;
-#endif // CONFIG_REFERENCE_BUFFER
#endif // CONFIG_EXT_TILE
cm->seq_params.monochrome = oxcf->monochrome;
@@ -5965,7 +5961,6 @@
MAX_MODES * sizeof(*cpi->mode_chosen_counts));
#endif
-#if CONFIG_REFERENCE_BUFFER
if (cm->seq_params.frame_id_numbers_present_flag) {
/* Non-normative definition of current_frame_id ("frame counter" with
* wraparound) */
@@ -5987,7 +5982,6 @@
(1 << frame_id_length);
}
}
-#endif // CONFIG_REFERENCE_BUFFER
if (cpi->sf.recode_loop == DISALLOW_RECODE) {
encode_without_recode_loop(cpi);
@@ -6074,7 +6068,6 @@
return AOM_CODEC_OK;
}
-#if CONFIG_REFERENCE_BUFFER
if (cm->seq_params.frame_id_numbers_present_flag) {
int i;
/* Update reference frame id values based on the value of refresh_mask */
@@ -6084,7 +6077,6 @@
}
}
}
-#endif // CONFIG_REFERENCE_BUFFER
#if DUMP_RECON_FRAMES == 1
// NOTE(zoeliu): For debug - Output the filtered reconstructed video.
@@ -6941,13 +6933,12 @@
cm->min_qmlevel = cpi->oxcf.qm_minlevel;
cm->max_qmlevel = cpi->oxcf.qm_maxlevel;
-#if CONFIG_REFERENCE_BUFFER
if (cm->seq_params.frame_id_numbers_present_flag) {
if (*time_stamp == 0) {
cpi->common.current_frame_id = -1;
}
}
-#endif // CONFIG_REFERENCE_BUFFER
+
#if CONFIG_AMVR
cpi->cur_poc++;
if (oxcf->pass != 1 && cpi->common.allow_screen_content_tools) {
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 00720d6..c4dafad 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -131,7 +131,6 @@
set(CONFIG_OPT_REF_MV 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_Q_ADAPT_PROBS 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_RD_DEBUG 0 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_REFERENCE_BUFFER 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_SCALABILITY 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_SEGMENT_GLOBALMV 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_SEGMENT_PRED_LAST 1 CACHE NUMBER "AV1 experiment flag.")
