Remove CONFIG_CFL macro
Change-Id: I5c39b364b8614f10658c0adaddbf5628a9f11536
diff --git a/av1/av1.cmake b/av1/av1.cmake
index ae94d82..cc1ad4e 100644
--- a/av1/av1.cmake
+++ b/av1/av1.cmake
@@ -376,28 +376,26 @@
${AOM_AV1_ENCODER_INTRIN_SSE2}
"${AOM_ROOT}/av1/encoder/x86/encodetxb_sse2.c")
-if (CONFIG_CFL)
- set(AOM_AV1_COMMON_SOURCES
- ${AOM_AV1_COMMON_SOURCES}
+set(AOM_AV1_COMMON_SOURCES
+ ${AOM_AV1_COMMON_SOURCES}
"${AOM_ROOT}/av1/common/cfl.c"
"${AOM_ROOT}/av1/common/cfl.h")
- set(AOM_AV1_COMMON_INTRIN_SSE2
- ${AOM_AV1_COMMON_INTRIN_SSE2}
- "${AOM_ROOT}/av1/common/x86/cfl_sse2.c")
+set(AOM_AV1_COMMON_INTRIN_SSE2
+ ${AOM_AV1_COMMON_INTRIN_SSE2}
+ "${AOM_ROOT}/av1/common/x86/cfl_sse2.c")
- set(AOM_AV1_COMMON_INTRIN_SSSE3
+set(AOM_AV1_COMMON_INTRIN_SSSE3
${AOM_AV1_COMMON_INTRIN_SSSE3}
"${AOM_ROOT}/av1/common/x86/cfl_ssse3.c")
- set(AOM_AV1_COMMON_INTRIN_AVX2
+set(AOM_AV1_COMMON_INTRIN_AVX2
${AOM_AV1_COMMON_INTRIN_AVX2}
"${AOM_ROOT}/av1/common/x86/cfl_avx2.c")
- set(AOM_AV1_COMMON_INTRIN_NEON
- ${AOM_AV1_COMMON_INTRIN_NEON}
- "${AOM_ROOT}/av1/common/arm/cfl_neon.c")
-endif ()
+set(AOM_AV1_COMMON_INTRIN_NEON
+ ${AOM_AV1_COMMON_INTRIN_NEON}
+ "${AOM_ROOT}/av1/common/arm/cfl_neon.c")
set(AOM_AV1_COMMON_SOURCES
${AOM_AV1_COMMON_SOURCES}
diff --git a/av1/common/av1_rtcd_defs.pl b/av1/common/av1_rtcd_defs.pl
index a05b1f7..9f46879 100755
--- a/av1/common/av1_rtcd_defs.pl
+++ b/av1/common/av1_rtcd_defs.pl
@@ -36,7 +36,6 @@
union int_mv;
struct yv12_buffer_config;
-#if CONFIG_CFL
/* Function pointers return by CfL functions */
typedef void (*cfl_subsample_lbd_fn)(const uint8_t *input, int input_stride,
int16_t *output_q3);
@@ -53,7 +52,6 @@
typedef void (*cfl_predict_hbd_fn)(const int16_t *pred_buf_q3, uint16_t *dst,
int dst_stride, TX_SIZE tx_size,
int alpha_q3, int bd);
-#endif
EOF
}
forward_decls qw/av1_common_forward_decls/;
@@ -565,18 +563,16 @@
specialize qw/av1_upsample_intra_edge_high sse4_1/;
# CFL
-if (aom_config("CONFIG_CFL") eq "yes") {
- add_proto qw/cfl_subtract_average_fn get_subtract_average_fn/, "TX_SIZE tx_size";
- specialize qw/get_subtract_average_fn sse2 avx2 neon/;
+add_proto qw/cfl_subtract_average_fn get_subtract_average_fn/, "TX_SIZE tx_size";
+specialize qw/get_subtract_average_fn sse2 avx2 neon/;
- add_proto qw/cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd/, "TX_SIZE tx_size";
- specialize qw/cfl_get_luma_subsampling_420_lbd ssse3 avx2/;
+add_proto qw/cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd/, "TX_SIZE tx_size";
+specialize qw/cfl_get_luma_subsampling_420_lbd ssse3 avx2/;
- add_proto qw/cfl_predict_lbd_fn get_predict_lbd_fn/, "TX_SIZE tx_size";
- specialize qw/get_predict_lbd_fn ssse3 avx2/;
+add_proto qw/cfl_predict_lbd_fn get_predict_lbd_fn/, "TX_SIZE tx_size";
+specialize qw/get_predict_lbd_fn ssse3 avx2/;
- add_proto qw/cfl_predict_hbd_fn get_predict_hbd_fn/, "TX_SIZE tx_size";
- specialize qw/get_predict_hbd_fn ssse3 avx2/;
-}
+add_proto qw/cfl_predict_hbd_fn get_predict_hbd_fn/, "TX_SIZE tx_size";
+specialize qw/get_predict_hbd_fn ssse3 avx2/;
1;
diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index f4fb996..0316a3f 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -285,12 +285,10 @@
int num_proj_ref[2];
WarpedMotionParams wm_params[2];
-#if CONFIG_CFL
// Index of the alpha Cb and alpha Cr combination
int cfl_alpha_idx;
// Joint sign of alpha Cb and alpha Cr
int cfl_alpha_signs;
-#endif
#if CONFIG_JNT_COMP
int compound_idx;
@@ -324,9 +322,7 @@
SMOOTH_V_PRED, // UV_SMOOTH_V_PRED
SMOOTH_H_PRED, // UV_SMOOTH_H_PRED
PAETH_PRED, // UV_PAETH_PRED
-#if CONFIG_CFL
DC_PRED, // UV_CFL_PRED
-#endif // CONFIG_CFL
INTRA_INVALID, // UV_INTRA_MODES
INTRA_INVALID, // UV_MODE_INVALID
};
@@ -473,7 +469,6 @@
int xqd[2];
} SgrprojInfo;
-#if CONFIG_CFL
#if CONFIG_DEBUG
#define CFL_SUB8X8_VAL_MI_SIZE (4)
#define CFL_SUB8X8_VAL_MI_SQUARE \
@@ -518,7 +513,6 @@
int is_chroma_reference;
} CFL_CTX;
-#endif // CONFIG_CFL
#if CONFIG_JNT_COMP
typedef struct jnt_comp_params {
@@ -633,9 +627,7 @@
DECLARE_ALIGNED(16, uint8_t, seg_mask[2 * MAX_SB_SQUARE]);
-#if CONFIG_CFL
CFL_CTX cfl;
-#endif
#if CONFIG_JNT_COMP
JNT_COMP_PARAMS jcp_param;
diff --git a/av1/common/entropy.c b/av1/common/entropy.c
index 1e5a91f..d703004 100644
--- a/av1/common/entropy.c
+++ b/av1/common/entropy.c
@@ -688,10 +688,8 @@
AVERAGE_TILE_CDFS(seg.pred_cdf)
AVERAGE_TILE_CDFS(uv_mode_cdf)
-#if CONFIG_CFL
AVERAGE_TILE_CDFS(cfl_sign_cdf)
AVERAGE_TILE_CDFS(cfl_alpha_cdf)
-#endif
AVERAGE_TILE_CDFS(partition_cdf)
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 438d278..5dbb0a7 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -717,12 +717,8 @@
};
static const aom_cdf_prob
-#if CONFIG_CFL
default_uv_mode_cdf[CFL_ALLOWED_TYPES][INTRA_MODES][CDF_SIZE(
UV_INTRA_MODES)] = {
-#else
- default_uv_mode_cdf[INTRA_MODES][CDF_SIZE(UV_INTRA_MODES)] =
-#endif // CONFIG_CFL
{
{ AOM_CDF13(17902, 18828, 21117, 21487, 21924, 22484, 23588, 24669,
25177, 28731, 29903, 31509) },
@@ -750,7 +746,6 @@
23685, 28079, 29091, 32028) },
{ AOM_CDF13(13638, 16789, 19763, 19903, 19995, 20201, 20405, 20861,
21174, 22802, 23566, 24754) },
-#if CONFIG_CFL
},
{
{ AOM_CDF14(18377, 18815, 19743, 20178, 20560, 20889, 21359, 22098,
@@ -780,7 +775,6 @@
{ AOM_CDF14(4015, 6473, 9853, 10285, 10655, 11032, 11431, 12199,
12738, 14760, 16121, 17263, 28612) },
}
-#endif // CONFIG_CFL
};
static const aom_cdf_prob default_partition_cdf[PARTITION_CONTEXTS][CDF_SIZE(
@@ -1035,7 +1029,6 @@
{ AOM_CDF2(1536) } },
};
-#if CONFIG_CFL
static const aom_cdf_prob default_cfl_sign_cdf[CDF_SIZE(CFL_JOINT_SIGNS)] = {
AOM_CDF8(1892, 2229, 11464, 14116, 25661, 26409, 32508)
};
@@ -1055,7 +1048,6 @@
{ AOM_CDF16(15939, 24151, 27754, 29680, 30651, 31267, 31527, 31868, 32001,
32090, 32181, 32284, 32314, 32366, 32486) }
};
-#endif
// TODO(jingning): This initial models are copied directly from the entries
// from the original table. The copied indexes are (0, 0), (0, 1), .. (4, 4).
@@ -1194,10 +1186,8 @@
av1_copy(fc->delta_lf_cdf, default_delta_lf_cdf);
av1_copy(fc->delta_lf_multi_cdf, default_delta_lf_multi_cdf);
#endif
-#if CONFIG_CFL
av1_copy(fc->cfl_sign_cdf, default_cfl_sign_cdf);
av1_copy(fc->cfl_alpha_cdf, default_cfl_alpha_cdf);
-#endif
av1_copy(fc->intrabc_cdf, default_intrabc_cdf);
}
diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h
index b612dce..84fbda7 100644
--- a/av1/common/entropymode.h
+++ b/av1/common/entropymode.h
@@ -152,12 +152,8 @@
aom_cdf_prob wiener_restore_cdf[CDF_SIZE(2)];
aom_cdf_prob sgrproj_restore_cdf[CDF_SIZE(2)];
aom_cdf_prob y_mode_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(INTRA_MODES)];
-#if CONFIG_CFL
aom_cdf_prob uv_mode_cdf[CFL_ALLOWED_TYPES][INTRA_MODES]
[CDF_SIZE(UV_INTRA_MODES)];
-#else
- aom_cdf_prob uv_mode_cdf[INTRA_MODES][CDF_SIZE(UV_INTRA_MODES)];
-#endif
aom_cdf_prob partition_cdf[PARTITION_CONTEXTS][CDF_SIZE(EXT_PARTITION_TYPES)];
aom_cdf_prob switchable_interp_cdf[SWITCHABLE_FILTER_CONTEXTS]
[CDF_SIZE(SWITCHABLE_FILTERS)];
@@ -184,10 +180,8 @@
[CDF_SIZE(TX_TYPES)];
aom_cdf_prob inter_ext_tx_cdf[EXT_TX_SETS_INTER][EXT_TX_SIZES]
[CDF_SIZE(TX_TYPES)];
-#if CONFIG_CFL
aom_cdf_prob cfl_sign_cdf[CDF_SIZE(CFL_JOINT_SIGNS)];
aom_cdf_prob cfl_alpha_cdf[CFL_ALPHA_CONTEXTS][CDF_SIZE(CFL_ALPHABET_SIZE)];
-#endif
} FRAME_CONTEXT;
typedef struct FRAME_COUNTS {
@@ -197,11 +191,7 @@
unsigned int kf_y_mode[KF_MODE_CONTEXTS][KF_MODE_CONTEXTS][INTRA_MODES];
unsigned int angle_delta[DIRECTIONAL_MODES][2 * MAX_ANGLE_DELTA + 1];
unsigned int y_mode[BLOCK_SIZE_GROUPS][INTRA_MODES];
-#if CONFIG_CFL
unsigned int uv_mode[CFL_ALLOWED_TYPES][INTRA_MODES][UV_INTRA_MODES];
-#else
- unsigned int uv_mode[INTRA_MODES][UV_INTRA_MODES];
-#endif // CONFIG_CFL
#endif // CONFIG_ENTROPY_STATS
unsigned int partition[PARTITION_CONTEXTS][EXT_PARTITION_TYPES];
unsigned int switchable_interp[SWITCHABLE_FILTER_CONTEXTS]
diff --git a/av1/common/enums.h b/av1/common/enums.h
index beb6c75..216db7c 100644
--- a/av1/common/enums.h
+++ b/av1/common/enums.h
@@ -354,7 +354,6 @@
PLANE_TYPES
} PLANE_TYPE;
-#if CONFIG_CFL
#define CFL_ALPHABET_SIZE_LOG2 4
#define CFL_ALPHABET_SIZE (1 << CFL_ALPHABET_SIZE_LOG2)
#define CFL_MAGS_SIZE ((2 << CFL_ALPHABET_SIZE_LOG2) + 1)
@@ -394,7 +393,6 @@
// Also, the contexts are symmetric under swapping the planes.
#define CFL_CONTEXT_V(js) \
(CFL_SIGN_V(js) * CFL_SIGNS + CFL_SIGN_U(js) - CFL_SIGNS)
-#endif
typedef enum ATTRIBUTE_PACKED {
PALETTE_MAP,
@@ -474,9 +472,7 @@
UV_SMOOTH_V_PRED, // Vertical interpolation
UV_SMOOTH_H_PRED, // Horizontal interpolation
UV_PAETH_PRED, // Predict from the direction of smallest gradient
-#if CONFIG_CFL
- UV_CFL_PRED, // Chroma-from-Luma
-#endif // CONFIG_CFL
+ UV_CFL_PRED, // Chroma-from-Luma
UV_INTRA_MODES,
UV_MODE_INVALID, // For uv_mode in inter blocks
} UV_PREDICTION_MODE;
diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index c484b73..cd07657 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -741,9 +741,7 @@
return ALIGN_POWER_OF_TWO(cm->mi_rows, cm->seq_params.mib_size_log2);
}
-#if CONFIG_CFL
void cfl_init(CFL_CTX *cfl, AV1_COMMON *cm);
-#endif // CONFIG_CFL
static INLINE int av1_num_planes(const AV1_COMMON *cm) {
return cm->seq_params.monochrome ? 1 : MAX_MB_PLANE;
@@ -779,9 +777,7 @@
xd->above_txfm_context = cm->above_txfm_context;
xd->mi_stride = cm->mi_stride;
xd->error_info = &cm->error;
-#if CONFIG_CFL
cfl_init(&xd->cfl, cm);
-#endif
}
static INLINE void set_skip_context(MACROBLOCKD *xd, int mi_row, int mi_col,
@@ -1118,7 +1114,6 @@
return max_blocks_high >> tx_size_wide_log2[0];
}
-#if CONFIG_CFL
static INLINE int max_intra_block_width(const MACROBLOCKD *xd,
BLOCK_SIZE plane_bsize, int plane,
TX_SIZE tx_size) {
@@ -1134,7 +1129,6 @@
<< tx_size_high_log2[0];
return ALIGN_POWER_OF_TWO(max_blocks_high, tx_size_high_log2[tx_size]);
}
-#endif // CONFIG_CFL
static INLINE void av1_zero_above_context(AV1_COMMON *const cm,
int mi_col_start, int mi_col_end) {
diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c
index fa8530f..5b5bc5b 100644
--- a/av1/common/reconintra.c
+++ b/av1/common/reconintra.c
@@ -21,9 +21,7 @@
#include "aom_ports/system_state.h"
#include "av1/common/reconintra.h"
#include "av1/common/onyxc_int.h"
-#if CONFIG_CFL
#include "av1/common/cfl.h"
-#endif
enum {
NEED_LEFT = 1 << 1,
@@ -1803,7 +1801,6 @@
const PREDICTION_MODE mode =
(plane == AOM_PLANE_Y) ? mbmi->mode : get_uv_mode(mbmi->uv_mode);
-#if CONFIG_CFL
if (plane != AOM_PLANE_Y && mbmi->uv_mode == UV_CFL_PRED) {
#if CONFIG_DEBUG
assert(is_cfl_allowed(mbmi));
@@ -1833,7 +1830,6 @@
cfl_predict_block(xd, dst, dst_stride, tx_size, plane);
return;
}
-#endif
av1_predict_intra_block(cm, xd, pd->width, pd->height, tx_size, mode, dst,
dst_stride, dst, dst_stride, blk_col, blk_row, plane);
}
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 0b4bbc2..0fd7d0a 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -34,6 +34,7 @@
#include "av1/common/alloccommon.h"
#include "av1/common/cdef.h"
+#include "av1/common/cfl.h"
#if CONFIG_INSPECTION
#include "av1/decoder/inspection.h"
#endif
@@ -61,10 +62,6 @@
#define MAX_AV1_HEADER_SIZE 80
#define ACCT_STR __func__
-#if CONFIG_CFL
-#include "av1/common/cfl.h"
-#endif
-
static void loop_restoration_read_sb_coeffs(const AV1_COMMON *const cm,
MACROBLOCKD *xd,
aom_reader *const r, int plane,
@@ -144,11 +141,9 @@
max_scan_line, eob, cm->reduced_tx_set_used);
}
}
-#if CONFIG_CFL
if (plane == AOM_PLANE_Y && xd->cfl.store_y && is_cfl_allowed(mbmi)) {
cfl_store_tx(xd, row, col, tx_size, mbmi->sb_type);
}
-#endif // CONFIG_CFL
}
static void decode_reconstruct_tx(AV1_COMMON *cm, MACROBLOCKD *const xd,
@@ -250,10 +245,8 @@
xd->mi[0]->mbmi.mi_row = mi_row;
xd->mi[0]->mbmi.mi_col = mi_col;
#endif
-#if CONFIG_CFL
xd->cfl.mi_row = mi_row;
xd->cfl.mi_col = mi_col;
-#endif
assert(x_mis && y_mis);
for (int x = 1; x < x_mis; ++x) xd->mi[x] = xd->mi[0];
@@ -318,11 +311,9 @@
set_offsets(cm, xd, bsize, mi_row, mi_col, bw, bh, x_mis, y_mis);
MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;
-#if CONFIG_CFL
CFL_CTX *const cfl = &xd->cfl;
cfl->is_chroma_reference = is_chroma_reference(
mi_row, mi_col, bsize, cfl->subsampling_x, cfl->subsampling_y);
-#endif // CONFIG_CFL
if (cm->delta_q_present_flag) {
for (int i = 0; i < MAX_SEGMENTS; i++) {
@@ -485,14 +476,12 @@
}
}
}
-#if CONFIG_CFL
if (mbmi->uv_mode != UV_CFL_PRED) {
if (!cfl->is_chroma_reference && is_inter_block(mbmi) &&
is_cfl_allowed(mbmi)) {
cfl_store_block(xd, mbmi->sb_type, mbmi->tx_size);
}
}
-#endif // CONFIG_CFL
int reader_corrupted_flag = aom_reader_has_error(r);
aom_merge_corrupted_flag(&xd->corrupted, reader_corrupted_flag);
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 6245816..f03ae7a 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -11,6 +11,7 @@
#include <assert.h>
+#include "av1/common/cfl.h"
#include "av1/common/common.h"
#include "av1/common/entropy.h"
#include "av1/common/entropymode.h"
@@ -27,10 +28,6 @@
#include "aom_dsp/aom_dsp_common.h"
-#if CONFIG_CFL
-#include "av1/common/cfl.h"
-#endif
-
#define ACCT_STR __func__
#define DEC_MISMATCH_DEBUG 0
@@ -139,21 +136,14 @@
static UV_PREDICTION_MODE read_intra_mode_uv(FRAME_CONTEXT *ec_ctx,
aom_reader *r,
-#if CONFIG_CFL
CFL_ALLOWED_TYPE cfl_allowed,
-#endif
PREDICTION_MODE y_mode) {
const UV_PREDICTION_MODE uv_mode =
-#if CONFIG_CFL
aom_read_symbol(r, ec_ctx->uv_mode_cdf[cfl_allowed][y_mode],
UV_INTRA_MODES - !cfl_allowed, ACCT_STR);
-#else
- (UV_PREDICTION_MODE)read_intra_mode(r, ec_ctx->uv_mode_cdf[y_mode]);
-#endif // CONFIG_CFL
return uv_mode;
}
-#if CONFIG_CFL
static int read_cfl_alphas(FRAME_CONTEXT *const ec_ctx, aom_reader *r,
int *signs_out) {
const int joint_sign =
@@ -172,7 +162,6 @@
*signs_out = joint_sign;
return idx;
}
-#endif
static INTERINTRA_MODE read_interintra_mode(MACROBLOCKD *xd, aom_reader *r,
int size_group) {
@@ -855,9 +844,6 @@
xd->plane[1].subsampling_y))
#endif // CONFIG_MONO_VIDEO
{
-#if !CONFIG_CFL
- mbmi->uv_mode = read_intra_mode_uv(ec_ctx, r, mbmi->mode);
-#else
xd->cfl.is_chroma_reference = 1;
mbmi->uv_mode =
read_intra_mode_uv(ec_ctx, r, is_cfl_allowed(mbmi), mbmi->mode);
@@ -867,7 +853,6 @@
} else {
xd->cfl.store_y = 0;
}
-#endif // !CONFIG_CFL
mbmi->angle_delta[PLANE_TYPE_UV] =
(use_angle_delta && av1_is_directional_mode(get_uv_mode(mbmi->uv_mode)))
? read_angle_delta(r,
@@ -876,10 +861,8 @@
} else {
// Avoid decoding angle_info if there is is no chroma prediction
mbmi->uv_mode = UV_DC_PRED;
-#if CONFIG_CFL
xd->cfl.is_chroma_reference = 0;
xd->cfl.store_y = 1;
-#endif
}
if (av1_allow_palette(cm->allow_screen_content_tools, bsize))
@@ -1143,9 +1126,6 @@
xd->plane[1].subsampling_y))
#endif // CONFIG_MONO_VIDEO
{
-#if !CONFIG_CFL
- mbmi->uv_mode = read_intra_mode_uv(ec_ctx, r, mbmi->mode);
-#else
mbmi->uv_mode =
read_intra_mode_uv(ec_ctx, r, is_cfl_allowed(mbmi), mbmi->mode);
if (mbmi->uv_mode == UV_CFL_PRED) {
@@ -1155,7 +1135,6 @@
} else {
xd->cfl.store_y = 0;
}
-#endif // !CONFIG_CFL
mbmi->angle_delta[PLANE_TYPE_UV] =
use_angle_delta && av1_is_directional_mode(get_uv_mode(mbmi->uv_mode))
? read_angle_delta(r,
@@ -1164,10 +1143,8 @@
} else {
// Avoid decoding angle_info if there is is no chroma prediction
mbmi->uv_mode = UV_DC_PRED;
-#if CONFIG_CFL
xd->cfl.is_chroma_reference = 0;
xd->cfl.store_y = 1;
-#endif
}
mbmi->palette_mode_info.palette_size[0] = 0;
diff --git a/av1/decoder/inspection.c b/av1/decoder/inspection.c
index 13bfed0..156d8b2 100644
--- a/av1/decoder/inspection.c
+++ b/av1/decoder/inspection.c
@@ -108,7 +108,6 @@
mi->cdef_strength =
cm->cdef_strengths[mbmi->cdef_strength] % CDEF_SEC_STRENGTHS;
mi->cdef_strength += mi->cdef_strength == 3;
-#if CONFIG_CFL
if (mbmi->uv_mode == UV_CFL_PRED) {
mi->cfl_alpha_idx = mbmi->cfl_alpha_idx;
mi->cfl_alpha_sign = mbmi->cfl_alpha_signs;
@@ -116,7 +115,6 @@
mi->cfl_alpha_idx = 0;
mi->cfl_alpha_sign = 0;
}
-#endif
// delta_q
mi->current_qindex = mbmi->current_q_index;
}
diff --git a/av1/decoder/inspection.h b/av1/decoder/inspection.h
index 8cfd129..bb604f6 100644
--- a/av1/decoder/inspection.h
+++ b/av1/decoder/inspection.h
@@ -47,10 +47,8 @@
int16_t tx_size;
int16_t cdef_level;
int16_t cdef_strength;
-#if CONFIG_CFL
int16_t cfl_alpha_idx;
int16_t cfl_alpha_sign;
-#endif
int16_t current_qindex;
};
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index e039761..857e000 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -25,9 +25,7 @@
#endif // CONFIG_BITSTREAM_DEBUG
#include "av1/common/cdef.h"
-#if CONFIG_CFL
#include "av1/common/cfl.h"
-#endif
#include "av1/common/entropy.h"
#include "av1/common/entropymode.h"
#include "av1/common/entropymv.h"
@@ -894,20 +892,11 @@
static void write_intra_uv_mode(FRAME_CONTEXT *frame_ctx,
UV_PREDICTION_MODE uv_mode,
PREDICTION_MODE y_mode,
-#if CONFIG_CFL
- CFL_ALLOWED_TYPE cfl_allowed,
-#endif
- aom_writer *w) {
-#if CONFIG_CFL
+ CFL_ALLOWED_TYPE cfl_allowed, aom_writer *w) {
aom_write_symbol(w, uv_mode, frame_ctx->uv_mode_cdf[cfl_allowed][y_mode],
UV_INTRA_MODES - !cfl_allowed);
-#else
- uv_mode = get_uv_mode(uv_mode);
- aom_write_symbol(w, uv_mode, frame_ctx->uv_mode_cdf[y_mode], UV_INTRA_MODES);
-#endif
}
-#if CONFIG_CFL
static void write_cfl_alphas(FRAME_CONTEXT *const ec_ctx, int idx,
int joint_sign, aom_writer *w) {
aom_write_symbol(w, joint_sign, ec_ctx->cfl_sign_cdf, CFL_JOINT_SIGNS);
@@ -921,7 +910,6 @@
aom_write_symbol(w, CFL_IDX_V(idx), cdf_v, CFL_ALPHABET_SIZE);
}
}
-#endif
static void write_cdef(AV1_COMMON *cm, aom_writer *w, int skip, int mi_col,
int mi_row) {
@@ -1100,13 +1088,9 @@
is_chroma_reference(mi_row, mi_col, bsize, xd->plane[1].subsampling_x,
xd->plane[1].subsampling_y)) {
const UV_PREDICTION_MODE uv_mode = mbmi->uv_mode;
-#if !CONFIG_CFL
- write_intra_uv_mode(ec_ctx, uv_mode, mode, w);
-#else
write_intra_uv_mode(ec_ctx, uv_mode, mode, is_cfl_allowed(mbmi), w);
if (uv_mode == UV_CFL_PRED)
write_cfl_alphas(ec_ctx, mbmi->cfl_alpha_idx, mbmi->cfl_alpha_signs, w);
-#endif
if (use_angle_delta && av1_is_directional_mode(get_uv_mode(uv_mode))) {
write_angle_delta(w, mbmi->angle_delta[PLANE_TYPE_UV],
ec_ctx->angle_delta_cdf[uv_mode - V_PRED]);
@@ -1394,13 +1378,9 @@
is_chroma_reference(mi_row, mi_col, bsize, xd->plane[1].subsampling_x,
xd->plane[1].subsampling_y)) {
const UV_PREDICTION_MODE uv_mode = mbmi->uv_mode;
-#if !CONFIG_CFL
- write_intra_uv_mode(ec_ctx, uv_mode, mode, w);
-#else
write_intra_uv_mode(ec_ctx, uv_mode, mode, is_cfl_allowed(mbmi), w);
if (uv_mode == UV_CFL_PRED)
write_cfl_alphas(ec_ctx, mbmi->cfl_alpha_idx, mbmi->cfl_alpha_signs, w);
-#endif
if (use_angle_delta && av1_is_directional_mode(get_uv_mode(uv_mode))) {
write_angle_delta(w, mbmi->angle_delta[PLANE_TYPE_UV],
ec_ctx->angle_delta_cdf[uv_mode - V_PRED]);
diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index d5c95de..d27ce14 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -287,11 +287,7 @@
int interintra_mode_cost[BLOCK_SIZE_GROUPS][INTERINTRA_MODES];
int motion_mode_cost[BLOCK_SIZES_ALL][MOTION_MODES];
int motion_mode_cost1[BLOCK_SIZES_ALL][2];
-#if CONFIG_CFL
int intra_uv_mode_cost[CFL_ALLOWED_TYPES][INTRA_MODES][UV_INTRA_MODES];
-#else
- int intra_uv_mode_cost[INTRA_MODES][UV_INTRA_MODES];
-#endif
int y_mode_costs[INTRA_MODES][INTRA_MODES][INTRA_MODES];
int filter_intra_cost[TX_SIZES_ALL][2];
int filter_intra_mode_cost[FILTER_INTRA_MODES];
@@ -305,10 +301,8 @@
[PALETTE_COLORS];
int palette_y_mode_cost[PALATTE_BSIZE_CTXS][PALETTE_Y_MODE_CONTEXTS][2];
int palette_uv_mode_cost[PALETTE_UV_MODE_CONTEXTS][2];
-#if CONFIG_CFL
// The rate associated with each alpha codeword
int cfl_cost[CFL_JOINT_SIGNS][CFL_PRED_PLANES][CFL_ALPHABET_SIZE];
-#endif // CONFIG_CFL
int tx_size_cost[TX_SIZES - 1][TX_SIZE_CONTEXTS][TX_SIZES];
int txfm_partition_cost[TXFM_PARTITION_CONTEXTS][2];
int inter_tx_type_costs[EXT_TX_SETS_INTER][EXT_TX_SIZES][TX_TYPES];
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 6268158..be8bb2a 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -27,9 +27,7 @@
#include "aom_util/debug_util.h"
#endif // CONFIG_MISMATCH_DEBUG
-#if CONFIG_CFL
#include "av1/common/cfl.h"
-#endif
#include "av1/common/common.h"
#include "av1/common/entropy.h"
#include "av1/common/entropymode.h"
@@ -296,10 +294,8 @@
set_offsets_without_segment_id(cpi, tile, x, mi_row, mi_col, bsize);
mbmi = &xd->mi[0]->mbmi;
-#if CONFIG_CFL
xd->cfl.mi_row = mi_row;
xd->cfl.mi_col = mi_col;
-#endif
mbmi->segment_id = 0;
@@ -818,22 +814,13 @@
}
#endif // CONFIG_EXT_INTRA_MOD
#if CONFIG_ENTROPY_STATS
-#if CONFIG_CFL
++counts->uv_mode[is_cfl_allowed(mbmi)][y_mode][uv_mode];
-#else
- ++counts->uv_mode[y_mode][uv_mode];
-#endif // CONFIG_CFL
#endif // CONFIG_ENTROPY_STATS
-#if CONFIG_CFL
if (allow_update_cdf) {
const CFL_ALLOWED_TYPE cfl_allowed = is_cfl_allowed(mbmi);
update_cdf(fc->uv_mode_cdf[cfl_allowed][y_mode], uv_mode,
UV_INTRA_MODES - !cfl_allowed);
}
-#else
- if (allow_update_cdf)
- update_cdf(fc->uv_mode_cdf[y_mode], uv_mode, UV_INTRA_MODES);
-#endif // CONFIG_CFL
}
// TODO(anybody) We can add stats accumulation here to train entropy models for
@@ -2933,10 +2920,7 @@
PALETTE_MODE_INFO *const pmi = &mbmi->palette_mode_info;
// Neither palette mode nor cfl predicted
if (pmi->palette_size[0] == 0 && pmi->palette_size[1] == 0) {
-#if CONFIG_CFL
- if (mbmi->uv_mode != UV_CFL_PRED)
-#endif // CONFIG_CFL
- split_ctx_is_ready[idx] = 1;
+ if (mbmi->uv_mode != UV_CFL_PRED) split_ctx_is_ready[idx] = 1;
}
}
}
@@ -2950,7 +2934,7 @@
dist_8x8 = dist_8x8_yuv(cpi, x, src_plane_8x8, dst_plane_8x8);
#ifdef DEBUG_DIST_8X8
// TODO(anyone): Fix dist-8x8 assert failure here when CFL is enabled
- if (x->tune_metric == AOM_TUNE_PSNR && xd->bd == 8 && !CONFIG_CFL)
+ if (x->tune_metric == AOM_TUNE_PSNR && xd->bd == 8 && 0 /*!CONFIG_CFL*/)
assert(sum_rdc.dist == dist_8x8);
#endif // DEBUG_DIST_8X8
sum_rdc.dist = dist_8x8;
@@ -2997,10 +2981,7 @@
PALETTE_MODE_INFO *const pmi = &mbmi->palette_mode_info;
// Neither palette mode nor cfl predicted
if (pmi->palette_size[0] == 0 && pmi->palette_size[1] == 0) {
-#if CONFIG_CFL
- if (mbmi->uv_mode != UV_CFL_PRED)
-#endif // CONFIG_CFL
- horz_ctx_is_ready = 1;
+ if (mbmi->uv_mode != UV_CFL_PRED) horz_ctx_is_ready = 1;
}
update_state(cpi, tile_data, td, ctx_h, mi_row, mi_col, subsize, 1);
encode_superblock(cpi, tile_data, td, tp, DRY_RUN_NORMAL, mi_row, mi_col,
@@ -3041,7 +3022,7 @@
dist_8x8 = dist_8x8_yuv(cpi, x, src_plane_8x8, dst_plane_8x8);
#ifdef DEBUG_DIST_8X8
// TODO(anyone): Fix dist-8x8 assert failure here when CFL is enabled
- if (x->tune_metric == AOM_TUNE_PSNR && xd->bd == 8 && !CONFIG_CFL)
+ if (x->tune_metric == AOM_TUNE_PSNR && xd->bd == 8 && 0 /*!CONFIG_CFL*/)
assert(sum_rdc.dist == dist_8x8);
#endif // DEBUG_DIST_8X8
sum_rdc.dist = dist_8x8;
@@ -3085,10 +3066,7 @@
PALETTE_MODE_INFO *const pmi = &mbmi->palette_mode_info;
// Neither palette mode nor cfl predicted
if (pmi->palette_size[0] == 0 && pmi->palette_size[1] == 0) {
-#if CONFIG_CFL
- if (mbmi->uv_mode != UV_CFL_PRED)
-#endif // CONFIG_CFL
- vert_ctx_is_ready = 1;
+ if (mbmi->uv_mode != UV_CFL_PRED) vert_ctx_is_ready = 1;
}
update_state(cpi, tile_data, td, &pc_tree->vertical[0], mi_row, mi_col,
subsize, 1);
@@ -3130,7 +3108,8 @@
dist_8x8 = dist_8x8_yuv(cpi, x, src_plane_8x8, dst_plane_8x8);
#ifdef DEBUG_DIST_8X8
// TODO(anyone): Fix dist-8x8 assert failure here when CFL is enabled
- if (x->tune_metric == AOM_TUNE_PSNR && xd->bd == 8 && !CONFIG_CFL)
+ if (x->tune_metric == AOM_TUNE_PSNR && xd->bd == 8 &&
+ 0 /* !CONFIG_CFL */)
assert(sum_rdc.dist == dist_8x8);
#endif // DEBUG_DIST_8X8
sum_rdc.dist = dist_8x8;
@@ -3735,9 +3714,7 @@
this_tile->tctx = *cm->fc;
td->mb.e_mbd.tile_ctx = &this_tile->tctx;
-#if CONFIG_CFL
cfl_init(&td->mb.e_mbd.cfl, cm);
-#endif
#if CONFIG_LOOPFILTERING_ACROSS_TILES
#if CONFIG_LOOPFILTERING_ACROSS_TILES_EXT
@@ -4702,17 +4679,13 @@
const int is_inter = is_inter_block(mbmi);
if (!is_inter) {
-#if CONFIG_CFL
xd->cfl.store_y = 1;
-#endif // CONFIG_CFL
mbmi->skip = 1;
for (int plane = 0; plane < num_planes; ++plane) {
av1_encode_intra_block_plane(cpi, x, bsize, plane, x->optimize, mi_row,
mi_col);
}
-#if CONFIG_CFL
xd->cfl.store_y = 0;
-#endif // CONFIG_CFL
if (av1_allow_palette(cm->allow_screen_content_tools, bsize)) {
for (int plane = 0; plane < AOMMIN(2, num_planes); ++plane) {
if (mbmi->palette_mode_info.palette_size[plane] > 0) {
@@ -4834,7 +4807,6 @@
set_txfm_ctxs(tx_size, xd->n8_w, xd->n8_h,
(mbmi->skip || seg_skip) && is_inter_block(mbmi), xd);
}
-#if CONFIG_CFL
CFL_CTX *const cfl = &xd->cfl;
if (is_inter_block(mbmi) &&
!is_chroma_reference(mi_row, mi_col, bsize, cfl->subsampling_x,
@@ -4842,5 +4814,4 @@
is_cfl_allowed(mbmi)) {
cfl_store_block(xd, mbmi->sb_type, mbmi->tx_size);
}
-#endif // CONFIG_CFL
}
diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index 23b94e0..a7ec79f 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -22,6 +22,7 @@
#include "aom_util/debug_util.h"
#endif // CONFIG_BITSTREAM_DEBUG || CONFIG_MISMATCH_DEBUG
+#include "av1/common/cfl.h"
#include "av1/common/idct.h"
#include "av1/common/reconinter.h"
#include "av1/common/reconintra.h"
@@ -34,10 +35,6 @@
#include "av1/encoder/rd.h"
#include "av1/encoder/rdopt.h"
-#if CONFIG_CFL
-#include "av1/common/cfl.h"
-#endif
-
// Check if one needs to use c version subtraction.
static int check_subtract_block_size(int w, int h) { return w < 4 || h < 4; }
@@ -529,12 +526,10 @@
*(args->skip) = 0;
assert(xd->mi[0]->mbmi.txk_type[av1_get_txk_type_index(
plane_bsize, blk_row, blk_col)] == DCT_DCT);
-#if CONFIG_CFL
if (plane == AOM_PLANE_Y && xd->cfl.store_y &&
is_cfl_allowed(&xd->mi[0]->mbmi)) {
cfl_store_tx(xd, blk_row, blk_col, tx_size, plane_bsize);
}
-#endif // CONFIG_CFL
return;
}
@@ -568,12 +563,10 @@
if (*eob) *(args->skip) = 0;
-#if CONFIG_CFL
if (plane == AOM_PLANE_Y && xd->cfl.store_y &&
is_cfl_allowed(&xd->mi[0]->mbmi)) {
cfl_store_tx(xd, blk_row, blk_col, tx_size, plane_bsize);
}
-#endif // CONFIG_CFL
}
void av1_encode_intra_block_plane(const struct AV1_COMP *cpi, MACROBLOCK *x,
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index 0046fbe..eb0df49 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -331,9 +331,7 @@
int mode_map[BLOCK_SIZES_ALL][MAX_MODES];
int m_search_count;
int ex_search_count;
-#if CONFIG_CFL
CFL_CTX cfl;
-#endif
DECLARE_ALIGNED(16, FRAME_CONTEXT, tctx);
uint8_t allow_update_cdf;
} TileDataEnc;
diff --git a/av1/encoder/firstpass.c b/av1/encoder/firstpass.c
index bb37810..0293a01 100644
--- a/av1/encoder/firstpass.c
+++ b/av1/encoder/firstpass.c
@@ -565,10 +565,8 @@
xd->mi = cm->mi_grid_visible;
xd->mi[0] = cm->mi;
-#if CONFIG_CFL
// Don't store luma on the fist pass since chroma is not computed
xd->cfl.store_y = 0;
-#endif // CONFIG_CFL
av1_frame_init_quantizer(cpi);
for (i = 0; i < num_planes; ++i) {
diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index db3728b..40a7cc0 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -115,16 +115,10 @@
for (i = 0; i < BLOCK_SIZE_GROUPS; ++i)
av1_cost_tokens_from_cdf(x->mbmode_cost[i], fc->y_mode_cdf[i], NULL);
-#if CONFIG_CFL
for (i = 0; i < CFL_ALLOWED_TYPES; ++i)
for (j = 0; j < INTRA_MODES; ++j)
av1_cost_tokens_from_cdf(x->intra_uv_mode_cost[i][j],
fc->uv_mode_cdf[i][j], NULL);
-#else
- for (i = 0; i < INTRA_MODES; ++i)
- av1_cost_tokens_from_cdf(x->intra_uv_mode_cost[i], fc->uv_mode_cdf[i],
- NULL);
-#endif
av1_cost_tokens_from_cdf(x->filter_intra_mode_cost, fc->filter_intra_mode_cdf,
NULL);
@@ -161,7 +155,6 @@
}
}
-#if CONFIG_CFL
int sign_cost[CFL_JOINT_SIGNS];
av1_cost_tokens_from_cdf(sign_cost, fc->cfl_sign_cdf, NULL);
for (int joint_sign = 0; joint_sign < CFL_JOINT_SIGNS; joint_sign++) {
@@ -182,7 +175,6 @@
for (int u = 0; u < CFL_ALPHABET_SIZE; u++)
cost_u[u] += sign_cost[joint_sign];
}
-#endif // CONFIG_CFL
for (i = 0; i < MAX_TX_CATS; ++i)
for (j = 0; j < TX_SIZE_CONTEXTS; ++j)
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 0d98eb3..52c73ea 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -22,9 +22,7 @@
#include "aom_ports/mem.h"
#include "aom_ports/system_state.h"
-#if CONFIG_CFL
#include "av1/common/cfl.h"
-#endif
#include "av1/common/common.h"
#include "av1/common/common_data.h"
#include "av1/common/entropy.h"
@@ -334,16 +332,12 @@
D67_PRED, D113_PRED, D45_PRED,
};
-#if CONFIG_CFL
static const UV_PREDICTION_MODE uv_rd_search_mode_order[UV_INTRA_MODES] = {
UV_DC_PRED, UV_CFL_PRED, UV_H_PRED, UV_V_PRED,
UV_SMOOTH_PRED, UV_PAETH_PRED, UV_SMOOTH_V_PRED, UV_SMOOTH_H_PRED,
UV_D135_PRED, UV_D203_PRED, UV_D157_PRED, UV_D67_PRED,
UV_D113_PRED, UV_D45_PRED,
};
-#else
-#define uv_rd_search_mode_order intra_rd_search_mode_order
-#endif // CONFIG_CFL
static INLINE int write_uniform_cost(int n, int v) {
const int l = get_unsigned_bits(n);
@@ -2024,12 +2018,10 @@
a, l, 0, args->use_fast_coef_costing, INT64_MAX,
&this_rd_stats);
-#if CONFIG_CFL
if (plane == AOM_PLANE_Y && xd->cfl.store_y && is_cfl_allowed(mbmi)) {
assert(!is_inter_block(mbmi) || plane_bsize < BLOCK_8X8);
cfl_store_tx(xd, blk_row, blk_col, tx_size, plane_bsize);
}
-#endif // CONFIG_CFL
#if CONFIG_RD_DEBUG
av1_update_txb_coeff_cost(&this_rd_stats, plane, tx_size, blk_row, blk_col,
@@ -4804,7 +4796,6 @@
return rd_stats->rate != INT_MAX;
}
-#if CONFIG_CFL
#define PLANE_SIGN_TO_JOINT_SIGN(plane, a, b) \
(plane == CFL_PRED_U ? a * CFL_SIGNS + b - 1 : b * CFL_SIGNS + a - 1)
static int cfl_rd_pick_alpha(MACROBLOCK *const x, const AV1_COMP *const cpi,
@@ -4823,7 +4814,7 @@
assert(block_size_wide[plane_bsize] == tx_size_wide[tx_size]);
assert(block_size_high[plane_bsize] == tx_size_high[tx_size]);
}
-#endif
+#endif // CONFIG_DEBUG
xd->cfl.use_dc_pred_cache = 1;
const int64_t mode_rd =
@@ -4927,7 +4918,6 @@
xd->cfl.dc_pred_is_cached[1] = 0;
return best_rate_overhead;
}
-#endif // CONFIG_CFL
static void init_sbuv_mode(MB_MODE_INFO *const mbmi) {
mbmi->uv_mode = UV_DC_PRED;
@@ -4954,7 +4944,6 @@
continue;
mbmi->uv_mode = mode;
-#if CONFIG_CFL
int cfl_alpha_rate = 0;
if (mode == UV_CFL_PRED) {
if (!is_cfl_allowed(mbmi)) continue;
@@ -4963,19 +4952,14 @@
cfl_alpha_rate = cfl_rd_pick_alpha(x, cpi, uv_tx_size, best_rd);
if (cfl_alpha_rate == INT_MAX) continue;
}
-#endif
mbmi->angle_delta[PLANE_TYPE_UV] = 0;
if (is_directional_mode && av1_use_angle_delta(mbmi->sb_type)) {
-#if CONFIG_CFL
const int rate_overhead =
x->intra_uv_mode_cost[is_cfl_allowed(mbmi)][mbmi->mode][mode] +
-#else
- const int rate_overhead = x->intra_uv_mode_cost[mbmi->mode][mode] +
-#endif // CONFIG_CFL
#if CONFIG_EXT_INTRA_MOD
0;
#else
- write_uniform_cost(2 * MAX_ANGLE_DELTA + 1, 0);
+ write_uniform_cost(2 * MAX_ANGLE_DELTA + 1, 0);
#endif // CONFIG_EXT_INTRA_MOD
if (!rd_pick_intra_angle_sbuv(cpi, x, bsize, rate_overhead, best_rd,
&this_rate, &tokenonly_rd_stats))
@@ -4986,15 +4970,10 @@
}
}
const int mode_cost =
-#if CONFIG_CFL
x->intra_uv_mode_cost[is_cfl_allowed(mbmi)][mbmi->mode][mode] +
cfl_alpha_rate;
-#else
- x->intra_uv_mode_cost[mbmi->mode][mode];
-#endif
this_rate = tokenonly_rd_stats.rate +
intra_mode_info_cost_uv(cpi, x, mbmi, bsize, mode_cost);
-#if CONFIG_CFL
if (mode == UV_CFL_PRED) {
assert(is_cfl_allowed(mbmi));
#if CONFIG_DEBUG
@@ -5002,7 +4981,6 @@
assert(xd->cfl.rate == tokenonly_rd_stats.rate + mode_cost);
#endif // CONFIG_DEBUG
}
-#endif
this_rd = RDCOST(x->rdmult, this_rate, tokenonly_rd_stats.dist);
if (this_rd < best_rd) {
@@ -5021,11 +4999,7 @@
uint8_t *best_palette_color_map = x->palette_buffer->best_palette_color_map;
rd_pick_palette_intra_sbuv(
cpi, x,
-#if CONFIG_CFL
x->intra_uv_mode_cost[is_cfl_allowed(mbmi)][mbmi->mode][UV_DC_PRED],
-#else
- x->intra_uv_mode_cost[mbmi->mode][UV_DC_PRED],
-#endif
best_palette_color_map, &best_mbmi, &best_rd, rate, rate_tokenonly,
distortion, skippable);
}
@@ -5056,7 +5030,6 @@
}
bsize = scale_chroma_bsize(bsize, xd->plane[AOM_PLANE_U].subsampling_x,
xd->plane[AOM_PLANE_U].subsampling_y);
-#if CONFIG_CFL
// Only store reconstructed luma when there's chroma RDO. When there's no
// chroma RDO, the reconstructed luma will be stored in encode_superblock().
xd->cfl.store_y = !x->skip_chroma_rd;
@@ -5069,7 +5042,6 @@
cpi->sf.use_fast_coef_costing);
xd->cfl.store_y = 0;
}
-#endif // CONFIG_CFL
rd_pick_intra_sbuv_mode(cpi, x, rate_uv, rate_uv_tokenonly, dist_uv, skip_uv,
bsize, max_tx_size);
*mode_uv = mbmi->uv_mode;
@@ -8216,7 +8188,6 @@
&y_skip, bsize, best_rd, ctx);
if (intra_yrd < best_rd) {
-#if CONFIG_CFL
// Only store reconstructed luma when there's chroma RDO. When there's no
// chroma RDO, the reconstructed luma will be stored in encode_superblock().
xd->cfl.store_y = !x->skip_chroma_rd;
@@ -8229,7 +8200,6 @@
mi_row, mi_col);
xd->cfl.store_y = 0;
}
-#endif // CONFIG_CFL
if (num_planes > 1) {
max_uv_tx_size = av1_get_tx_size(AOM_PLANE_U, xd);
init_sbuv_mode(mbmi);
@@ -9177,12 +9147,8 @@
}
if (num_planes > 1 && !x->skip_chroma_rd) {
const int uv_mode_cost =
-#if CONFIG_CFL
x->intra_uv_mode_cost[is_cfl_allowed(mbmi)][mbmi->mode]
[mbmi->uv_mode];
-#else
- x->intra_uv_mode_cost[mbmi->mode][mbmi->uv_mode];
-#endif
rate2 += rate_uv +
intra_mode_info_cost_uv(cpi, x, mbmi, bsize, uv_mode_cost);
}
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 59eadeb..8709baa 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -183,23 +183,11 @@
sf->recode_loop = ALLOW_RECODE_KFARFGF;
sf->intra_y_mode_mask[TX_64X64] = INTRA_DC_H_V;
-#if CONFIG_CFL
sf->intra_uv_mode_mask[TX_64X64] = UV_INTRA_DC_H_V_CFL;
-#else
- sf->intra_uv_mode_mask[TX_64X64] = INTRA_DC_H_V;
-#endif // CONFIG_CFL
sf->intra_y_mode_mask[TX_32X32] = INTRA_DC_H_V;
-#if CONFIG_CFL
sf->intra_uv_mode_mask[TX_32X32] = UV_INTRA_DC_H_V_CFL;
-#else
- sf->intra_uv_mode_mask[TX_32X32] = INTRA_DC_H_V;
-#endif
sf->intra_y_mode_mask[TX_16X16] = INTRA_DC_H_V;
-#if CONFIG_CFL
sf->intra_uv_mode_mask[TX_16X16] = UV_INTRA_DC_H_V_CFL;
-#else
- sf->intra_uv_mode_mask[TX_16X16] = INTRA_DC_H_V;
-#endif
sf->tx_size_search_breakout = 1;
sf->partition_search_breakout_rate_thr = 80;
@@ -245,17 +233,9 @@
sf->adaptive_rd_thresh = 3;
sf->mode_skip_start = 6;
sf->intra_y_mode_mask[TX_64X64] = INTRA_DC;
-#if CONFIG_CFL
sf->intra_uv_mode_mask[TX_64X64] = UV_INTRA_DC_CFL;
-#else
- sf->intra_uv_mode_mask[TX_64X64] = INTRA_DC;
-#endif // CONFIG_CFL
sf->intra_y_mode_mask[TX_32X32] = INTRA_DC;
-#if CONFIG_CFL
sf->intra_uv_mode_mask[TX_32X32] = UV_INTRA_DC_CFL;
-#else
- sf->intra_uv_mode_mask[TX_32X32] = INTRA_DC;
-#endif // CONFIG_CFL
sf->adaptive_interp_filter_search = 1;
}
@@ -280,11 +260,7 @@
sf->disable_filter_search_var_thresh = 500;
for (i = 0; i < TX_SIZES; ++i) {
sf->intra_y_mode_mask[i] = INTRA_DC;
-#if CONFIG_CFL
sf->intra_uv_mode_mask[i] = UV_INTRA_DC_CFL;
-#else
- sf->intra_uv_mode_mask[i] = INTRA_DC;
-#endif // CONFIG_CFL
}
sf->partition_search_breakout_rate_thr = 500;
sf->mv.reduce_first_step_size = 1;
@@ -473,11 +449,7 @@
for (i = 0; i < TX_SIZES; i++) {
sf->intra_y_mode_mask[i] = INTRA_ALL;
-#if CONFIG_CFL
sf->intra_uv_mode_mask[i] = UV_INTRA_ALL;
-#else
- sf->intra_uv_mode_mask[i] = INTRA_ALL;
-#endif // CONFIG_CFL
}
sf->use_rd_breakout = 0;
sf->lpf_pick = LPF_PICK_FROM_FULL_IMAGE;
diff --git a/av1/encoder/speed_features.h b/av1/encoder/speed_features.h
index b779cc2..87c4337 100644
--- a/av1/encoder/speed_features.h
+++ b/av1/encoder/speed_features.h
@@ -23,7 +23,6 @@
(1 << D135_PRED) | (1 << D113_PRED) | (1 << D157_PRED) |
(1 << D203_PRED) | (1 << D67_PRED) | (1 << SMOOTH_PRED) |
(1 << SMOOTH_V_PRED) | (1 << SMOOTH_H_PRED) | (1 << PAETH_PRED),
-#if CONFIG_CFL
UV_INTRA_ALL =
(1 << UV_DC_PRED) | (1 << UV_V_PRED) | (1 << UV_H_PRED) |
(1 << UV_D45_PRED) | (1 << UV_D135_PRED) | (1 << UV_D113_PRED) |
@@ -43,7 +42,6 @@
UV_INTRA_DC_PAETH_H_V_CFL = (1 << UV_DC_PRED) | (1 << UV_PAETH_PRED) |
(1 << UV_V_PRED) | (1 << UV_H_PRED) |
(1 << UV_CFL_PRED),
-#endif // CONFIG_CFL
INTRA_DC = (1 << DC_PRED),
INTRA_DC_TM = (1 << DC_PRED) | (1 << PAETH_PRED),
INTRA_DC_H_V = (1 << DC_PRED) | (1 << V_PRED) | (1 << H_PRED),
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index b74b4cb..c23621e 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -91,7 +91,6 @@
set(CONFIG_AMVR 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_AOM_QM_EXT 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_CDF_UPDATE_MODE 1 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_CFL 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DEPENDENT_HORZTILEGROUPS 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DEPENDENT_HORZTILES 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_DIST_8X8 1 CACHE NUMBER "AV1 experiment flag.")
diff --git a/examples/inspect.c b/examples/inspect.c
index 8e4cb14..a9119a2 100644
--- a/examples/inspect.c
+++ b/examples/inspect.c
@@ -90,10 +90,8 @@
static const arg_def_t dump_filter_arg =
ARG_DEF("f", "filter", 0, "Dump Filter");
static const arg_def_t dump_cdef_arg = ARG_DEF("c", "cdef", 0, "Dump CDEF");
-#if CONFIG_CFL
static const arg_def_t dump_cfl_arg =
ARG_DEF("cfl", "chroma_from_luma", 0, "Dump Chroma from Luma Alphas");
-#endif
static const arg_def_t dump_dual_filter_type_arg =
ARG_DEF("df", "dualFilterType", 0, "Dump Dual Filter Type");
static const arg_def_t dump_reference_frame_arg =
@@ -119,9 +117,7 @@
&dump_filter_arg,
&dump_cdef_arg,
&dump_dual_filter_type_arg,
-#if CONFIG_CFL
&dump_cfl_arg,
-#endif
&dump_reference_frame_arg,
&dump_motion_vectors_arg,
&dump_delta_q_arg,
@@ -200,7 +196,6 @@
ENUM(NEW_NEWMV), ENUM(INTRA_INVALID), LAST_ENUM
};
-#if CONFIG_CFL
const map_entry uv_prediction_mode_map[] = {
ENUM(UV_DC_PRED), ENUM(UV_V_PRED),
ENUM(UV_H_PRED), ENUM(UV_D45_PRED),
@@ -208,15 +203,9 @@
ENUM(UV_D157_PRED), ENUM(UV_D203_PRED),
ENUM(UV_D67_PRED), ENUM(UV_SMOOTH_PRED),
ENUM(UV_SMOOTH_V_PRED), ENUM(UV_SMOOTH_H_PRED),
- ENUM(UV_PAETH_PRED),
-#if CONFIG_CFL
- ENUM(UV_CFL_PRED),
-#endif
+ ENUM(UV_PAETH_PRED), ENUM(UV_CFL_PRED),
ENUM(UV_MODE_INVALID), LAST_ENUM
};
-#else
-#define uv_prediction_mode_map prediction_mode_map
-#endif
#define NO_SKIP 0
#define SKIP 1
@@ -551,14 +540,12 @@
buf += put_block_info(buf, NULL, "cdef_strength",
offsetof(insp_mi_data, cdef_strength), 0);
}
-#if CONFIG_CFL
if (layers & CFL_LAYER) {
buf += put_block_info(buf, NULL, "cfl_alpha_idx",
offsetof(insp_mi_data, cfl_alpha_idx), 0);
buf += put_block_info(buf, NULL, "cfl_alpha_sign",
offsetof(insp_mi_data, cfl_alpha_sign), 0);
}
-#endif
if (layers & Q_INDEX_LAYER) {
buf += put_block_info(buf, NULL, "delta_q",
offsetof(insp_mi_data, current_qindex), 0);
@@ -709,10 +696,8 @@
layers |= FILTER_LAYER;
else if (arg_match(&arg, &dump_cdef_arg, argi))
layers |= CDEF_LAYER;
-#if CONFIG_CFL
else if (arg_match(&arg, &dump_cfl_arg, argi))
layers |= CFL_LAYER;
-#endif
else if (arg_match(&arg, &dump_reference_frame_arg, argi))
layers |= REFERENCE_FRAME_LAYER;
else if (arg_match(&arg, &dump_motion_vectors_arg, argi))
diff --git a/test/test.cmake b/test/test.cmake
index 8a4bccc..9fff7b7 100644
--- a/test/test.cmake
+++ b/test/test.cmake
@@ -148,11 +148,9 @@
"${AOM_ROOT}/test/filterintra_test.cc")
endif ()
- if (CONFIG_CFL)
- set(AOM_UNIT_TEST_COMMON_SOURCES
+ set(AOM_UNIT_TEST_COMMON_SOURCES
${AOM_UNIT_TEST_COMMON_SOURCES}
"${AOM_ROOT}/test/cfl_test.cc")
- endif ()
set(AOM_UNIT_TEST_COMMON_SOURCES
${AOM_UNIT_TEST_COMMON_SOURCES}
diff --git a/tools/aom_entropy_optimizer.c b/tools/aom_entropy_optimizer.c
index 03579a1..60ce896 100644
--- a/tools/aom_entropy_optimizer.c
+++ b/tools/aom_entropy_optimizer.c
@@ -299,8 +299,7 @@
"static const aom_cdf_prob\n"
"default_if_y_mode_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(INTRA_MODES)]");
-/* Intra mode (chroma) */
-#if CONFIG_CFL
+ /* Intra mode (chroma) */
cts_each_dim[0] = CFL_ALLOWED_TYPES;
cts_each_dim[1] = INTRA_MODES;
cts_each_dim[2] = UV_INTRA_MODES;
@@ -308,14 +307,6 @@
"static const aom_cdf_prob\n"
"default_uv_mode_cdf[CFL_ALLOWED_TYPES][INTRA_MODES]"
"[CDF_SIZE(UV_INTRA_MODES)]");
-#else
- cts_each_dim[0] = INTRA_MODES;
- cts_each_dim[1] = UV_INTRA_MODES;
- optimize_cdf_table(
- &fc.uv_mode[0][0], probsfile, 2, cts_each_dim,
- "static const aom_cdf_prob\n"
- "default_uv_mode_cdf[INTRA_MODES][CDF_SIZE(UV_INTRA_MODES)]");
-#endif
/* Partition */
cts_each_dim[0] = PARTITION_CONTEXTS;
