Removal of CONFIG_CWG_F168_DPB_HLS
diff --git a/aom/aom_encoder.h b/aom/aom_encoder.h index 7ceff70..789a5ca 100644 --- a/aom/aom_encoder.h +++ b/aom/aom_encoder.h
@@ -619,18 +619,10 @@ */ unsigned int enable_ext_seg; #endif // CONFIG_EXT_SEG - -#if CONFIG_CWG_F168_DPB_HLS /*!\brief number of decoded picture buffer (DPB) slots * */ int dpb_size; -#else - /*!\brief number of extra decoded picture buffers - * - */ - int num_extra_dpb; -#endif // CONFIG_CWG_F168_DPB_HLS /*!\brief enable bru * */
diff --git a/aom/aomcx.h b/aom/aomcx.h index fd1a95c..07b662f 100644 --- a/aom/aomcx.h +++ b/aom/aomcx.h
@@ -1090,19 +1090,11 @@ */ AV1E_SET_GF_MAX_PYRAMID_HEIGHT = 123, -#if CONFIG_CWG_F168_DPB_HLS -/*!\brief Control to select maximum reference frames allowed per frame, int - * parameter - * - * Valid range: 1..7 - */ -#else -/*!\brief Control to select maximum reference frames allowed per frame, int - * parameter - * - * Valid range: 3..7 - */ -#endif // CONFIG_CWG_F168_DPB_HLS + /*!\brief Control to select maximum reference frames allowed per frame, int + * parameter + * + * Valid range: 1..7 + */ AV1E_SET_MAX_REFERENCE_FRAMES = 124, /*!\brief Control to use reduced set of single and compound references, int
diff --git a/apps/aomenc.c b/apps/aomenc.c index 8e96cfe..71fc9ab 100644 --- a/apps/aomenc.c +++ b/apps/aomenc.c
@@ -501,11 +501,7 @@ #if CONFIG_EXT_SEG &g_av1_codec_arg_defs.enable_ext_seg, #endif // CONFIG_EXT_SEG -#if CONFIG_CWG_F168_DPB_HLS &g_av1_codec_arg_defs.dpb_size, -#else - &g_av1_codec_arg_defs.num_extra_dpb, -#endif // CONFIG_CWG_F168_DPB_HLS &g_av1_codec_arg_defs.enable_bru, #if CONFIG_CONTROL_LOOPFILTERS_ACROSS_TILES &g_av1_codec_arg_defs.disable_loopfilters_across_tiles, @@ -733,11 +729,7 @@ #if CONFIG_EXT_SEG config->enable_ext_seg = 0; #endif // CONFIG_EXT_SEG -#if CONFIG_CWG_F168_DPB_HLS config->dpb_size = 8; -#else - config->num_extra_dpb = 0; -#endif // CONFIG_CWG_F168_DPB_HLS config->enable_bru = 0; #if CONFIG_CONTROL_LOOPFILTERS_ACROSS_TILES config->disable_loopfilters_across_tiles = 0;
diff --git a/av1/arg_defs.c b/av1/arg_defs.c index f8d6dd8..501c127 100644 --- a/av1/arg_defs.c +++ b/av1/arg_defs.c
@@ -719,15 +719,9 @@ .gf_max_pyr_height = ARG_DEF( NULL, "gf-max-pyr-height", 1, "maximum height for GF group pyramid structure (0 to 5 (default))"), -#if CONFIG_CWG_F168_DPB_HLS .max_reference_frames = ARG_DEF(NULL, "max-reference-frames", 1, "maximum number of reference frames allowed " "per frame (1 to 7 (default))"), -#else - .max_reference_frames = ARG_DEF(NULL, "max-reference-frames", 1, - "maximum number of reference frames allowed " - "per frame (3 to 7 (default))"), -#endif // CONFIG_CWG_F168_DPB_HLS .reduced_reference_set = ARG_DEF(NULL, "reduced-reference-set", 1, "Use reduced set of single and compound references (0: off " @@ -864,13 +858,8 @@ "Enable extended # of segments " "(0: false (default), 1: true)"), #endif // CONFIG_EXT_SEG -#if CONFIG_CWG_F168_DPB_HLS .dpb_size = ARG_DEF(NULL, "dpb-size", 1, "number of dpb slots (1-16), default is 8"), -#else - .num_extra_dpb = ARG_DEF(NULL, "num-extra-dpb", 1, - "extra dpb number (0..8), default is 0"), -#endif // CONFIG_CWG_F168_DPB_HLS .enable_bru = ARG_DEF(NULL, "enable-bru", 1, "Enable Backward Reference Update " "(0: false (default), 1: true with regular decoder, 2: "
diff --git a/av1/arg_defs.h b/av1/arg_defs.h index 9ed681d..a473740 100644 --- a/av1/arg_defs.h +++ b/av1/arg_defs.h
@@ -288,11 +288,7 @@ #if CONFIG_EXT_SEG arg_def_t enable_ext_seg; #endif // CONFIG_EXT_SEG -#if CONFIG_CWG_F168_DPB_HLS arg_def_t dpb_size; -#else - arg_def_t num_extra_dpb; -#endif // CONFIG_CWG_F168_DPB_HLS arg_def_t enable_bru; #if CONFIG_CONTROL_LOOPFILTERS_ACROSS_TILES arg_def_t disable_loopfilters_across_tiles;
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c index 15ac732..ddc7260 100644 --- a/av1/av1_cx_iface.c +++ b/av1/av1_cx_iface.c
@@ -242,11 +242,7 @@ #if CONFIG_EXT_SEG int enable_ext_seg; #endif // CONFIG_EXT_SEG -#if CONFIG_CWG_F168_DPB_HLS int dpb_size; -#else - int num_extra_dpb; -#endif // CONFIG_CWG_F168_DPB_HLS unsigned int enable_bru; #if CONFIG_CONTROL_LOOPFILTERS_ACROSS_TILES unsigned int disable_loopfilters_across_tiles; @@ -579,11 +575,7 @@ #if CONFIG_EXT_SEG 0, // enable_ext_seg #endif // CONFIG_EXT_SEG -#if CONFIG_CWG_F168_DPB_HLS 8, // dpb_size -#else - 0, // num_extra_dpb -#endif // CONFIG_CWG_F168_DPB_HLS 0, // enable_bru #if CONFIG_CONTROL_LOOPFILTERS_ACROSS_TILES 0, @@ -783,12 +775,7 @@ RANGE_CHECK_HI(cfg, frame_hash_metadata, 3); RANGE_CHECK_HI(cfg, frame_hash_per_plane, 1); -#if CONFIG_CWG_F168_DPB_HLS RANGE_CHECK(extra_cfg, dpb_size, 1, 16); -#else - RANGE_CHECK(extra_cfg, num_extra_dpb, 0, 8); -#endif // CONFIG_CWG_F168_DPB_HLS - RANGE_CHECK(extra_cfg, color_primaries, AOM_CICP_CP_BT_709, AOM_CICP_CP_EBU_3213); // Need to check range more precisely to // check for reserved values? @@ -843,11 +830,7 @@ if (extra_cfg->enable_chroma_deltaq) ERROR("Only --enable_chroma_deltaq=0 can be used with --lossless=1."); } -#if CONFIG_CWG_F168_DPB_HLS RANGE_CHECK(extra_cfg, max_reference_frames, 1, 7); -#else - RANGE_CHECK(extra_cfg, max_reference_frames, 3, 7); -#endif // CONFIG_CWG_F168_DPB_HLS RANGE_CHECK(extra_cfg, reduced_ref_frame_mvs_mode, 0, 1); RANGE_CHECK(extra_cfg, enable_reduced_reference_set, 0, 1); RANGE_CHECK(extra_cfg, explicit_ref_frame_map, 0, 1); @@ -1056,11 +1039,7 @@ #if CONFIG_EXT_SEG cfg->enable_ext_seg = extra_cfg->enable_ext_seg; #endif // CONFIG_EXT_SEG -#if CONFIG_CWG_F168_DPB_HLS cfg->dpb_size = extra_cfg->dpb_size; -#else - cfg->num_extra_dpb = extra_cfg->num_extra_dpb; -#endif } static void update_default_encoder_config(const cfg_options_t *cfg, @@ -1179,11 +1158,7 @@ #if CONFIG_EXT_SEG extra_cfg->enable_ext_seg = cfg->enable_ext_seg; #endif // CONFIG_EXT_SEG -#if CONFIG_CWG_F168_DPB_HLS extra_cfg->dpb_size = cfg->dpb_size; -#else - extra_cfg->num_extra_dpb = cfg->num_extra_dpb; -#endif } static double convert_qp_offset(int qp, int qp_offset, int bit_depth) { @@ -1510,11 +1485,7 @@ #if CONFIG_EXT_SEG tool_cfg->enable_ext_seg = extra_cfg->enable_ext_seg; #endif // CONFIG_EXT_SEG -#if CONFIG_CWG_F168_DPB_HLS tool_cfg->dpb_size = extra_cfg->dpb_size; -#else - tool_cfg->num_extra_dpb = extra_cfg->num_extra_dpb; -#endif // CONFIG_CWG_F168_DPB_HLS // Set Quantization related configuration. q_cfg->using_qm = extra_cfg->enable_qm; @@ -1683,13 +1654,11 @@ } // Set reference frame related configuration. -#if CONFIG_CWG_F168_DPB_HLS // If max_reference_frames is set to be larger than dpb_size, set // max_reference_frames to dpb_size. if (extra_cfg->max_reference_frames > extra_cfg->dpb_size) { extra_cfg->max_reference_frames = extra_cfg->dpb_size; } -#endif oxcf->ref_frm_cfg.max_reference_frames = extra_cfg->max_reference_frames; oxcf->ref_frm_cfg.enable_reduced_reference_set = extra_cfg->enable_reduced_reference_set; @@ -4437,15 +4406,9 @@ err_string)) { extra_cfg.enable_ext_seg = arg_parse_int_helper(&arg, err_string); #endif // CONFIG_EXT_SEG -#if CONFIG_CWG_F168_DPB_HLS } else if (arg_match_helper(&arg, &g_av1_codec_arg_defs.dpb_size, argv, err_string)) { extra_cfg.dpb_size = arg_parse_int_helper(&arg, err_string); -#else - } else if (arg_match_helper(&arg, &g_av1_codec_arg_defs.num_extra_dpb, argv, - err_string)) { - extra_cfg.num_extra_dpb = arg_parse_int_helper(&arg, err_string); -#endif // CONFIG_CWG_F168_DPB_HLS } else if (arg_match_helper(&arg, &g_av1_codec_arg_defs.enable_bru, argv, err_string)) { extra_cfg.enable_bru = arg_parse_int_helper(&arg, err_string); @@ -4765,11 +4728,7 @@ #if CONFIG_EXT_SEG 0, // enable_ext_seg #endif // CONFIG_EXT_SEG -#if CONFIG_CWG_F168_DPB_HLS 8, // dpb_size -#else - 0, // num_extra_dpb -#endif // CONFIG_CWG_F168_DPB_HLS 0, // enable_bru #if CONFIG_CONTROL_LOOPFILTERS_ACROSS_TILES 0, // disable_loopfilters_across_tiles
diff --git a/av1/common/av1_common_int.h b/av1/common/av1_common_int.h index 963656d..4d656ac 100644 --- a/av1/common/av1_common_int.h +++ b/av1/common/av1_common_int.h
@@ -927,21 +927,15 @@ int enable_frame_output_order; // Enable frame output order derivation based // on order hint value #endif // !CONFIG_F253_REMOVE_OUTPUTFLAG -#if !CONFIG_CWG_F168_DPB_HLS - int max_reference_frames; // Number of reference frames allowed -#endif // !CONFIG_CWG_F168_DPB_HLS - int def_max_drl_bits; // default max drl bits for MVs + int def_max_drl_bits; // default max drl bits for MVs uint8_t allow_frame_max_drl_bits; // whether to allow frame level update int def_max_bvp_drl_bits; // default max ibc drl bits for MVs uint8_t allow_frame_max_bvp_drl_bits; // whether to allow frame level update int num_same_ref_compound; // Number of the allowed same reference frames for // the compound mode -#if !CONFIG_CWG_F168_DPB_HLS - int num_extra_dpb; // number of extra decoded picture buffers -#endif // !CONFIG_CWG_F168_DPB_HLS - int ref_frames; // number of all decoded picture buffers - int ref_frames_log2; // ceiling of the log2 value of the number of all - // decoded picture buffers (ref_frames) + int ref_frames; // number of all decoded picture buffers + int ref_frames_log2; // ceiling of the log2 value of the number of all + // decoded picture buffers (ref_frames) OrderHintInfo order_hint_info;
diff --git a/av1/common/enums.h b/av1/common/enums.h index 41dc8a7..1a75a87 100644 --- a/av1/common/enums.h +++ b/av1/common/enums.h
@@ -1137,12 +1137,6 @@ // log2(INTER_REFS_PER_FRAME + 1) #define MAX_REFS_PER_FRAME_LOG2 3 -#if !CONFIG_CWG_F168_DPB_HLS -#define REGULAR_REF_FRAMES \ - (INTER_REFS_PER_FRAME + \ - 1) // the original size of the decoded picture buffers -#endif // !CONFIG_CWG_F168_DPB_HLS - #define REF_FRAMES 16 // NOTE: A limited number of unidirectional reference pairs can be signalled for @@ -1165,10 +1159,6 @@ #define NONE_FRAME INVALID_IDX #define AOM_REFFRAME_ALL ((1 << INTER_REFS_PER_FRAME) - 1) -#if !CONFIG_CWG_F168_DPB_HLS -#define REF_FRAMES_LOG2 3 -#endif // !CONFIG_CWG_F168_DPB_HLS - // REF_FRAMES for the cm->ref_frame_map array, 1 scratch frame for the new // frame in cm->cur_frame, INTER_REFS_PER_FRAME for scaled references on the // encoder in the cpi->scaled_ref_buf array.
diff --git a/av1/common/pred_common.c b/av1/common/pred_common.c index 773c17d..b11e1b3 100644 --- a/av1/common/pred_common.c +++ b/av1/common/pred_common.c
@@ -225,14 +225,9 @@ // Sort the references according to their score bubble_sort_ref_scores(scores, n_ranked); -#if CONFIG_CWG_F168_DPB_HLS const int max_num_ref_frames = AOMMIN(cm->seq_params.ref_frames, INTER_REFS_PER_FRAME); cm->ref_frames_info.num_total_refs = AOMMIN(n_ranked, max_num_ref_frames); -#else - cm->ref_frames_info.num_total_refs = - AOMMIN(n_ranked, cm->seq_params.max_reference_frames); -#endif // CONFIG_CWG_F168_DPB_HLS if (!resolution_available) cm->ref_frames_info.num_total_refs_res_indep = cm->ref_frames_info.num_total_refs;
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c index e85a748..e73d3c6 100644 --- a/av1/decoder/decodeframe.c +++ b/av1/decoder/decodeframe.c
@@ -7304,7 +7304,6 @@ seq_params->enable_frame_output_order = aom_rb_read_bit(rb); #endif // !CONFIG_F253_REMOVE_OUTPUTFLAG -#if CONFIG_CWG_F168_DPB_HLS if (aom_rb_read_bit(rb)) { seq_params->ref_frames = aom_rb_read_literal(rb, 4) + 1; // explicitly signaled DPB size @@ -7312,30 +7311,6 @@ seq_params->ref_frames = 8; // default DPB size: 8 } seq_params->ref_frames_log2 = aom_ceil_log2(seq_params->ref_frames); -#else - // A bit is sent here to indicate if the max number of references is 7. If - // this bit is 0, then two more bits are sent to indicate the exact number - // of references allowed (range: 3 to 6). - if (aom_rb_read_bit(rb)) { - seq_params->max_reference_frames = 3 + aom_rb_read_literal(rb, 2); - } else { - seq_params->max_reference_frames = 7; - } - const bool use_extra_dpb = aom_rb_read_bit(rb); - - if (use_extra_dpb) { - seq_params->num_extra_dpb = 1 + aom_rb_read_literal(rb, 3); - } else { - seq_params->num_extra_dpb = 0; - } - - seq_params->ref_frames = seq_params->num_extra_dpb - ? REGULAR_REF_FRAMES + seq_params->num_extra_dpb - : REGULAR_REF_FRAMES; - - seq_params->ref_frames_log2 = - seq_params->num_extra_dpb ? REF_FRAMES_LOG2 + 1 : REF_FRAMES_LOG2; -#endif // CONFIG_CWG_F168_DPB_HLS seq_params->def_max_drl_bits = aom_rb_read_primitive_quniform(rb, @@ -9150,21 +9125,14 @@ if (explicit_ref_frame_map) { cm->ref_frames_info.num_total_refs = aom_rb_read_literal(rb, MAX_REFS_PER_FRAME_LOG2); -#if CONFIG_CWG_F168_DPB_HLS const int max_num_ref_frames = AOMMIN(seq_params->ref_frames, INTER_REFS_PER_FRAME); -#endif // CONFIG_CWG_F168_DPB_HLS // Check whether num_total_refs read is valid #if CONFIG_RANDOM_ACCESS_SWITCH_FRAME if (current_frame->frame_type != S_FRAME) #endif // CONFIG_RANDOM_ACCESS_SWITCH_FRAME if (cm->ref_frames_info.num_total_refs < 0 || - cm->ref_frames_info.num_total_refs > -#if CONFIG_CWG_F168_DPB_HLS - max_num_ref_frames) -#else - seq_params->max_reference_frames) -#endif // CONFIG_CWG_F168_DPB_HLS + cm->ref_frames_info.num_total_refs > max_num_ref_frames) aom_internal_error(&cm->error, AOM_CODEC_ERROR, "Invalid num_total_refs"); for (int i = 0; i < cm->ref_frames_info.num_total_refs; ++i) {
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c index 73bfb4d..6a975e6 100644 --- a/av1/encoder/bitstream.c +++ b/av1/encoder/bitstream.c
@@ -5869,21 +5869,12 @@ aom_wb_write_bit(wb, seq_params->enable_frame_output_order); #endif // !CONFIG_F253_REMOVE_OUTPUTFLAG -#if CONFIG_CWG_F168_DPB_HLS const int signal_dpb_explicit = seq_params->ref_frames != 8; // DPB size 8 is the default value aom_wb_write_bit(wb, signal_dpb_explicit); if (signal_dpb_explicit) { aom_wb_write_literal(wb, seq_params->ref_frames - 1, 4); } -#else - // A bit is sent here to indicate if the max number of references is 7. If - // this bit is 0, then two more bits are sent to indicate the exact number - // of references allowed (range: 3 to 6). - aom_wb_write_bit(wb, seq_params->max_reference_frames < 7); - if (seq_params->max_reference_frames < 7) - aom_wb_write_literal(wb, seq_params->max_reference_frames - 3, 2); -#endif // CONFIG_CWG_F168_DPB_HLS aom_wb_write_primitive_quniform( wb, MAX_MAX_DRL_BITS - MIN_MAX_DRL_BITS + 1, @@ -6820,18 +6811,10 @@ aom_wb_write_bit(wb, explicit_ref_frame_map); #endif if (explicit_ref_frame_map) { -#if CONFIG_CWG_F168_DPB_HLS const int max_num_ref_frames = AOMMIN(seq_params->ref_frames, INTER_REFS_PER_FRAME); -#endif // CONFIG_CWG_F168_DPB_HLS if (cm->ref_frames_info.num_total_refs < 0 || - cm->ref_frames_info.num_total_refs > -#if CONFIG_CWG_F168_DPB_HLS - max_num_ref_frames -#else - seq_params->max_reference_frames -#endif // CONFIG_CWG_F168_DPB_HLS - ) + cm->ref_frames_info.num_total_refs > max_num_ref_frames) aom_internal_error(&cpi->common.error, AOM_CODEC_ERROR, "Invalid num_total_refs"); aom_wb_write_literal(wb, cm->ref_frames_info.num_total_refs,
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c index a8ee29a..60c84b7 100644 --- a/av1/encoder/encoder.c +++ b/av1/encoder/encoder.c
@@ -423,9 +423,6 @@ #endif // !CONFIG_CWG_F243_REMOVE_ENABLE_ORDER_HINT ; #endif // !CONFIG_F253_REMOVE_OUTPUTFLAG -#if !CONFIG_CWG_F168_DPB_HLS - seq->max_reference_frames = oxcf->ref_frm_cfg.max_reference_frames; -#endif // !CONFIG_CWG_F168_DPB_HLS if (oxcf->tool_cfg.max_drl_refmvs == 0) { seq->def_max_drl_bits = DEF_MAX_DRL_REFMVS - 1; } else { @@ -647,16 +644,8 @@ #if CONFIG_EXT_SEG seq->enable_ext_seg = tool_cfg->enable_ext_seg; #endif // CONFIG_EXT_SEG -#if CONFIG_CWG_F168_DPB_HLS seq->ref_frames = tool_cfg->dpb_size; seq->ref_frames_log2 = aom_ceil_log2(seq->ref_frames); -#else - seq->num_extra_dpb = tool_cfg->num_extra_dpb; - seq->ref_frames = seq->num_extra_dpb ? REGULAR_REF_FRAMES + seq->num_extra_dpb - : REGULAR_REF_FRAMES; - seq->ref_frames_log2 = - seq->num_extra_dpb ? REF_FRAMES_LOG2 + 1 : REF_FRAMES_LOG2; -#endif // CONFIG_CWG_F168_DPB_HLS const QuantizationCfg *const q_cfg = &oxcf->q_cfg; seq->user_defined_qmatrix = q_cfg->using_qm && q_cfg->user_defined_qmatrix; #if CONFIG_QM_DEBUG
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h index a86f7a0..955226a 100644 --- a/av1/encoder/encoder.h +++ b/av1/encoder/encoder.h
@@ -944,11 +944,7 @@ #if CONFIG_EXT_SEG bool enable_ext_seg; #endif // CONFIG_EXT_SEG -#if CONFIG_CWG_F168_DPB_HLS int dpb_size; -#else - int num_extra_dpb; -#endif // CONFIG_CWG_F168_DPB_HLS // Indicates what frame hash metadata to write unsigned int frame_hash_metadata; @@ -3598,13 +3594,9 @@ get_max_allowed_ref_frames(cpi->sf.inter_sf.selective_ref_frame, cpi->oxcf.ref_frm_cfg.max_reference_frames); -#if CONFIG_CWG_F168_DPB_HLS const int num_refs_to_disable = INTER_REFS_PER_FRAME - max_allowed_refs; for (int i = 0; i < num_refs_to_disable && total_valid_refs > max_allowed_refs; ++i) { -#else - for (int i = 0; i < 4 && total_valid_refs > max_allowed_refs; ++i) { -#endif // CONFIG_CWG_F168_DPB_HLS const MV_REFERENCE_FRAME ref_frame_to_disable = INTER_REFS_PER_FRAME - i - 1;
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake index 2f066e5..bbf1118 100644 --- a/build/cmake/aom_config_defaults.cmake +++ b/build/cmake/aom_config_defaults.cmake
@@ -231,10 +231,6 @@ set_aom_config_var(CONFIG_MULTI_STREAM 1 "AV2 enable multi-streams.") set_aom_config_var(OBU_ORDER_IN_TU 1 "Check OBU order in TU") -# Configurable DPB extension -set_aom_config_var(CONFIG_CWG_F168_DPB_HLS 1 - "signaling changes for DPB extension") - set_aom_config_var(CONFIG_TU64_TRAVERSED_ORDER 1 "Coding order of TU 64x64 traversed as 128x128 blocks")
diff --git a/common/args.c b/common/args.c index 567b981..54d1ba7 100644 --- a/common/args.c +++ b/common/args.c
@@ -168,11 +168,7 @@ #if CONFIG_EXT_SEG GET_PARAMS(enable_ext_seg); #endif // CONFIG_EXT_SEG -#if CONFIG_CWG_F168_DPB_HLS GET_PARAMS(dpb_size); -#else - GET_PARAMS(num_extra_dpb); -#endif // CONFIG_CWG_F168_DPB_HLS fprintf(stderr, "\nInvalid parameter: %s", left); exit(-1);