CONFIG_IMPROVED_CFL removal This branch is to remove the CONFIG_IMPROVED_CFL.
diff --git a/aom/aom_encoder.h b/aom/aom_encoder.h index 7ad52e4..c49d54a 100644 --- a/aom/aom_encoder.h +++ b/aom/aom_encoder.h
@@ -391,12 +391,10 @@ */ unsigned int enable_flex_mvres; -#if CONFIG_IMPROVED_CFL /*!\brief enable downsample filter options for CFL * */ unsigned int enable_cfl_ds_filter; -#endif // CONFIG_IMPROVED_CFL /*!\brief enable joint MVD coding *
diff --git a/apps/aomenc.c b/apps/aomenc.c index c5b2bfc..f3e45c4 100644 --- a/apps/aomenc.c +++ b/apps/aomenc.c
@@ -483,9 +483,7 @@ #endif // CONFIG_IBC_SR_EXT &g_av1_codec_arg_defs.enable_adaptive_mvd, &g_av1_codec_arg_defs.enable_flex_mvres, -#if CONFIG_IMPROVED_CFL &g_av1_codec_arg_defs.enable_cfl_ds_filter, -#endif // CONFIG_IMPROVED_CFL &g_av1_codec_arg_defs.enable_joint_mvd, #if CONFIG_REFINEMV &g_av1_codec_arg_defs.enable_refinemv, @@ -677,9 +675,7 @@ config->enable_ibp = 1; config->enable_adaptive_mvd = 1; config->enable_flex_mvres = 1; -#if CONFIG_IMPROVED_CFL config->enable_cfl_ds_filter = 1; -#endif // CONFIG_IMPROVED_CFL config->enable_joint_mvd = 1; #if CONFIG_REFINEMV config->enable_refinemv = 1; @@ -1558,12 +1554,10 @@ #endif // CONFIG_IDIF , encoder_cfg->enable_ibp); -#if CONFIG_IMPROVED_CFL fprintf( stdout, " : Adaptive Down sample filter: (%d)\n", encoder_cfg->enable_cfl_ds_filter); -#endif // CONFIG_IMPROVED_CFL fprintf(stdout, "Tool setting (Inter) : InterIntra (%d), OBMC (%d), "
diff --git a/av1/arg_defs.c b/av1/arg_defs.c index 74e4e5d..b443dcc 100644 --- a/av1/arg_defs.c +++ b/av1/arg_defs.c
@@ -454,12 +454,10 @@ "Enable flexible MV resolution" "(0: false, 1: true (default))"), -#if CONFIG_IMPROVED_CFL .enable_cfl_ds_filter = ARG_DEF(NULL, "enable-adaptive-ds", 1, "Enable adaptive down-sampling filter" "(0: false, 1: filter1, 2: filter 2, 3: filter 3"), -#endif // CONFIG_IMPROVED_CFL .enable_joint_mvd = ARG_DEF(NULL, "enable-joint-mvd", 1, "Enable joint MVD coding"
diff --git a/av1/arg_defs.h b/av1/arg_defs.h index cd41e3e..55e40ac 100644 --- a/av1/arg_defs.h +++ b/av1/arg_defs.h
@@ -175,9 +175,7 @@ arg_def_t enable_ibp; arg_def_t enable_adaptive_mvd; arg_def_t enable_flex_mvres; -#if CONFIG_IMPROVED_CFL arg_def_t enable_cfl_ds_filter; -#endif // CONFIG_IMPROVED_CFL arg_def_t enable_joint_mvd; #if CONFIG_REFINEMV arg_def_t enable_refinemv;
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c index c72af1f..58dac0b 100644 --- a/av1/av1_cx_iface.c +++ b/av1/av1_cx_iface.c
@@ -151,9 +151,7 @@ int enable_adaptive_mvd; // enable adaptive MVD resolution int enable_flex_mvres; // enable flexible MV resolution -#if CONFIG_IMPROVED_CFL int enable_cfl_ds_filter; // enable adaptive downsample filter -#endif // CONFIG_IMPROVED_CFL int enable_joint_mvd; // enable joint MVD coding #if CONFIG_REFINEMV @@ -487,9 +485,7 @@ 1, // enable intra bi-prediction 1, // enable adaptive mvd resolution 1, // enable flexible MV precision -#if CONFIG_IMPROVED_CFL 1, // enable adaptive downsample filter -#endif // CONFIG_IMPROVED_CFL 1, // enable joint mvd coding #if CONFIG_REFINEMV 1, // enable refineMV mode @@ -1012,9 +1008,7 @@ cfg->enable_adaptive_mvd = extra_cfg->enable_adaptive_mvd; cfg->enable_flex_mvres = extra_cfg->enable_flex_mvres; -#if CONFIG_IMPROVED_CFL cfg->enable_cfl_ds_filter = extra_cfg->enable_cfl_ds_filter; -#endif // CONFIG_IMPROVED_CFL cfg->enable_joint_mvd = extra_cfg->enable_joint_mvd; #if CONFIG_REFINEMV @@ -1137,9 +1131,7 @@ extra_cfg->enable_adaptive_mvd = cfg->enable_adaptive_mvd; extra_cfg->enable_flex_mvres = cfg->enable_flex_mvres; -#if CONFIG_IMPROVED_CFL extra_cfg->enable_cfl_ds_filter = cfg->enable_cfl_ds_filter; -#endif // CONFIG_IMPROVED_CFL extra_cfg->enable_joint_mvd = cfg->enable_joint_mvd; @@ -1406,9 +1398,7 @@ tool_cfg->enable_adaptive_mvd = extra_cfg->enable_adaptive_mvd; tool_cfg->enable_flex_mvres = extra_cfg->enable_flex_mvres; -#if CONFIG_IMPROVED_CFL tool_cfg->enable_cfl_ds_filter = extra_cfg->enable_cfl_ds_filter; -#endif // CONFIG_IMPROVED_CFL tool_cfg->enable_joint_mvd = extra_cfg->enable_joint_mvd; #if CONFIG_REFINEMV @@ -3944,12 +3934,9 @@ } else if (arg_match_helper(&arg, &g_av1_codec_arg_defs.enable_flex_mvres, argv, err_string)) { extra_cfg.enable_flex_mvres = arg_parse_int_helper(&arg, err_string); - -#if CONFIG_IMPROVED_CFL } else if (arg_match_helper(&arg, &g_av1_codec_arg_defs.enable_cfl_ds_filter, argv, err_string)) { extra_cfg.enable_cfl_ds_filter = arg_parse_int_helper(&arg, err_string); -#endif // CONFIG_IMPROVED_CFL } else if (arg_match_helper(&arg, &g_av1_codec_arg_defs.enable_joint_mvd, argv, err_string)) { extra_cfg.enable_joint_mvd = arg_parse_int_helper(&arg, err_string); @@ -4446,9 +4433,7 @@ #endif // CONFIG_INTER_DDT 1, // enable_cctx 1, 1, 1, -#if CONFIG_IMPROVED_CFL - 1, -#endif // CONFIG_IMPROVED_CFL + 1, // enable_cfl_ds 1, #if CONFIG_REFINEMV 1,
diff --git a/av1/common/av1_common_int.h b/av1/common/av1_common_int.h index 2065255..3c40465 100644 --- a/av1/common/av1_common_int.h +++ b/av1/common/av1_common_int.h
@@ -498,9 +498,7 @@ uint8_t enable_adaptive_mvd; // enables/disables adaptive MVD resolution uint8_t enable_flex_mvres; // enables/disables flexible MV resolution -#if CONFIG_IMPROVED_CFL uint8_t enable_cfl_ds_filter; // enable/disables adaptive downsampling filter -#endif // CONFIG_IMPROVED_CFL uint8_t enable_joint_mvd; // enables/disables joint MVD coding
diff --git a/av1/common/blockd.h b/av1/common/blockd.h index 62f864a..ae65663 100644 --- a/av1/common/blockd.h +++ b/av1/common/blockd.h
@@ -529,12 +529,10 @@ int8_t cfl_alpha_signs; /*! \brief Chroma from Luma: Index of the alpha Cb and alpha Cr combination */ uint8_t cfl_alpha_idx; -#if CONFIG_IMPROVED_CFL /*! \brief Chroma from Luma: Index of the CfL mode */ uint8_t cfl_idx; /*! \brief The implicitly derived scaling factors*/ int cfl_implicit_alpha[2]; //[u/v] -#endif #if CONFIG_ENABLE_MHCCP /*! \brief The filter direction of multi hypothesis*/ uint8_t mh_dir; @@ -1992,7 +1990,6 @@ uint16_t recon_buf_q3[CFL_BUF_SQUARE]; // Q3 AC contributions (reconstructed luma pixels - tx block avg) int16_t ac_buf_q3[CFL_BUF_SQUARE]; -#if CONFIG_IMPROVED_CFL #if CONFIG_ENABLE_MHCCP // multi-hypothesis cross component prediction reference area uint16_t mhccp_ref_buf_q3[MAX_MB_PLANE][CFL_BUF_SQUARE * 4]; @@ -2003,7 +2000,6 @@ uint16_t recon_yuv_buf_left[MAX_MB_PLANE][CFL_BUF_LINE]; // luma neighboring pixel average uint16_t avg_l; -#endif // Cache the DC_PRED when performing RDO, so it does not have to be recomputed // for every scaling parameter int dc_pred_is_cached[CFL_PRED_PLANES];
diff --git a/av1/common/cfl.c b/av1/common/cfl.c index ea7b07e..6cdb21b 100644 --- a/av1/common/cfl.c +++ b/av1/common/cfl.c
@@ -22,9 +22,7 @@ #include "av1/common/reconinter.h" #endif // CONFIG_E125_MHCCP_SIMPLIFY -#if CONFIG_IMPROVED_CFL #include "av1/common/warped_motion.h" -#endif void cfl_init(CFL_CTX *cfl, const SequenceHeader *seq_params) { assert(block_size_wide[CFL_MAX_BLOCK_SIZE] == CFL_BUF_LINE); @@ -155,20 +153,6 @@ CFL_PREDICT_FN(c, hbd) -#if !CONFIG_IMPROVED_CFL -static void cfl_compute_parameters(MACROBLOCKD *const xd, TX_SIZE tx_size) { - CFL_CTX *const cfl = &xd->cfl; - // Do not call cfl_compute_parameters multiple time on the same values. - assert(cfl->are_parameters_computed == 0); - - cfl_pad(cfl, tx_size_wide[tx_size], tx_size_high[tx_size]); - - cfl_get_subtract_average_fn(tx_size)(cfl->recon_buf_q3, cfl->ac_buf_q3); - cfl->are_parameters_computed = 1; -} -#endif - -#if CONFIG_IMPROVED_CFL // Subtract the average from neighoring pixels static void subtract_average_neighbor(const uint16_t *src, int16_t *dst, int width, int height, int avg) { @@ -255,7 +239,6 @@ uint16_t *input = dst - top_offset * input_stride; for (int i = 0; i < width; i += 2) { const int bot = i + bottom_offset * input_stride; -#if CONFIG_IMPROVED_CFL const int filter_type = cm->seq_params.enable_cfl_ds_filter; if (filter_type == 1) { output_q3[i >> 1] = input[AOMMAX(0, i - 1)] + 2 * input[i] + @@ -276,12 +259,7 @@ output_q3[i >> 1] = (input[i] + input[i + 1] + input[bot] + input[bot + 1]) << 1; } -#else - output_q3[i >> 1] = - (input[i] + input[i + 1] + input[bot] + input[bot + 1]) << 1; -#endif // CONFIG_IMPROVED_CFL } -#if CONFIG_IMPROVED_CFL } else if (sub_x) { uint16_t *input = dst - input_stride; for (int i = 0; i < width; i += 2) { @@ -295,7 +273,6 @@ output_q3[i >> 1] = (input[i] + input[i + 1]) << 2; } } -#endif // CONFIG_IMPROVED_CFL } else if (sub_y) { uint16_t *input = dst - top_offset * input_stride; for (int i = 0; i < width; ++i) { @@ -328,7 +305,6 @@ uint16_t *input = dst - 2; for (int j = 0; j < height; j += 2) { const int bot = input_stride; -#if CONFIG_IMPROVED_CFL const int filter_type = cm->seq_params.enable_cfl_ds_filter; if (filter_type == 1) { output_q3[j >> 1] = input[-1] + 2 * input[0] + input[1] + @@ -341,13 +317,8 @@ output_q3[j >> 1] = (input[0] + input[1] + input[bot] + input[bot + 1]) << 1; } -#else - output_q3[j >> 1] = (input[0] + input[1] + input[bot] + input[bot + 1]) - << 1; -#endif // CONFIG_IMPROVED_CFL input += input_stride * 2; } -#if CONFIG_IMPROVED_CFL } else if (sub_x) { uint16_t *input = dst - 2; for (int j = 0; j < height; ++j) { @@ -361,7 +332,6 @@ } input += input_stride; } -#endif // CONFIG_IMPROVED_CFL } else if (sub_y) { uint16_t *input = dst - 1; for (int j = 0; j < height; ++j) { @@ -628,9 +598,7 @@ mbmi->cfl_implicit_alpha[plane - 1] = derive_linear_parameters_alpha( sum_x, sum_y, sum_xx, sum_xy, count, shift, 0); } -#endif -#if CONFIG_IMPROVED_CFL void cfl_derive_block_implicit_scaling_factor(uint16_t *l, const uint16_t *c, const int width, const int height, const int stride, @@ -652,7 +620,6 @@ *alpha = derive_linear_parameters_alpha(sum_x, sum_y, sum_xx, sum_xy, count, shift, 0); } -#endif // CONFIG_IMPROVED_CFL #if CONFIG_ENABLE_MHCCP void cfl_predict_block(MACROBLOCKD *const xd, uint16_t *dst, int dst_stride, @@ -666,7 +633,6 @@ MB_MODE_INFO *mbmi = xd->mi[0]; assert(is_cfl_allowed(xd)); -#if CONFIG_IMPROVED_CFL cfl_compute_parameters_alt(cfl, tx_size); int alpha_q3; #if CONFIG_ENABLE_MHCCP @@ -701,12 +667,6 @@ } #endif // CONFIG_ENABLE_MHCCP -#else - if (!cfl->are_parameters_computed) cfl_compute_parameters(xd, tx_size); - - const int alpha_q3 = - cfl_idx_to_alpha(mbmi->cfl_alpha_idx, mbmi->cfl_alpha_signs, plane - 1); -#endif assert((tx_size_high[tx_size] - 1) * CFL_BUF_LINE + tx_size_wide[tx_size] <= CFL_BUF_SQUARE); cfl_get_predict_hbd_fn(tx_size)(cfl->ac_buf_q3, dst, dst_stride, alpha_q3, @@ -728,7 +688,6 @@ } } -#if CONFIG_IMPROVED_CFL void cfl_luma_subsampling_420_hbd_colocated(const uint16_t *input, int input_stride, uint16_t *output_q3, int width, @@ -744,6 +703,7 @@ output_q3 += CFL_BUF_LINE; } } + void cfl_luma_subsampling_420_hbd_121_c(const uint16_t *input, int input_stride, uint16_t *output_q3, int width, int height) { @@ -759,7 +719,6 @@ output_q3 += CFL_BUF_LINE; } } -#endif // CONFIG_IMPROVED_CFL static void cfl_luma_subsampling_422_hbd_c(const uint16_t *input, int input_stride, @@ -775,7 +734,6 @@ } } -#if CONFIG_IMPROVED_CFL void cfl_adaptive_luma_subsampling_422_hbd_c(const uint16_t *input, int input_stride, uint16_t *output_q3, int width, @@ -796,7 +754,6 @@ output_q3 += CFL_BUF_LINE; } } -#endif // CONFIG_IMPROVED_CFL static void cfl_luma_subsampling_444_hbd_c(const uint16_t *input, int input_stride, @@ -827,12 +784,7 @@ static void cfl_store(MACROBLOCKD *const xd, CFL_CTX *cfl, const uint16_t *input, int input_stride, int row, int col, - TX_SIZE tx_size -#if CONFIG_IMPROVED_CFL - , - int filter_type -#endif // CONFIG_IMPROVED_CFL -) { + TX_SIZE tx_size, int filter_type) { const int width = tx_size_wide[tx_size]; const int height = tx_size_high[tx_size]; const int tx_off_log2 = MI_SIZE_LOG2; @@ -872,7 +824,6 @@ // Store the input into the CfL pixel buffer uint16_t *recon_buf_q3 = cfl->recon_buf_q3 + (store_row * CFL_BUF_LINE + store_col); -#if CONFIG_IMPROVED_CFL if (sub_x == 1 && sub_y == 0) { cfl_adaptive_luma_subsampling_422_hbd_c(input, input_stride, recon_buf_q3, width, height, filter_type); @@ -927,26 +878,10 @@ recon_buf_q3); #endif // CONFIG_CFL_64x64 } -#else -#if CONFIG_CFL_64x64 - if (AOMMAX(width, height) > 32) - cfl_luma_subsampling_420_hbd_c(input, input_stride, recon_buf_q3, width, - height); - else - cfl_subsampling_hbd(tx_size, sub_x, sub_y)(input, input_stride, - recon_buf_q3); -#else - cfl_subsampling_hbd(tx_size, sub_x, sub_y)(input, input_stride, recon_buf_q3); -#endif // CONFIG_CFL_64x64 -#endif // CONFIG_IMPROVED_CFL } -void cfl_store_tx(MACROBLOCKD *const xd, int row, int col, TX_SIZE tx_size -#if CONFIG_IMPROVED_CFL - , - int filter_type -#endif // CONFIG_IMPROVED_CFL -) { +void cfl_store_tx(MACROBLOCKD *const xd, int row, int col, TX_SIZE tx_size, + int filter_type) { CFL_CTX *const cfl = &xd->cfl; struct macroblockd_plane *const pd = &xd->plane[AOM_PLANE_Y]; uint16_t *dst = &pd->dst.buf[(row * pd->dst.stride + col) << MI_SIZE_LOG2]; @@ -956,13 +891,8 @@ const int row_offset = mi_row - xd->mi[0]->chroma_ref_info.mi_row_chroma_base; const int col_offset = mi_col - xd->mi[0]->chroma_ref_info.mi_col_chroma_base; -#if CONFIG_IMPROVED_CFL cfl_store(xd, cfl, dst, pd->dst.stride, row + row_offset, col + col_offset, tx_size, filter_type); -#else - cfl_store(xd, cfl, dst, pd->dst.stride, row + row_offset, col + col_offset, - tx_size); -#endif // CONFIG_IMPROVED_CFL } #if !CONFIG_EXT_RECUR_PARTITIONS @@ -983,12 +913,8 @@ } #endif // !CONFIG_EXT_RECUR_PARTITIONS -void cfl_store_block(MACROBLOCKD *const xd, BLOCK_SIZE bsize, TX_SIZE tx_size -#if CONFIG_IMPROVED_CFL - , - int filter_type -#endif // CONFIG_IMPROVED_CFL -) { +void cfl_store_block(MACROBLOCKD *const xd, BLOCK_SIZE bsize, TX_SIZE tx_size, + int filter_type) { CFL_CTX *const cfl = &xd->cfl; struct macroblockd_plane *const pd = &xd->plane[AOM_PLANE_Y]; #if CONFIG_EXT_RECUR_PARTITIONS @@ -1009,13 +935,8 @@ tx_size = get_tx_size(width, height); assert(tx_size != TX_INVALID); -#if CONFIG_IMPROVED_CFL cfl_store(xd, cfl, pd->dst.buf, pd->dst.stride, row_offset, col_offset, tx_size, filter_type); -#else - cfl_store(xd, cfl, pd->dst.buf, pd->dst.stride, row_offset, col_offset, - tx_size); -#endif // CONFIG_IMPROVED_CFL } #if CONFIG_ENABLE_MHCCP
diff --git a/av1/common/cfl.h b/av1/common/cfl.h index 22f0364..8fbe9a2 100644 --- a/av1/common/cfl.h +++ b/av1/common/cfl.h
@@ -16,13 +16,8 @@ #include "av1/common/av1_common_int.h" #include "av1/common/blockd.h" -#if CONFIG_IMPROVED_CFL #define CFL_ADD_BITS_ALPHA 5 -#else -#define CFL_ADD_BITS_ALPHA 0 -#endif -#if CONFIG_IMPROVED_CFL || CONFIG_BAWP || CONFIG_MORPH_PRED // Linear modeal Y = alpha * X + beta has been used in a few coding tools. // This function derives parameter alpha. The equation is: // alpha = (sum_xy - sum_x * sum_y / n) / (sum_xx - sum_x * sum_x / n) @@ -53,7 +48,6 @@ const int beta = ((sum_y << shift) - sum_x * alpha) / count; return beta; } -#endif // CONFIG_IMPROVED_CFL || CONFIG_BAWP || CONFIG_MORPH_PRED // Can we use CfL for the current block? static INLINE CFL_ALLOWED_TYPE is_cfl_allowed(const MACROBLOCKD *xd) { @@ -198,21 +192,12 @@ TX_SIZE tx_size, int plane); #endif -void cfl_store_block(MACROBLOCKD *const xd, BLOCK_SIZE bsize, TX_SIZE tx_size -#if CONFIG_IMPROVED_CFL - , - int filter_type -#endif // CONFIG_IMPROVED_CFL -); +void cfl_store_block(MACROBLOCKD *const xd, BLOCK_SIZE bsize, TX_SIZE tx_size, + int filter_type); -void cfl_store_tx(MACROBLOCKD *const xd, int row, int col, TX_SIZE tx_size -#if CONFIG_IMPROVED_CFL - , - int filter_type -#endif // CONFIG_IMPROVED_CFL -); +void cfl_store_tx(MACROBLOCKD *const xd, int row, int col, TX_SIZE tx_size, + int filter_type); -#if CONFIG_IMPROVED_CFL void cfl_luma_subsampling_420_hbd_colocated(const uint16_t *input, int input_stride, uint16_t *output_q3, int width, @@ -222,9 +207,7 @@ int input_stride, uint16_t *output_q3, int width, int height, int filter_type); -#endif // CONFIG_IMPROVED_CFL -#if CONFIG_IMPROVED_CFL // Get neighbor luma reconstruction pixels void cfl_implicit_fetch_neighbor_luma(const AV1_COMMON *cm, MACROBLOCKD *const xd, int row, int col, @@ -244,9 +227,7 @@ // Derive the implicit scaling factor void cfl_derive_implicit_scaling_factor(MACROBLOCKD *const xd, int plane, int row, int col, TX_SIZE tx_size); -#endif -#if CONFIG_IMPROVED_CFL // Derive the implicit scaling factor for the block void cfl_derive_block_implicit_scaling_factor(uint16_t *l, const uint16_t *c, const int width, const int height, @@ -257,7 +238,6 @@ void cfl_luma_subsampling_420_hbd_121_c(const uint16_t *input, int input_stride, uint16_t *output_q3, int width, int height); -#endif // CONFIG_IMPROVED_CFL void cfl_store_dc_pred(MACROBLOCKD *const xd, const uint16_t *input, CFL_PRED_TYPE pred_plane, int width);
diff --git a/av1/common/entropy.c b/av1/common/entropy.c index b9a003b..3715223 100644 --- a/av1/common/entropy.c +++ b/av1/common/entropy.c
@@ -331,13 +331,11 @@ RESET_CDF_COUNTER(fc->dpcm_uv_vert_horz_cdf, 2); #endif // CONFIG_LOSSLESS_DPCM -#if CONFIG_IMPROVED_CFL #if CONFIG_ENABLE_MHCCP RESET_CDF_COUNTER(fc->cfl_index_cdf, CFL_TYPE_COUNT - 1); #else RESET_CDF_COUNTER(fc->cfl_index_cdf, CFL_TYPE_COUNT); #endif // CONFIG_ENABLE_MHCCP -#endif #if CONFIG_ENABLE_MHCCP RESET_CDF_COUNTER(fc->filter_dir_cdf, MHCCP_MODE_NUM); #endif // CONFIG_ENABLE_MHCCP
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c index bbb2868..85617ed 100644 --- a/av1/common/entropymode.c +++ b/av1/common/entropymode.c
@@ -201,7 +201,7 @@ { AOM_CDF2(32283) } } }; #endif // CONFIG_NEW_CONTEXT_MODELING #if CONFIG_ENABLE_MHCCP -#if CONFIG_IMPROVED_CFL + #if CONFIG_ENTROPY_PARA static const aom_cdf_prob default_cfl_index_cdf[CDF_SIZE( CFL_TYPE_COUNT - 1)] = { AOM_CDF3(4124, 16615), 75 }; @@ -210,10 +210,7 @@ AOM_CDF4(18000, 24000, 29000) }; #endif // CONFIG_ENTROPY_PARA -#else -static const aom_cdf_prob default_cfl_index_cdf[CDF_SIZE( - CFL_TYPE_COUNT - 1)] = { AOM_CDF3(16384, 23000) }; -#endif + #else static const aom_cdf_prob default_cfl_index_cdf[CDF_SIZE(CFL_TYPE_COUNT)] = { AOM_CDF2(18000), 0 @@ -4912,7 +4909,7 @@ AOM_CDF8(1418, 2123, 13340, 18405, 26972, 28343, 32294) }; #endif // CONFIG_ENTROPY_PARA -#if CONFIG_IMPROVED_CFL + #if CONFIG_ENTROPY_PARA static const aom_cdf_prob default_cfl_alpha_cdf[CFL_ALPHA_CONTEXTS][CDF_SIZE(CFL_ALPHABET_SIZE)] = { @@ -4934,23 +4931,6 @@ { AOM_CDF8(14990, 22180, 26430, 28600, 29820, 31200, 31980) } }; #endif // CONFIG_ENTROPY_PARA -#else -static const aom_cdf_prob - default_cfl_alpha_cdf[CFL_ALPHA_CONTEXTS][CDF_SIZE(CFL_ALPHABET_SIZE)] = { - { AOM_CDF16(7637, 20719, 31401, 32481, 32657, 32688, 32692, 32696, 32700, - 32704, 32708, 32712, 32716, 32720, 32724) }, - { AOM_CDF16(14365, 23603, 28135, 31168, 32167, 32395, 32487, 32573, 32620, - 32647, 32668, 32672, 32676, 32680, 32684) }, - { AOM_CDF16(11532, 22380, 28445, 31360, 32349, 32523, 32584, 32649, 32673, - 32677, 32681, 32685, 32689, 32693, 32697) }, - { AOM_CDF16(26990, 31402, 32282, 32571, 32692, 32696, 32700, 32704, 32708, - 32712, 32716, 32720, 32724, 32728, 32732) }, - { AOM_CDF16(17248, 26058, 28904, 30608, 31305, 31877, 32126, 32321, 32394, - 32464, 32516, 32560, 32576, 32593, 32622) }, - { AOM_CDF16(14738, 21678, 25779, 27901, 29024, 30302, 30980, 31843, 32144, - 32413, 32520, 32594, 32622, 32656, 32660) } - }; -#endif // CONFIG_IMPROVED_CFL #if CONFIG_ENTROPY_PARA static const aom_cdf_prob @@ -8096,9 +8076,7 @@ av1_copy(fc->dpcm_uv_cdf, default_dpcm_uv_cdf); av1_copy(fc->dpcm_uv_vert_horz_cdf, default_dpcm_uv_vert_horz_cdf); #endif // CONFIG_LOSSLESS_DPCM -#if CONFIG_IMPROVED_CFL av1_copy(fc->cfl_index_cdf, default_cfl_index_cdf); -#endif #if CONFIG_ENABLE_MHCCP av1_copy(fc->filter_dir_cdf, default_filter_dir_cdf); #endif // CONFIG_ENABLE_MHCCP
diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h index 0b3b24d..080f9c1 100644 --- a/av1/common/entropymode.h +++ b/av1/common/entropymode.h
@@ -469,13 +469,11 @@ #endif // CONFIG_LOSSLESS_DPCM aom_cdf_prob fsc_mode_cdf[FSC_MODE_CONTEXTS][FSC_BSIZE_CONTEXTS] [CDF_SIZE(FSC_MODES)]; -#if CONFIG_IMPROVED_CFL #if CONFIG_ENABLE_MHCCP aom_cdf_prob cfl_index_cdf[CDF_SIZE(CFL_TYPE_COUNT - 1)]; #else aom_cdf_prob cfl_index_cdf[CDF_SIZE(CFL_TYPE_COUNT)]; #endif // CONFIG_ENABLE_MHCCP -#endif #if CONFIG_ENABLE_MHCCP aom_cdf_prob filter_dir_cdf[MHCCP_CONTEXT_GROUP_SIZE] [CDF_SIZE(CFL_MULTI_PARAM_V)];
diff --git a/av1/common/enums.h b/av1/common/enums.h index 37efd83..dd50b1b 100644 --- a/av1/common/enums.h +++ b/av1/common/enums.h
@@ -749,11 +749,7 @@ enum { PLANE_TYPE_Y, PLANE_TYPE_UV, PLANE_TYPES } UENUM1BYTE(PLANE_TYPE); -#if CONFIG_IMPROVED_CFL #define CFL_ALPHABET_SIZE_LOG2 3 -#else -#define CFL_ALPHABET_SIZE_LOG2 4 -#endif // CONFIG_IMPROVED_CFL #define CFL_ALPHABET_SIZE (1 << CFL_ALPHABET_SIZE_LOG2) #define CFL_MAGS_SIZE ((2 << CFL_ALPHABET_SIZE_LOG2) + 1) #define CFL_IDX_U(idx) (idx >> CFL_ALPHABET_SIZE_LOG2) @@ -901,7 +897,6 @@ UV_MODE_INVALID, // For uv_mode in inter blocks } UENUM1BYTE(UV_PREDICTION_MODE); -#if CONFIG_IMPROVED_CFL enum { CFL_EXPLICIT, // av1 cfl CFL_DERIVED_ALPHA, // implicit CfL mode with derived scaling factor @@ -911,7 +906,6 @@ #endif // CONFIG_ENABLE_MHCCP CFL_TYPE_COUNT, // CfL mode type count } UENUM1BYTE(CFL_TYPE); -#endif // Number of top model rd to store for pruning y modes in intra mode decision #define TOP_INTRA_MODEL_COUNT 4
diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c index 43ff655..ebb3161 100644 --- a/av1/common/reconintra.c +++ b/av1/common/reconintra.c
@@ -2176,7 +2176,6 @@ if ((h >= *above_lines && w >= *left_lines + width) || (h >= *above_lines + height && w >= *left_lines)) continue; -#if CONFIG_IMPROVED_CFL if (cm->seq_params.enable_cfl_ds_filter == 1) { output_q3[w >> 1] = input[AOMMAX(0, w - 1)] + 2 * input[w] + input[w + 1] + input[bot + AOMMAX(-1, -w)] + @@ -2190,18 +2189,12 @@ (input[w] + input[w + 1] + input[bot] + input[bot + 1] + 2) << 1; } -#else - output_q3[i >> 1] = - (input[i] + input[i + 1] + input[bot] + input[bot + 1] + 2) << 1; -#endif // CONFIG_IMPROVED_CFL } output_q3 += output_stride; input += (input_stride << 1); } - } -#if CONFIG_IMPROVED_CFL - else if (sub_x) { + } else if (sub_x) { for (int h = 0; h < (*ref_height); h++) { for (int i = 0; i < (*ref_width); i += 2) { const int filter_type = cm->seq_params.enable_cfl_ds_filter; @@ -2217,7 +2210,6 @@ output_q3 += output_stride; input += input_stride; } -#endif } else if (sub_y) { for (int h = 0; h < (*ref_height); h += 2) { for (int i = 0; i < (*ref_width); ++i) { @@ -2317,22 +2309,6 @@ assert(block_size_high[plane_bsize] == tx_size_high[tx_size]); } #endif -#if !CONFIG_IMPROVED_CFL - CFL_CTX *const cfl = &xd->cfl; - CFL_PRED_TYPE pred_plane = get_cfl_pred_type(plane); - if (cfl->dc_pred_is_cached[pred_plane] == 0) { - av1_predict_intra_block(cm, xd, pd->width, pd->height, tx_size, mode, - angle_delta, use_palette, filter_intra_mode, dst, - dst_stride, dst, dst_stride, blk_col, blk_row, - plane); - if (cfl->use_dc_pred_cache) { - cfl_store_dc_pred(xd, dst, pred_plane, tx_size_wide[tx_size]); - cfl->dc_pred_is_cached[pred_plane] = 1; - } - } else { - cfl_load_dc_pred(xd, dst, dst_stride, tx_size, pred_plane); - } -#endif if (xd->tree_type == CHROMA_PART) { #if CONFIG_CFL_64x64 const BLOCK_SIZE luma_bsize = mbmi->sb_type[PLANE_TYPE_UV]; @@ -2341,14 +2317,9 @@ const int luma_tx_size = av1_get_max_uv_txsize(mbmi->sb_type[PLANE_TYPE_UV], 0, 0); #endif -#if CONFIG_IMPROVED_CFL cfl_store_tx(xd, blk_row, blk_col, luma_tx_size, cm->seq_params.enable_cfl_ds_filter); -#else - cfl_store_tx(xd, blk_row, blk_col, luma_tx_size); -#endif // CONFIG_IMPROVED_CFL } -#if CONFIG_IMPROVED_CFL CFL_CTX *const cfl = &xd->cfl; CFL_PRED_TYPE pred_plane = get_cfl_pred_type(plane); @@ -2447,7 +2418,6 @@ } #endif // CONFIG_ENABLE_MHCCP } -#endif #if CONFIG_ENABLE_MHCCP cfl_predict_block(xd, dst, dst_stride, tx_size, plane, above_lines > 0, left_lines > 0, above_lines, left_lines);
diff --git a/av1/common/warped_motion.h b/av1/common/warped_motion.h index 36a1cf4..d8fb79d 100644 --- a/av1/common/warped_motion.h +++ b/av1/common/warped_motion.h
@@ -87,7 +87,6 @@ return div_lut[f]; } -#if CONFIG_IMPROVED_CFL || CONFIG_BAWP static INLINE int16_t resolve_divisor_32_CfL(int32_t N, int32_t D, int16_t shift) { int32_t f_n, f_d; @@ -137,7 +136,6 @@ return ret; } } -#endif extern const int16_t av1_warped_filter[WARPEDPIXEL_PREC_SHIFTS * 3 + 1][8];
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c index 1d6c914..ab5317f 100644 --- a/av1/decoder/decodeframe.c +++ b/av1/decoder/decodeframe.c
@@ -375,11 +375,7 @@ if (plane == AOM_PLANE_Y && store_cfl_required(cm, xd) && xd->tree_type == SHARED_PART) { -#if CONFIG_IMPROVED_CFL cfl_store_tx(xd, row, col, tx_size, cm->seq_params.enable_cfl_ds_filter); -#else - cfl_store_tx(xd, row, col, tx_size); -#endif // CONFIG_IMPROVED_CFL } } @@ -1200,12 +1196,8 @@ MACROBLOCKD *const xd) { MB_MODE_INFO *mbmi = xd->mi[0]; if (store_cfl_required(cm, xd) && xd->tree_type == SHARED_PART) { -#if CONFIG_IMPROVED_CFL cfl_store_block(xd, mbmi->sb_type[PLANE_TYPE_Y], mbmi->tx_size, cm->seq_params.enable_cfl_ds_filter); -#else - cfl_store_block(xd, mbmi->sb_type[PLANE_TYPE_Y], mbmi->tx_size); -#endif // CONFIG_IMPROVED_CFL } } @@ -6491,9 +6483,7 @@ seq_params->enable_mvd_sign_derive = aom_rb_read_bit(rb); #endif // CONFIG_DERIVED_MVD_SIGN seq_params->enable_flex_mvres = aom_rb_read_bit(rb); -#if CONFIG_IMPROVED_CFL seq_params->enable_cfl_ds_filter = aom_rb_read_literal(rb, 2); -#endif // CONFIG_IMPROVED_CFL seq_params->enable_parity_hiding = aom_rb_read_bit(rb); #if CONFIG_EXT_RECUR_PARTITIONS
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c index f4ec8ab..c654474 100644 --- a/av1/decoder/decodemv.c +++ b/av1/decoder/decodemv.c
@@ -243,7 +243,6 @@ return fsc_mode; } -#if CONFIG_IMPROVED_CFL static uint8_t read_cfl_index(FRAME_CONTEXT *ec_ctx, aom_reader *r) { #if CONFIG_ENABLE_MHCCP uint8_t cfl_index = aom_read_symbol(r, ec_ctx->cfl_index_cdf, @@ -254,7 +253,6 @@ #endif // CONFIG_ENABLE_MHCCP return cfl_index; } -#endif #if CONFIG_ENABLE_MHCCP // Read multi hypothesis cross component prediction filter direction @@ -2184,7 +2182,6 @@ } #endif // CONFIG_AIMC if (mbmi->uv_mode == UV_CFL_PRED) { -#if CONFIG_IMPROVED_CFL { mbmi->cfl_idx = read_cfl_index(ec_ctx, r); #if CONFIG_ENABLE_MHCCP @@ -2201,7 +2198,6 @@ #endif // CONFIG_ENABLE_MHCCP } if (mbmi->cfl_idx == 0) -#endif mbmi->cfl_alpha_idx = read_cfl_alphas(ec_ctx, r, &mbmi->cfl_alpha_signs); } @@ -2978,7 +2974,6 @@ } #endif // CONFIG_AIMC if (mbmi->uv_mode == UV_CFL_PRED) { -#if CONFIG_IMPROVED_CFL { mbmi->cfl_idx = read_cfl_index(ec_ctx, r); #if CONFIG_ENABLE_MHCCP @@ -2989,9 +2984,7 @@ } #endif // CONFIG_ENABLE_MHCCP } - if (mbmi->cfl_idx == 0) -#endif - { + if (mbmi->cfl_idx == 0) { mbmi->cfl_alpha_idx = read_cfl_alphas(xd->tile_ctx, r, &mbmi->cfl_alpha_signs); }
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c index a775f81..137215a 100644 --- a/av1/encoder/bitstream.c +++ b/av1/encoder/bitstream.c
@@ -1810,7 +1810,6 @@ aom_write_symbol(w, fsc_mode, fsc_cdf, FSC_MODES); } -#if CONFIG_IMPROVED_CFL static AOM_INLINE void write_cfl_index(FRAME_CONTEXT *ec_ctx, uint8_t cfl_index, aom_writer *w) { #if CONFIG_ENABLE_MHCCP @@ -1819,7 +1818,6 @@ aom_write_symbol(w, cfl_index, ec_ctx->cfl_index_cdf, CFL_TYPE_COUNT); #endif // CONFIG_ENABLE_MHCCP } -#endif #if CONFIG_ENABLE_MHCCP // write MHCCP filter direction @@ -2191,7 +2189,6 @@ } #endif // CONFIG_AIMC if (uv_mode == UV_CFL_PRED) { -#if CONFIG_IMPROVED_CFL write_cfl_index(ec_ctx, mbmi->cfl_idx, w); #if CONFIG_ENABLE_MHCCP if (mbmi->cfl_idx == CFL_MULTI_PARAM_V) { @@ -2201,7 +2198,6 @@ } #endif // CONFIG_ENABLE_MHCCP if (mbmi->cfl_idx == 0) -#endif write_cfl_alphas(ec_ctx, mbmi->cfl_alpha_idx, mbmi->cfl_alpha_signs, w); } } @@ -5583,9 +5579,7 @@ aom_wb_write_bit(wb, seq_params->enable_flex_mvres); -#if CONFIG_IMPROVED_CFL aom_wb_write_literal(wb, seq_params->enable_cfl_ds_filter, 2); -#endif // CONFIG_IMPROVED_CFL aom_wb_write_bit(wb, seq_params->enable_parity_hiding); #if CONFIG_EXT_RECUR_PARTITIONS
diff --git a/av1/encoder/block.h b/av1/encoder/block.h index 907c40b..643b4b3 100644 --- a/av1/encoder/block.h +++ b/av1/encoder/block.h
@@ -902,14 +902,12 @@ #endif // CONFIG_IMPROVED_INTRA_DIR_PRED //! Cost of signaling the forward skip coding mode int fsc_cost[FSC_MODE_CONTEXTS][FSC_BSIZE_CONTEXTS][FSC_MODES]; -#if CONFIG_IMPROVED_CFL #if CONFIG_ENABLE_MHCCP //! Cost of signaling the cfl mode int cfl_index_cost[CFL_TYPE_COUNT - 1]; #else int cfl_index_cost[CFL_TYPE_COUNT]; #endif // CONFIG_ENABLE_MHCCP -#endif // CONFIG_IMPROVED_CFL #if CONFIG_ENABLE_MHCCP //! cost of signaling filter direction int filter_dir_cost[MHCCP_CONTEXT_GROUP_SIZE][MHCCP_MODE_NUM];
diff --git a/av1/encoder/encodeframe_utils.c b/av1/encoder/encodeframe_utils.c index 6068c93..0b92f15 100644 --- a/av1/encoder/encodeframe_utils.c +++ b/av1/encoder/encodeframe_utils.c
@@ -843,7 +843,6 @@ UV_INTRA_MODES - 1); #endif // CONFIG_LOSSLESS_DPCM } -#if CONFIG_IMPROVED_CFL if (mbmi->uv_mode == UV_CFL_PRED) { #if CONFIG_ENTROPY_STATS ++counts->cfl_index[mbmi->cfl_idx]; @@ -858,7 +857,6 @@ update_cdf(fc->cfl_index_cdf, mbmi->cfl_idx, CFL_TYPE_COUNT); #endif // CONFIG_ENABLE_MHCCP } -#endif #else update_cdf(fc->uv_mode_cdf[cfl_allowed][y_mode], uv_mode, UV_INTRA_MODES - !cfl_allowed); @@ -1665,7 +1663,6 @@ 2); #endif // CONFIG_LOSSLESS_DPCM -#if CONFIG_IMPROVED_CFL #if CONFIG_ENABLE_MHCCP AVERAGE_CDF(ctx_left->filter_dir_cdf, ctx_tr->filter_dir_cdf, MHCCP_MODE_NUM); AVERAGE_CDF(ctx_left->cfl_index_cdf, ctx_tr->cfl_index_cdf, @@ -1673,7 +1670,6 @@ #else AVERAGE_CDF(ctx_left->cfl_index_cdf, ctx_tr->cfl_index_cdf, CFL_TYPE_COUNT); #endif // CONFIG_ENABLE_MHCCP -#endif #if CONFIG_AIMC AVERAGE_CDF(ctx_left->y_mode_set_cdf, ctx_tr->y_mode_set_cdf, INTRA_MODE_SETS);
diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c index 8d2752d..374c79c 100644 --- a/av1/encoder/encodemb.c +++ b/av1/encoder/encodemb.c
@@ -1519,12 +1519,8 @@ // very expensive. *(args->skip) = 0; if (plane == AOM_PLANE_Y && xd->cfl.store_y && xd->tree_type == SHARED_PART) { -#if CONFIG_IMPROVED_CFL cfl_store_tx(xd, blk_row, blk_col, tx_size, cm->seq_params.enable_cfl_ds_filter); -#else - cfl_store_tx(xd, blk_row, blk_col, tx_size); -#endif // CONFIG_IMPROVED_CFL } }
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c index dc4391d..f23580c 100644 --- a/av1/encoder/encoder.c +++ b/av1/encoder/encoder.c
@@ -463,9 +463,7 @@ seq->enable_ibp = oxcf->intra_mode_cfg.enable_ibp; seq->enable_adaptive_mvd = tool_cfg->enable_adaptive_mvd; seq->enable_flex_mvres = tool_cfg->enable_flex_mvres; -#if CONFIG_IMPROVED_CFL seq->enable_cfl_ds_filter = tool_cfg->enable_cfl_ds_filter; -#endif // CONFIG_CONFIG_IMPROVED_CFL seq->enable_joint_mvd = tool_cfg->enable_joint_mvd; #if CONFIG_REFINEMV seq->enable_refinemv = tool_cfg->enable_refinemv; @@ -1741,7 +1739,6 @@ #endif // CONFIG_MF_HOLE_FILL_ALWAYS_ENABLE } -#if CONFIG_IMPROVED_CFL static void subtract_average_c(uint16_t *src, int16_t *dst, int width, int height, int round_offset, int num_pel_log2) { int sum = round_offset; @@ -1917,7 +1914,6 @@ } } } -#endif // CONFIG_IMPROVED_CFL void av1_set_screen_content_options(AV1_COMP *cpi, FeatureFlags *features) { const AV1_COMMON *const cm = &cpi->common; @@ -3856,11 +3852,9 @@ cpi->is_screen_content_type = features->allow_screen_content_tools; } #endif // CONFIG_IBC_SR_EXT -#if CONFIG_IMPROVED_CFL if (cpi->common.current_frame.frame_type == KEY_FRAME) { av1_set_downsample_filter_options(cpi); } -#endif // CONFIG_IMPROVED_CFL // frame type has been decided outside of this function call cm->cur_frame->frame_type = current_frame->frame_type;
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h index e900823..b7c3b94 100644 --- a/av1/encoder/encoder.h +++ b/av1/encoder/encoder.h
@@ -863,10 +863,8 @@ // Indicates if flexible MV resolution should be enabled. bool enable_flex_mvres; -#if CONFIG_IMPROVED_CFL // Indicates if joint adaptive downsampling filter should be enabled. int enable_cfl_ds_filter; -#endif // CONFIG_IMPROVED_CFL // Indicates if joint mvd coding should be enabled. bool enable_joint_mvd; @@ -1331,9 +1329,7 @@ #else unsigned int mrl_index[MRL_LINE_NUMBER]; #endif // CONFIG_IMPROVED_INTRA_DIR_PRED -#if CONFIG_IMPROVED_CFL unsigned int cfl_index[CFL_TYPE_COUNT]; -#endif #if CONFIG_REFINEMV unsigned int refinemv_flag_cnts[NUM_REFINEMV_CTX] [REFINEMV_NUM_MODES]; // placeholder
diff --git a/av1/encoder/firstpass.c b/av1/encoder/firstpass.c index 59a0548..4681cb1 100644 --- a/av1/encoder/firstpass.c +++ b/av1/encoder/firstpass.c
@@ -1077,11 +1077,9 @@ av1_set_screen_content_options(cpi, features); cpi->is_screen_content_type = features->allow_screen_content_tools; } -#if CONFIG_IMPROVED_CFL if (cpi->common.current_frame.frame_type == KEY_FRAME) { av1_set_downsample_filter_options(cpi); } -#endif // CONFIG_IMPROVED_CFL // First pass coding proceeds in raster scan order with unit size of 16x16. const BLOCK_SIZE fp_block_size = BLOCK_16X16;
diff --git a/av1/encoder/intra_mode_search.c b/av1/encoder/intra_mode_search.c index 41d00f5..dab397f 100644 --- a/av1/encoder/intra_mode_search.c +++ b/av1/encoder/intra_mode_search.c
@@ -677,11 +677,10 @@ mode_rd_info_uv != NULL && !xd->lossless[mbmi->segment_id]; int best_uv_mode_idx = -1; get_uv_intra_mode_set(mbmi); -#if CONFIG_IMPROVED_CFL #if CONFIG_ENABLE_MHCCP - int implicit_cfl_mode_num = CONFIG_IMPROVED_CFL + MHCCP_MODE_NUM; + int implicit_cfl_mode_num = 1 + MHCCP_MODE_NUM; #else - int implicit_cfl_mode_num = CONFIG_IMPROVED_CFL; + int implicit_cfl_mode_num = 1; #endif // CONFIG_ENABLE_MHCCP #if CONFIG_LOSSLESS_DPCM mbmi->use_dpcm_uv = 0; @@ -746,22 +745,6 @@ mbmi->uv_mode_idx = mode_idx - 2; #endif // CONFIG_ENABLE_MHCCP } -#else -#if CONFIG_LOSSLESS_DPCM - mbmi->use_dpcm_uv = 0; - mbmi->dpcm_mode_uv = 0; - int dpcm_uv_loop_num = 1; - if (xd->lossless[mbmi->segment_id]) { - dpcm_uv_loop_num = 2; // dpcm is only applied for lossless mode - } - for (int dpcm_uv_index = 0; dpcm_uv_index < dpcm_uv_loop_num; - ++dpcm_uv_index) { - mbmi->use_dpcm_uv = dpcm_uv_index; -#endif // CONFIG_LOSSLESS_DPCM - for (int mode_idx = 0; mode_idx < UV_INTRA_MODES; ++mode_idx) { - mbmi->uv_mode_idx = mode_idx; - mbmi->uv_mode = mbmi->uv_intra_mode_list[mode_idx]; -#endif if (mbmi->uv_mode == mbmi->mode) mbmi->angle_delta[PLANE_TYPE_UV] = mbmi->angle_delta[PLANE_TYPE_Y]; else @@ -786,8 +769,8 @@ mode_cost += dpcm_uv_dir_cost; } #else // CONFIG_LOSSLESS_DPCM - int mode_cost = get_uv_mode_cost(mbmi, x->mode_costs, is_cfl_allowed(xd), - mbmi->uv_mode_idx); + int mode_cost = get_uv_mode_cost(mbmi, x->mode_costs, is_cfl_allowed(xd), + mbmi->uv_mode_idx); #endif // CONFIG_LOSSLESS_DPCM #else for (int mode_idx = 0; mode_idx < UV_INTRA_MODES; ++mode_idx) { @@ -813,17 +796,12 @@ #if CONFIG_ENABLE_MHCCP int filter_dir_rate = 0; #endif // CONFIG_ENABLE_MHCCP -#if CONFIG_IMPROVED_CFL int cfl_idx_rate = 0; -#endif if (mode == UV_CFL_PRED) { if (!is_cfl_allowed(xd) || !intra_mode_cfg->enable_cfl_intra) continue; const TX_SIZE uv_tx_size = av1_get_tx_size(AOM_PLANE_U, xd); -#if CONFIG_IMPROVED_CFL if (mbmi->cfl_idx == 0) -#endif cfl_alpha_rate = cfl_rd_pick_alpha(x, cpi, uv_tx_size, best_rd); -#if CONFIG_IMPROVED_CFL cfl_idx_rate = x->mode_costs.cfl_index_cost[mbmi->cfl_idx]; #if CONFIG_ENABLE_MHCCP if (mbmi->cfl_idx == CFL_MULTI_PARAM_V) { @@ -832,19 +810,14 @@ x->mode_costs.filter_dir_cost[mh_size_group][mbmi->mh_dir]; } #endif // CONFIG_ENABLE_MHCCP -#endif if (cfl_alpha_rate == INT_MAX) continue; } #if CONFIG_AIMC -#if CONFIG_IMPROVED_CFL #if CONFIG_ENABLE_MHCCP mode_cost += cfl_alpha_rate + cfl_idx_rate + filter_dir_rate; #else mode_cost += cfl_alpha_rate + cfl_idx_rate; #endif // CONFIG_ENABLE_MHCCP -#else - mode_cost += cfl_alpha_rate; -#endif // Check if the reuse is enabled. If enabled, save the mode information // (i.e., rate and distortion) when the mode is evaluated for the first // time, else fetch the mode info saved.
diff --git a/av1/encoder/partition_search.c b/av1/encoder/partition_search.c index cced9b1..928284d 100644 --- a/av1/encoder/partition_search.c +++ b/av1/encoder/partition_search.c
@@ -668,13 +668,8 @@ if (is_inter_block(mbmi, xd->tree_type) && !xd->is_chroma_ref && is_cfl_allowed(xd)) { -#if CONFIG_IMPROVED_CFL cfl_store_block(xd, mbmi->sb_type[xd->tree_type == CHROMA_PART], mbmi->tx_size, cm->seq_params.enable_cfl_ds_filter); -#else - cfl_store_block(xd, mbmi->sb_type[xd->tree_type == CHROMA_PART], - mbmi->tx_size); -#endif // CONFIG_IMPROVED_CFL } if (xd->tree_type == LUMA_PART) { const CommonModeInfoParams *const mi_params = &cm->mi_params;
diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c index 306c66e..80c4eda 100644 --- a/av1/encoder/rd.c +++ b/av1/encoder/rd.c
@@ -257,9 +257,7 @@ } } -#if CONFIG_IMPROVED_CFL av1_cost_tokens_from_cdf(mode_costs->cfl_index_cost, fc->cfl_index_cdf, NULL); -#endif #if CONFIG_AIMC av1_cost_tokens_from_cdf(mode_costs->y_primary_flag_cost, fc->y_mode_set_cdf, NULL);
diff --git a/av1/encoder/tx_search.c b/av1/encoder/tx_search.c index e4f3f20..0125ea5 100644 --- a/av1/encoder/tx_search.c +++ b/av1/encoder/tx_search.c
@@ -4279,12 +4279,8 @@ if (plane == AOM_PLANE_Y && xd->cfl.store_y && xd->tree_type == SHARED_PART) { assert(!is_inter || plane_bsize < BLOCK_8X8); -#if CONFIG_IMPROVED_CFL cfl_store_tx(xd, blk_row, blk_col, tx_size, cm->seq_params.enable_cfl_ds_filter); -#else - cfl_store_tx(xd, blk_row, blk_col, tx_size); -#endif // CONFIG_IMPROVED_CFL } #if CONFIG_RD_DEBUG
diff --git a/common/args.c b/common/args.c index f35e34d..6f5e009 100644 --- a/common/args.c +++ b/common/args.c
@@ -116,9 +116,7 @@ GET_PARAMS(enable_flex_mvres); -#if CONFIG_IMPROVED_CFL GET_PARAMS(enable_cfl_ds_filter); -#endif // CONFIG_IMPROVED_CFL GET_PARAMS(enable_joint_mvd); #if CONFIG_REFINEMV GET_PARAMS(enable_refinemv);
diff --git a/common/av1_config.c b/common/av1_config.c index b2441c3..8f8578c 100644 --- a/common/av1_config.c +++ b/common/av1_config.c
@@ -289,9 +289,7 @@ AV1C_READ_BIT_OR_RETURN_ERROR(enable_mvd_sign_derive); #endif // CONFIG_DERIVED_MVD_SIGN AV1C_READ_BIT_OR_RETURN_ERROR(enable_flex_mvres); -#if CONFIG_IMPROVED_CFL AV1C_READ_BIT_OR_RETURN_ERROR(enable_cfl_ds_filter); -#endif // CONFIG_IMPROVED_CFL AV1C_READ_BIT_OR_RETURN_ERROR(enable_parity_hiding); #if CONFIG_IMPROVED_GLOBAL_MOTION if (!reduced_still_picture_header) {
diff --git a/tools/aom_entropy_optimizer.c b/tools/aom_entropy_optimizer.c index 87721d2..6a9bfb5 100644 --- a/tools/aom_entropy_optimizer.c +++ b/tools/aom_entropy_optimizer.c
@@ -1032,13 +1032,11 @@ 0, &total_count, mem_wanted, "Transforms"); /* Chroma from Luma */ -#if CONFIG_IMPROVED_CFL cts_each_dim[0] = CFL_TYPE_COUNT; optimize_cdf_table(&fc.cfl_index[0], probsfile, 1, cts_each_dim, "static const aom_cdf_prob " "default_cfl_index_cdf[CDF_SIZE(CFL_TYPE_COUNT)]", 0, &total_count, 0, mem_wanted, "Intra"); -#endif cts_each_dim[0] = CFL_JOINT_SIGNS; optimize_cdf_table(&fc.cfl_sign[0], probsfile, 1, cts_each_dim, "static const aom_cdf_prob "