Commit 670b660d authored by Yue Chen's avatar Yue Chen

Remove CONFIG_INTERINTRA

Change-Id: Icbedc16b01adf9b48f0f357ec89143462865d54e
parent c5252a69
...@@ -334,10 +334,8 @@ typedef struct MB_MODE_INFO { ...@@ -334,10 +334,8 @@ typedef struct MB_MODE_INFO {
int8_t angle_delta[2]; int8_t angle_delta[2];
#endif // CONFIG_EXT_INTRA #endif // CONFIG_EXT_INTRA
#if CONFIG_INTERINTRA
// interintra members // interintra members
INTERINTRA_MODE interintra_mode; INTERINTRA_MODE interintra_mode;
#endif
// TODO(debargha): Consolidate these flags // TODO(debargha): Consolidate these flags
int use_wedge_interintra; int use_wedge_interintra;
int interintra_wedge_index; int interintra_wedge_index;
...@@ -1288,30 +1286,15 @@ void av1_set_contexts(const MACROBLOCKD *xd, struct macroblockd_plane *pd, ...@@ -1288,30 +1286,15 @@ void av1_set_contexts(const MACROBLOCKD *xd, struct macroblockd_plane *pd,
int loff); int loff);
static INLINE int is_interintra_allowed_bsize(const BLOCK_SIZE bsize) { static INLINE int is_interintra_allowed_bsize(const BLOCK_SIZE bsize) {
#if CONFIG_INTERINTRA
return (bsize >= BLOCK_8X8) && (bsize <= BLOCK_32X32); return (bsize >= BLOCK_8X8) && (bsize <= BLOCK_32X32);
#else
(void)bsize;
return 0;
#endif // CONFIG_INTERINTRA
} }
static INLINE int is_interintra_allowed_mode(const PREDICTION_MODE mode) { static INLINE int is_interintra_allowed_mode(const PREDICTION_MODE mode) {
#if CONFIG_INTERINTRA
return (mode >= NEARESTMV) && (mode <= NEWMV); return (mode >= NEARESTMV) && (mode <= NEWMV);
#else
(void)mode;
return 0;
#endif // CONFIG_INTERINTRA
} }
static INLINE int is_interintra_allowed_ref(const MV_REFERENCE_FRAME rf[2]) { static INLINE int is_interintra_allowed_ref(const MV_REFERENCE_FRAME rf[2]) {
#if CONFIG_INTERINTRA
return (rf[0] > INTRA_FRAME) && (rf[1] <= INTRA_FRAME); return (rf[0] > INTRA_FRAME) && (rf[1] <= INTRA_FRAME);
#else
(void)rf;
return 0;
#endif // CONFIG_INTERINTRA
} }
static INLINE int is_interintra_allowed(const MB_MODE_INFO *mbmi) { static INLINE int is_interintra_allowed(const MB_MODE_INFO *mbmi) {
......
...@@ -2365,13 +2365,11 @@ void av1_average_tile_inter_cdfs(AV1_COMMON *cm, FRAME_CONTEXT *fc, ...@@ -2365,13 +2365,11 @@ void av1_average_tile_inter_cdfs(AV1_COMMON *cm, FRAME_CONTEXT *fc,
AVERAGE_TILE_CDFS(inter_singleref_comp_mode_cdf) AVERAGE_TILE_CDFS(inter_singleref_comp_mode_cdf)
#endif #endif
#if CONFIG_INTERINTRA
#if CONFIG_NEW_MULTISYMBOL #if CONFIG_NEW_MULTISYMBOL
AVERAGE_TILE_CDFS(interintra_cdf) AVERAGE_TILE_CDFS(interintra_cdf)
AVERAGE_TILE_CDFS(wedge_interintra_cdf) AVERAGE_TILE_CDFS(wedge_interintra_cdf)
#endif #endif
AVERAGE_TILE_CDFS(interintra_mode_cdf) AVERAGE_TILE_CDFS(interintra_mode_cdf)
#endif
/* NB: kf_y_cdf is discarded after use, so no need /* NB: kf_y_cdf is discarded after use, so no need
for backwards update */ for backwards update */
......
...@@ -753,7 +753,6 @@ static const aom_cdf_prob ...@@ -753,7 +753,6 @@ static const aom_cdf_prob
#endif #endif
}; };
#if CONFIG_INTERINTRA
static const aom_prob default_interintra_prob[BLOCK_SIZE_GROUPS] = { static const aom_prob default_interintra_prob[BLOCK_SIZE_GROUPS] = {
128, 226, 244, 254, 128, 226, 244, 254,
}; };
...@@ -830,8 +829,6 @@ static const aom_cdf_prob ...@@ -830,8 +829,6 @@ static const aom_cdf_prob
}; };
#endif // CONFIG_NEW_MULTISYMBOL #endif // CONFIG_NEW_MULTISYMBOL
#endif // CONFIG_INTERINTRA
#if CONFIG_NCOBMC_ADAPT_WEIGHT #if CONFIG_NCOBMC_ADAPT_WEIGHT
#ifdef TWO_MODE #ifdef TWO_MODE
const aom_tree_index av1_ncobmc_mode_tree[TREE_SIZE(MAX_NCOBMC_MODES)] = { const aom_tree_index av1_ncobmc_mode_tree[TREE_SIZE(MAX_NCOBMC_MODES)] = {
...@@ -1112,13 +1109,11 @@ static const aom_cdf_prob default_delta_lf_cdf[CDF_SIZE(DELTA_LF_PROBS + 1)] = { ...@@ -1112,13 +1109,11 @@ static const aom_cdf_prob default_delta_lf_cdf[CDF_SIZE(DELTA_LF_PROBS + 1)] = {
#endif #endif
/* clang-format off */ /* clang-format off */
#if CONFIG_INTERINTRA
const aom_tree_index av1_interintra_mode_tree[TREE_SIZE(INTERINTRA_MODES)] = { const aom_tree_index av1_interintra_mode_tree[TREE_SIZE(INTERINTRA_MODES)] = {
-II_DC_PRED, 2, /* 0 = II_DC_NODE */ -II_DC_PRED, 2, /* 0 = II_DC_NODE */
-II_SMOOTH_PRED, 4, /* 1 = II_SMOOTH_PRED */ -II_SMOOTH_PRED, 4, /* 1 = II_SMOOTH_PRED */
-II_V_PRED, -II_H_PRED /* 2 = II_V_NODE */ -II_V_PRED, -II_H_PRED /* 2 = II_V_NODE */
}; };
#endif // CONFIG_INTERINTRA
const aom_tree_index av1_inter_compound_mode_tree const aom_tree_index av1_inter_compound_mode_tree
[TREE_SIZE(INTER_COMPOUND_MODES)] = { [TREE_SIZE(INTER_COMPOUND_MODES)] = {
...@@ -5966,7 +5961,6 @@ static void init_mode_probs(FRAME_CONTEXT *fc) { ...@@ -5966,7 +5961,6 @@ static void init_mode_probs(FRAME_CONTEXT *fc) {
#endif // CONFIG_COMPOUND_SINGLEREF #endif // CONFIG_COMPOUND_SINGLEREF
av1_copy(fc->compound_type_prob, default_compound_type_probs); av1_copy(fc->compound_type_prob, default_compound_type_probs);
av1_copy(fc->compound_type_cdf, default_compound_type_cdf); av1_copy(fc->compound_type_cdf, default_compound_type_cdf);
#if CONFIG_INTERINTRA
av1_copy(fc->interintra_prob, default_interintra_prob); av1_copy(fc->interintra_prob, default_interintra_prob);
av1_copy(fc->wedge_interintra_prob, default_wedge_interintra_prob); av1_copy(fc->wedge_interintra_prob, default_wedge_interintra_prob);
#if CONFIG_NEW_MULTISYMBOL #if CONFIG_NEW_MULTISYMBOL
...@@ -5975,7 +5969,6 @@ static void init_mode_probs(FRAME_CONTEXT *fc) { ...@@ -5975,7 +5969,6 @@ static void init_mode_probs(FRAME_CONTEXT *fc) {
#endif // CONFIG_NEW_MULTISYMBOL #endif // CONFIG_NEW_MULTISYMBOL
av1_copy(fc->interintra_mode_prob, default_interintra_mode_prob); av1_copy(fc->interintra_mode_prob, default_interintra_mode_prob);
av1_copy(fc->interintra_mode_cdf, default_interintra_mode_cdf); av1_copy(fc->interintra_mode_cdf, default_interintra_mode_cdf);
#endif // CONFIG_INTERINTRA
av1_copy(fc->seg.tree_probs, default_segment_tree_probs); av1_copy(fc->seg.tree_probs, default_segment_tree_probs);
av1_copy(fc->seg.pred_probs, default_segment_pred_probs); av1_copy(fc->seg.pred_probs, default_segment_pred_probs);
#if CONFIG_NEW_MULTISYMBOL #if CONFIG_NEW_MULTISYMBOL
...@@ -6126,7 +6119,6 @@ void av1_adapt_inter_frame_probs(AV1_COMMON *cm) { ...@@ -6126,7 +6119,6 @@ void av1_adapt_inter_frame_probs(AV1_COMMON *cm) {
counts->inter_singleref_comp_mode[i], counts->inter_singleref_comp_mode[i],
fc->inter_singleref_comp_mode_probs[i]); fc->inter_singleref_comp_mode_probs[i]);
#endif // CONFIG_COMPOUND_SINGLEREF #endif // CONFIG_COMPOUND_SINGLEREF
#if CONFIG_INTERINTRA
if (cm->allow_interintra_compound) { if (cm->allow_interintra_compound) {
for (i = 0; i < BLOCK_SIZE_GROUPS; ++i) { for (i = 0; i < BLOCK_SIZE_GROUPS; ++i) {
if (is_interintra_allowed_bsize_group(i)) if (is_interintra_allowed_bsize_group(i))
...@@ -6144,7 +6136,6 @@ void av1_adapt_inter_frame_probs(AV1_COMMON *cm) { ...@@ -6144,7 +6136,6 @@ void av1_adapt_inter_frame_probs(AV1_COMMON *cm) {
pre_fc->wedge_interintra_prob[i], counts->wedge_interintra[i]); pre_fc->wedge_interintra_prob[i], counts->wedge_interintra[i]);
} }
} }
#endif // CONFIG_INTERINTRA
if (cm->allow_masked_compound) { if (cm->allow_masked_compound) {
for (i = 0; i < BLOCK_SIZES_ALL; ++i) { for (i = 0; i < BLOCK_SIZES_ALL; ++i) {
......
...@@ -207,7 +207,6 @@ typedef struct frame_contexts { ...@@ -207,7 +207,6 @@ typedef struct frame_contexts {
#endif // CONFIG_COMPOUND_SINGLEREF #endif // CONFIG_COMPOUND_SINGLEREF
aom_prob compound_type_prob[BLOCK_SIZES_ALL][COMPOUND_TYPES - 1]; aom_prob compound_type_prob[BLOCK_SIZES_ALL][COMPOUND_TYPES - 1];
aom_cdf_prob compound_type_cdf[BLOCK_SIZES_ALL][CDF_SIZE(COMPOUND_TYPES)]; aom_cdf_prob compound_type_cdf[BLOCK_SIZES_ALL][CDF_SIZE(COMPOUND_TYPES)];
#if CONFIG_INTERINTRA
aom_prob interintra_prob[BLOCK_SIZE_GROUPS]; aom_prob interintra_prob[BLOCK_SIZE_GROUPS];
aom_prob wedge_interintra_prob[BLOCK_SIZES_ALL]; aom_prob wedge_interintra_prob[BLOCK_SIZES_ALL];
aom_prob interintra_mode_prob[BLOCK_SIZE_GROUPS][INTERINTRA_MODES - 1]; aom_prob interintra_mode_prob[BLOCK_SIZE_GROUPS][INTERINTRA_MODES - 1];
...@@ -217,7 +216,6 @@ typedef struct frame_contexts { ...@@ -217,7 +216,6 @@ typedef struct frame_contexts {
#endif #endif
aom_cdf_prob interintra_mode_cdf[BLOCK_SIZE_GROUPS] aom_cdf_prob interintra_mode_cdf[BLOCK_SIZE_GROUPS]
[CDF_SIZE(INTERINTRA_MODES)]; [CDF_SIZE(INTERINTRA_MODES)];
#endif // CONFIG_INTERINTRA
aom_prob motion_mode_prob[BLOCK_SIZES_ALL][MOTION_MODES - 1]; aom_prob motion_mode_prob[BLOCK_SIZES_ALL][MOTION_MODES - 1];
aom_cdf_prob motion_mode_cdf[BLOCK_SIZES_ALL][CDF_SIZE(MOTION_MODES)]; aom_cdf_prob motion_mode_cdf[BLOCK_SIZES_ALL][CDF_SIZE(MOTION_MODES)];
#if CONFIG_NCOBMC_ADAPT_WEIGHT #if CONFIG_NCOBMC_ADAPT_WEIGHT
...@@ -451,11 +449,9 @@ typedef struct FRAME_COUNTS { ...@@ -451,11 +449,9 @@ typedef struct FRAME_COUNTS {
unsigned int inter_singleref_comp_mode[INTER_MODE_CONTEXTS] unsigned int inter_singleref_comp_mode[INTER_MODE_CONTEXTS]
[INTER_SINGLEREF_COMP_MODES]; [INTER_SINGLEREF_COMP_MODES];
#endif // CONFIG_COMPOUND_SINGLEREF #endif // CONFIG_COMPOUND_SINGLEREF
#if CONFIG_INTERINTRA
unsigned int interintra[BLOCK_SIZE_GROUPS][2]; unsigned int interintra[BLOCK_SIZE_GROUPS][2];
unsigned int interintra_mode[BLOCK_SIZE_GROUPS][INTERINTRA_MODES]; unsigned int interintra_mode[BLOCK_SIZE_GROUPS][INTERINTRA_MODES];
unsigned int wedge_interintra[BLOCK_SIZES_ALL][2]; unsigned int wedge_interintra[BLOCK_SIZES_ALL][2];
#endif // CONFIG_INTERINTRA
unsigned int compound_interinter[BLOCK_SIZES_ALL][COMPOUND_TYPES]; unsigned int compound_interinter[BLOCK_SIZES_ALL][COMPOUND_TYPES];
unsigned int motion_mode[BLOCK_SIZES_ALL][MOTION_MODES]; unsigned int motion_mode[BLOCK_SIZES_ALL][MOTION_MODES];
#if CONFIG_NCOBMC_ADAPT_WEIGHT #if CONFIG_NCOBMC_ADAPT_WEIGHT
...@@ -619,10 +615,8 @@ static const int av1_ext_tx_inv[TX_TYPES] = { ...@@ -619,10 +615,8 @@ static const int av1_ext_tx_inv[TX_TYPES] = {
#endif // CONFIG_MRC_TX #endif // CONFIG_MRC_TX
#endif // CONFIG_EXT_TX #endif // CONFIG_EXT_TX
#if CONFIG_INTERINTRA
extern const aom_tree_index extern const aom_tree_index
av1_interintra_mode_tree[TREE_SIZE(INTERINTRA_MODES)]; av1_interintra_mode_tree[TREE_SIZE(INTERINTRA_MODES)];
#endif
extern const aom_tree_index extern const aom_tree_index
av1_inter_compound_mode_tree[TREE_SIZE(INTER_COMPOUND_MODES)]; av1_inter_compound_mode_tree[TREE_SIZE(INTER_COMPOUND_MODES)];
#if CONFIG_COMPOUND_SINGLEREF #if CONFIG_COMPOUND_SINGLEREF
......
...@@ -585,7 +585,6 @@ typedef enum ATTRIBUTE_PACKED { ...@@ -585,7 +585,6 @@ typedef enum ATTRIBUTE_PACKED {
#endif #endif
} MOTION_MODE; } MOTION_MODE;
#if CONFIG_INTERINTRA
typedef enum ATTRIBUTE_PACKED { typedef enum ATTRIBUTE_PACKED {
II_DC_PRED, II_DC_PRED,
II_V_PRED, II_V_PRED,
...@@ -593,7 +592,6 @@ typedef enum ATTRIBUTE_PACKED { ...@@ -593,7 +592,6 @@ typedef enum ATTRIBUTE_PACKED {
II_SMOOTH_PRED, II_SMOOTH_PRED,
INTERINTRA_MODES INTERINTRA_MODES
} INTERINTRA_MODE; } INTERINTRA_MODE;
#endif
typedef enum { typedef enum {
COMPOUND_AVERAGE, COMPOUND_AVERAGE,
......
...@@ -278,9 +278,7 @@ typedef struct AV1Common { ...@@ -278,9 +278,7 @@ typedef struct AV1Common {
#endif #endif
int allow_screen_content_tools; int allow_screen_content_tools;
#if CONFIG_INTERINTRA
int allow_interintra_compound; int allow_interintra_compound;
#endif // CONFIG_INTERINTRA
int allow_masked_compound; int allow_masked_compound;
#if !CONFIG_NO_FRAME_CONTEXT_SIGNALING #if !CONFIG_NO_FRAME_CONTEXT_SIGNALING
......
...@@ -1388,7 +1388,7 @@ void av1_build_inter_predictors_sby(const AV1_COMMON *cm, MACROBLOCKD *xd, ...@@ -1388,7 +1388,7 @@ void av1_build_inter_predictors_sby(const AV1_COMMON *cm, MACROBLOCKD *xd,
int mi_row, int mi_col, BUFFER_SET *ctx, int mi_row, int mi_col, BUFFER_SET *ctx,
BLOCK_SIZE bsize) { BLOCK_SIZE bsize) {
build_inter_predictors_for_planes(cm, xd, bsize, mi_row, mi_col, 0, 0); build_inter_predictors_for_planes(cm, xd, bsize, mi_row, mi_col, 0, 0);
#if CONFIG_INTERINTRA
if (is_interintra_pred(&xd->mi[0]->mbmi)) { if (is_interintra_pred(&xd->mi[0]->mbmi)) {
BUFFER_SET default_ctx = { { xd->plane[0].dst.buf, NULL, NULL }, BUFFER_SET default_ctx = { { xd->plane[0].dst.buf, NULL, NULL },
{ xd->plane[0].dst.stride, 0, 0 } }; { xd->plane[0].dst.stride, 0, 0 } };
...@@ -1396,9 +1396,6 @@ void av1_build_inter_predictors_sby(const AV1_COMMON *cm, MACROBLOCKD *xd, ...@@ -1396,9 +1396,6 @@ void av1_build_inter_predictors_sby(const AV1_COMMON *cm, MACROBLOCKD *xd,
av1_build_interintra_predictors_sby(cm, xd, xd->plane[0].dst.buf, av1_build_interintra_predictors_sby(cm, xd, xd->plane[0].dst.buf,
xd->plane[0].dst.stride, ctx, bsize); xd->plane[0].dst.stride, ctx, bsize);
} }
#else
(void)ctx;
#endif // CONFIG_INTERINTRA
} }
void av1_build_inter_predictors_sbuv(const AV1_COMMON *cm, MACROBLOCKD *xd, void av1_build_inter_predictors_sbuv(const AV1_COMMON *cm, MACROBLOCKD *xd,
...@@ -1406,7 +1403,7 @@ void av1_build_inter_predictors_sbuv(const AV1_COMMON *cm, MACROBLOCKD *xd, ...@@ -1406,7 +1403,7 @@ void av1_build_inter_predictors_sbuv(const AV1_COMMON *cm, MACROBLOCKD *xd,
BLOCK_SIZE bsize) { BLOCK_SIZE bsize) {
build_inter_predictors_for_planes(cm, xd, bsize, mi_row, mi_col, 1, build_inter_predictors_for_planes(cm, xd, bsize, mi_row, mi_col, 1,
MAX_MB_PLANE - 1); MAX_MB_PLANE - 1);
#if CONFIG_INTERINTRA
if (is_interintra_pred(&xd->mi[0]->mbmi)) { if (is_interintra_pred(&xd->mi[0]->mbmi)) {
BUFFER_SET default_ctx = { BUFFER_SET default_ctx = {
{ NULL, xd->plane[1].dst.buf, xd->plane[2].dst.buf }, { NULL, xd->plane[1].dst.buf, xd->plane[2].dst.buf },
...@@ -1417,9 +1414,6 @@ void av1_build_inter_predictors_sbuv(const AV1_COMMON *cm, MACROBLOCKD *xd, ...@@ -1417,9 +1414,6 @@ void av1_build_inter_predictors_sbuv(const AV1_COMMON *cm, MACROBLOCKD *xd,
cm, xd, xd->plane[1].dst.buf, xd->plane[2].dst.buf, cm, xd, xd->plane[1].dst.buf, xd->plane[2].dst.buf,
xd->plane[1].dst.stride, xd->plane[2].dst.stride, ctx, bsize); xd->plane[1].dst.stride, xd->plane[2].dst.stride, ctx, bsize);
} }
#else
(void)ctx;
#endif // CONFIG_INTERINTRA
} }
void av1_build_inter_predictors_sb(const AV1_COMMON *cm, MACROBLOCKD *xd, void av1_build_inter_predictors_sb(const AV1_COMMON *cm, MACROBLOCKD *xd,
...@@ -2326,7 +2320,6 @@ void set_sb_mi_boundaries(const AV1_COMMON *const cm, MACROBLOCKD *const xd, ...@@ -2326,7 +2320,6 @@ void set_sb_mi_boundaries(const AV1_COMMON *const cm, MACROBLOCKD *const xd,
#endif #endif
/* clang-format off */ /* clang-format off */
#if CONFIG_INTERINTRA
#if CONFIG_EXT_PARTITION #if CONFIG_EXT_PARTITION
static const int ii_weights1d[MAX_SB_SIZE] = { static const int ii_weights1d[MAX_SB_SIZE] = {
60, 58, 56, 54, 52, 50, 48, 47, 45, 44, 42, 41, 39, 38, 37, 35, 34, 33, 32, 60, 58, 56, 54, 52, 50, 48, 47, 45, 44, 42, 41, 39, 38, 37, 35, 34, 33, 32,
...@@ -2605,7 +2598,6 @@ void av1_build_interintra_predictors(const AV1_COMMON *cm, MACROBLOCKD *xd, ...@@ -2605,7 +2598,6 @@ void av1_build_interintra_predictors(const AV1_COMMON *cm, MACROBLOCKD *xd,
av1_build_interintra_predictors_sbuv(cm, xd, upred, vpred, ustride, vstride, av1_build_interintra_predictors_sbuv(cm, xd, upred, vpred, ustride, vstride,
ctx, bsize); ctx, bsize);
} }
#endif // CONFIG_INTERINTRA
// Builds the inter-predictor for the single ref case // Builds the inter-predictor for the single ref case
// for use in the encoder to search the wedges efficiently. // for use in the encoder to search the wedges efficiently.
......
...@@ -521,19 +521,22 @@ const uint8_t *av1_get_compound_type_mask_inverse( ...@@ -521,19 +521,22 @@ const uint8_t *av1_get_compound_type_mask_inverse(
const uint8_t *av1_get_compound_type_mask( const uint8_t *av1_get_compound_type_mask(
const INTERINTER_COMPOUND_DATA *const comp_data, BLOCK_SIZE sb_type); const INTERINTER_COMPOUND_DATA *const comp_data, BLOCK_SIZE sb_type);
#if CONFIG_INTERINTRA
void av1_build_interintra_predictors(const AV1_COMMON *cm, MACROBLOCKD *xd, void av1_build_interintra_predictors(const AV1_COMMON *cm, MACROBLOCKD *xd,
uint8_t *ypred, uint8_t *upred, uint8_t *ypred, uint8_t *upred,
uint8_t *vpred, int ystride, int ustride, uint8_t *vpred, int ystride, int ustride,
int vstride, BUFFER_SET *ctx, int vstride, BUFFER_SET *ctx,
BLOCK_SIZE bsize); BLOCK_SIZE bsize);
void av1_build_interintra_predictors_sby(const AV1_COMMON *cm, MACROBLOCKD *xd, void av1_build_interintra_predictors_sby(const AV1_COMMON *cm, MACROBLOCKD *xd,
uint8_t *ypred, int ystride, uint8_t *ypred, int ystride,
BUFFER_SET *ctx, BLOCK_SIZE bsize); BUFFER_SET *ctx, BLOCK_SIZE bsize);
void av1_build_interintra_predictors_sbc(const AV1_COMMON *cm, MACROBLOCKD *xd, void av1_build_interintra_predictors_sbc(const AV1_COMMON *cm, MACROBLOCKD *xd,
uint8_t *upred, int ustride, uint8_t *upred, int ustride,
BUFFER_SET *ctx, int plane, BUFFER_SET *ctx, int plane,
BLOCK_SIZE bsize); BLOCK_SIZE bsize);
void av1_build_interintra_predictors_sbuv(const AV1_COMMON *cm, MACROBLOCKD *xd, void av1_build_interintra_predictors_sbuv(const AV1_COMMON *cm, MACROBLOCKD *xd,
uint8_t *upred, uint8_t *vpred, uint8_t *upred, uint8_t *vpred,
int ustride, int vstride, int ustride, int vstride,
...@@ -545,7 +548,7 @@ void av1_build_intra_predictors_for_interintra( ...@@ -545,7 +548,7 @@ void av1_build_intra_predictors_for_interintra(
void av1_combine_interintra(MACROBLOCKD *xd, BLOCK_SIZE bsize, int plane, void av1_combine_interintra(MACROBLOCKD *xd, BLOCK_SIZE bsize, int plane,
const uint8_t *inter_pred, int inter_stride, const uint8_t *inter_pred, int inter_stride,
const uint8_t *intra_pred, int intra_stride); const uint8_t *intra_pred, int intra_stride);
#endif // CONFIG_INTERINTRA
// Encoder only // Encoder only
void av1_build_inter_predictors_for_planes_single_buf( void av1_build_inter_predictors_for_planes_single_buf(
MACROBLOCKD *xd, BLOCK_SIZE bsize, int plane_from, int plane_to, int mi_row, MACROBLOCKD *xd, BLOCK_SIZE bsize, int plane_from, int plane_to, int mi_row,
......
...@@ -30,7 +30,6 @@ void av1_predict_intra_block(const AV1_COMMON *cm, const MACROBLOCKD *xd, ...@@ -30,7 +30,6 @@ void av1_predict_intra_block(const AV1_COMMON *cm, const MACROBLOCKD *xd,
int ref_stride, uint8_t *dst, int dst_stride, int ref_stride, uint8_t *dst, int dst_stride,
int aoff, int loff, int plane); int aoff, int loff, int plane);
#if CONFIG_INTERINTRA
// Mapping of interintra to intra mode for use in the intra component // Mapping of interintra to intra mode for use in the intra component
static const PREDICTION_MODE interintra_to_intra_mode[INTERINTRA_MODES] = { static const PREDICTION_MODE interintra_to_intra_mode[INTERINTRA_MODES] = {
DC_PRED, V_PRED, H_PRED, SMOOTH_PRED DC_PRED, V_PRED, H_PRED, SMOOTH_PRED
...@@ -41,7 +40,6 @@ static const INTERINTRA_MODE intra_to_interintra_mode[INTRA_MODES] = { ...@@ -41,7 +40,6 @@ static const INTERINTRA_MODE intra_to_interintra_mode[INTRA_MODES] = {
II_DC_PRED, II_V_PRED, II_H_PRED, II_V_PRED, II_SMOOTH_PRED, II_V_PRED, II_DC_PRED, II_V_PRED, II_H_PRED, II_V_PRED, II_SMOOTH_PRED, II_V_PRED,
II_H_PRED, II_H_PRED, II_V_PRED, II_SMOOTH_PRED, II_SMOOTH_PRED II_H_PRED, II_H_PRED, II_V_PRED, II_SMOOTH_PRED, II_SMOOTH_PRED
}; };
#endif // CONFIG_INTERINTRA
#if CONFIG_FILTER_INTRA #if CONFIG_FILTER_INTRA
#define FILTER_INTRA_PREC_BITS 10 #define FILTER_INTRA_PREC_BITS 10
......
...@@ -2607,15 +2607,11 @@ void read_sequence_header(SequenceHeader *seq_params, ...@@ -2607,15 +2607,11 @@ void read_sequence_header(SequenceHeader *seq_params,
static void read_compound_tools(AV1_COMMON *cm, static void read_compound_tools(AV1_COMMON *cm,
struct aom_read_bit_buffer *rb) { struct aom_read_bit_buffer *rb) {
(void)cm;
(void)rb;
#if CONFIG_INTERINTRA
if (!frame_is_intra_only(cm) && cm->reference_mode != COMPOUND_REFERENCE) { if (!frame_is_intra_only(cm) && cm->reference_mode != COMPOUND_REFERENCE) {
cm->allow_interintra_compound = aom_rb_read_bit(rb); cm->allow_interintra_compound = aom_rb_read_bit(rb);
} else { } else {
cm->allow_interintra_compound = 0; cm->allow_interintra_compound = 0;
} }
#endif // CONFIG_INTERINTRA
#if CONFIG_COMPOUND_SINGLEREF #if CONFIG_COMPOUND_SINGLEREF
if (!frame_is_intra_only(cm)) { if (!frame_is_intra_only(cm)) {
#else // !CONFIG_COMPOUND_SINGLEREF #else // !CONFIG_COMPOUND_SINGLEREF
...@@ -3426,7 +3422,6 @@ static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data, ...@@ -3426,7 +3422,6 @@ static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data,
read_inter_mode_probs(fc, &r); read_inter_mode_probs(fc, &r);
#endif #endif
#if CONFIG_INTERINTRA
if (cm->reference_mode != COMPOUND_REFERENCE && if (cm->reference_mode != COMPOUND_REFERENCE &&
cm->allow_interintra_compound) { cm->allow_interintra_compound) {
#if !CONFIG_NEW_MULTISYMBOL #if !CONFIG_NEW_MULTISYMBOL
...@@ -3449,7 +3444,6 @@ static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data, ...@@ -3449,7 +3444,6 @@ static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data,
} }
#endif // !CONFIG_NEW_MULTISYMBOL #endif // !CONFIG_NEW_MULTISYMBOL
} }
#endif // CONFIG_INTERINTRA
#if !CONFIG_NEW_MULTISYMBOL #if !CONFIG_NEW_MULTISYMBOL
for (int i = 0; i < INTRA_INTER_CONTEXTS; i++) for (int i = 0; i < INTRA_INTER_CONTEXTS; i++)
...@@ -3498,12 +3492,10 @@ static void debug_check_frame_counts(const AV1_COMMON *const cm) { ...@@ -3498,12 +3492,10 @@ static void debug_check_frame_counts(const AV1_COMMON *const cm) {
assert(!memcmp(cm->counts.inter_compound_mode, assert(!memcmp(cm->counts.inter_compound_mode,
zero_counts.inter_compound_mode, zero_counts.inter_compound_mode,
sizeof(cm->counts.inter_compound_mode))); sizeof(cm->counts.inter_compound_mode)));
#if CONFIG_INTERINTRA
assert(!memcmp(cm->counts.interintra, zero_counts.interintra, assert(!memcmp(cm->counts.interintra, zero_counts.interintra,
sizeof(cm->counts.interintra))); sizeof(cm->counts.interintra)));
assert(!memcmp(cm->counts.wedge_interintra, zero_counts.wedge_interintra, assert(!memcmp(cm->counts.wedge_interintra, zero_counts.wedge_interintra,
sizeof(cm->counts.wedge_interintra))); sizeof(cm->counts.wedge_interintra)));
#endif // CONFIG_INTERINTRA
assert(!memcmp(cm->counts.compound_interinter, assert(!memcmp(cm->counts.compound_interinter,
zero_counts.compound_interinter, zero_counts.compound_interinter,
sizeof(cm->counts.compound_interinter))); sizeof(cm->counts.compound_interinter)));
......
...@@ -172,10 +172,8 @@ static int read_cfl_alphas(FRAME_CONTEXT *const ec_ctx, aom_reader *r, ...@@ -172,10 +172,8 @@ static int read_cfl_alphas(FRAME_CONTEXT *const ec_ctx, aom_reader *r,
} }
#endif #endif
#if CONFIG_INTERINTRA static INTERINTRA_MODE read_interintra_mode(MACROBLOCKD *xd, aom_reader *r,
static INTERINTRA_MODE read_interintra_mode(AV1_COMMON *cm, MACROBLOCKD *xd, int size_group) {
aom_reader *r, int size_group) {
(void)cm;
const INTERINTRA_MODE ii_mode = (INTERINTRA_MODE)aom_read_symbol( const INTERINTRA_MODE ii_mode = (INTERINTRA_MODE)aom_read_symbol(
r, xd->tile_ctx->interintra_mode_cdf[size_group], INTERINTRA_MODES, r, xd->tile_ctx->interintra_mode_cdf[size_group], INTERINTRA_MODES,
ACCT_STR); ACCT_STR);
...@@ -183,7 +181,6 @@ static INTERINTRA_MODE read_interintra_mode(AV1_COMMON *cm, MACROBLOCKD *xd, ...@@ -183,7 +181,6 @@ static INTERINTRA_MODE read_interintra_mode(AV1_COMMON *cm, MACROBLOCKD *xd,
if (counts) ++counts->interintra_mode[size_group][ii_mode]; if (counts) ++counts->interintra_mode[size_group][ii_mode];
return ii_mode; return ii_mode;
} }
#endif // CONFIG_INTERINTRA
static PREDICTION_MODE read_inter_mode(FRAME_CONTEXT *ec_ctx, MACROBLOCKD *xd, static PREDICTION_MODE read_inter_mode(FRAME_CONTEXT *ec_ctx, MACROBLOCKD *xd,
aom_reader *r, int16_t ctx) { aom_reader *r, int16_t ctx) {
...@@ -2640,7 +2637,6 @@ static void read_inter_block_mode_info(AV1Decoder *const pbi, ...@@ -2640,7 +2637,6 @@ static void read_inter_block_mode_info(AV1Decoder *const pbi,
nearestmv, nearmv, mi_row, mi_col, is_compound, allow_hp, r); nearestmv, nearmv, mi_row, mi_col, is_compound, allow_hp, r);
aom_merge_corrupted_flag(&xd->corrupted, mv_corrupted_flag); aom_merge_corrupted_flag(&xd->corrupted, mv_corrupted_flag);
#if CONFIG_INTERINTRA
mbmi->use_wedge_interintra = 0; mbmi->use_wedge_interintra = 0;
if (cm->reference_mode != COMPOUND_REFERENCE && if (cm->reference_mode != COMPOUND_REFERENCE &&
cm->allow_interintra_compound && is_interintra_allowed(mbmi)) { cm->allow_interintra_compound && is_interintra_allowed(mbmi)) {
...@@ -2656,7 +2652,7 @@ static void read_inter_block_mode_info(AV1Decoder *const pbi, ...@@ -2656,7 +2652,7 @@ static void read_inter_block_mode_info(AV1Decoder *const pbi,
assert(mbmi->ref_frame[1] == NONE_FRAME); assert(mbmi->ref_frame[1] == NONE_FRAME);
if (interintra) { if (interintra) {
const INTERINTRA_MODE interintra_mode = const INTERINTRA_MODE interintra_mode =
read_interintra_mode(cm, xd, r, bsize_group); read_interintra_mode(xd, r, bsize_group);
mbmi->ref_frame[1] = INTRA_FRAME; mbmi->ref_frame[1] = INTRA_FRAME;
mbmi->interintra_mode = interintra_mode; mbmi->interintra_mode = interintra_mode;
#if CONFIG_EXT_INTRA #if CONFIG_EXT_INTRA
...@@ -2685,7 +2681,6 @@ static void read_inter_block_mode_info(AV1Decoder *const pbi, ...@@ -2685,7 +2681,6 @@ static void read_inter_block_mode_info(AV1Decoder *const pbi,
} }
} }
} }
#endif // CONFIG_INTERINTRA
for (ref = 0; ref < 1 + has_second_ref(mbmi); ++ref) { for (ref = 0; ref < 1 + has_second_ref(mbmi); ++ref) {
const MV_REFERENCE_FRAME frame = mbmi->ref_frame[ref]; const MV_REFERENCE_FRAME frame = mbmi->ref_frame[ref];
......
...@@ -73,9 +73,7 @@ static INLINE void write_uniform(aom_writer *w, int n, int v) { ...@@ -73,9 +73,7 @@ static INLINE void write_uniform(aom_writer *w, int n, int v) {
} }
} }
#if CONFIG_INTERINTRA
static struct av1_token interintra_mode_encodings[INTERINTRA_MODES]; static struct av1_token interintra_mode_encodings[INTERINTRA_MODES];
#endif
static struct av1_token compound_type_encodings[COMPOUND_TYPES]; static struct av1_token compound_type_encodings[COMPOUND_TYPES];
#if CONFIG_LOOP_RESTORATION #if CONFIG_LOOP_RESTORATION
static void loop_restoration_write_sb_coeffs(const AV1_COMMON *const cm, static void loop_restoration_write_sb_coeffs(const AV1_COMMON *const cm,
...@@ -101,9 +99,7 @@ static int remux_tiles(const AV1_COMMON *const cm, uint8_t *dst, ...@@ -101,9 +99,7 @@ static int remux_tiles(const AV1_COMMON *const cm, uint8_t *dst,