Remove compound-segment/wedge config flags Change-Id: I39cfbb135add0553cadf64481b13786831fbdddd
diff --git a/av1/common/blockd.h b/av1/common/blockd.h index 1843179..b32d904 100644 --- a/av1/common/blockd.h +++ b/av1/common/blockd.h
@@ -33,7 +33,6 @@ #define MAX_MB_PLANE 3 -#if CONFIG_COMPOUND_SEGMENT // Set COMPOUND_SEGMENT_TYPE to one of the three // 0: Uniform // 1: Difference weighted @@ -52,8 +51,6 @@ SEG_MASK_TYPES, } SEG_MASK_TYPE; -#endif // CONFIG_COMPOUND_SEGMENT - typedef enum { KEY_FRAME = 0, INTER_FRAME = 1, @@ -214,24 +211,11 @@ } static INLINE int use_masked_motion_search(COMPOUND_TYPE type) { -#if CONFIG_WEDGE return (type == COMPOUND_WEDGE); -#else - (void)type; - return 0; -#endif } static INLINE int is_masked_compound_type(COMPOUND_TYPE type) { -#if CONFIG_COMPOUND_SEGMENT && CONFIG_WEDGE return (type == COMPOUND_WEDGE || type == COMPOUND_SEG); -#elif !CONFIG_COMPOUND_SEGMENT && CONFIG_WEDGE - return (type == COMPOUND_WEDGE); -#elif CONFIG_COMPOUND_SEGMENT && !CONFIG_WEDGE - return (type == COMPOUND_SEG); -#endif // CONFIG_COMPOUND_SEGMENT - (void)type; - return 0; } /* For keyframes, intra block modes are predicted by the (already decoded) @@ -295,14 +279,10 @@ // This struct is used to group function args that are commonly // sent together in functions related to interinter compound modes typedef struct { -#if CONFIG_WEDGE int wedge_index; int wedge_sign; -#endif // CONFIG_WEDGE -#if CONFIG_COMPOUND_SEGMENT SEG_MASK_TYPE mask_type; uint8_t *seg_mask; -#endif // CONFIG_COMPOUND_SEGMENT COMPOUND_TYPE interinter_compound_type; } INTERINTER_COMPOUND_DATA; @@ -361,13 +341,9 @@ int interintra_wedge_sign; // interinter members COMPOUND_TYPE interinter_compound_type; -#if CONFIG_WEDGE int wedge_index; int wedge_sign; -#endif // CONFIG_WEDGE -#if CONFIG_COMPOUND_SEGMENT SEG_MASK_TYPE mask_type; -#endif // CONFIG_COMPOUND_SEGMENT MOTION_MODE motion_mode; #if CONFIG_MOTION_VAR int overlappable_neighbors[2]; @@ -766,9 +742,7 @@ const EobThresholdMD *eob_threshold_md; #endif -#if CONFIG_COMPOUND_SEGMENT DECLARE_ALIGNED(16, uint8_t, seg_mask[2 * MAX_SB_SQUARE]); -#endif // CONFIG_COMPOUND_SEGMENT #if CONFIG_MRC_TX uint8_t *mrc_mask;
diff --git a/av1/common/entropy.c b/av1/common/entropy.c index 5f90c94..aa2b416 100644 --- a/av1/common/entropy.c +++ b/av1/common/entropy.c
@@ -2360,9 +2360,7 @@ AVERAGE_TILE_CDFS(inter_compound_mode_cdf) -#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT AVERAGE_TILE_CDFS(compound_type_cdf) -#endif // CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT #if CONFIG_COMPOUND_SINGLEREF AVERAGE_TILE_CDFS(inter_singleref_comp_mode_cdf) #endif
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c index 9d672fc..5218aa2 100644 --- a/av1/common/entropymode.c +++ b/av1/common/entropymode.c
@@ -744,7 +744,6 @@ }; #endif // CONFIG_COMPOUND_SINGLEREF -#if CONFIG_COMPOUND_SEGMENT && CONFIG_WEDGE static const aom_prob default_compound_type_probs[BLOCK_SIZES_ALL][COMPOUND_TYPES - 1] = { { 128, 128 }, { 128, 128 }, { 128, 128 }, { 128, 128 }, @@ -760,38 +759,7 @@ { 208, 1 }, { 208, 1 } #endif // CONFIG_EXT_PARTITION }; -#elif !CONFIG_COMPOUND_SEGMENT && CONFIG_WEDGE -static const aom_prob - default_compound_type_probs[BLOCK_SIZES_ALL][COMPOUND_TYPES - 1] = { - { 255 }, { 255 }, { 255 }, { 208 }, { 208 }, { 208 }, { 208 }, { 208 }, - { 208 }, { 216 }, { 216 }, { 216 }, { 224 }, { 224 }, { 240 }, { 240 }, -#if CONFIG_EXT_PARTITION - { 255 }, { 255 }, { 255 }, -#endif // CONFIG_EXT_PARTITION - { 208 }, { 208 }, { 208 }, { 208 }, { 255 }, { 255 }, -#if CONFIG_EXT_PARTITION - { 255 }, { 255 } -#endif // CONFIG_EXT_PARTITION - }; -#elif CONFIG_COMPOUND_SEGMENT && !CONFIG_WEDGE -static const aom_prob - default_compound_type_probs[BLOCK_SIZES_ALL][COMPOUND_TYPES - 1] = { - { 255 }, { 255 }, { 255 }, { 208 }, { 208 }, { 208 }, { 208 }, { 208 }, - { 208 }, { 216 }, { 216 }, { 216 }, { 224 }, { 224 }, { 240 }, { 240 }, -#if CONFIG_EXT_PARTITION - { 255 }, { 255 }, { 255 }, -#endif // CONFIG_EXT_PARTITION - { 208 }, { 208 }, { 208 }, { 208 }, { 208 }, { 208 }, -#if CONFIG_EXT_PARTITION - { 208 }, { 208 } -#endif // CONFIG_EXT_PARTITION - }; -#else -static const aom_prob default_compound_type_probs[BLOCK_SIZES_ALL] - [COMPOUND_TYPES - 1]; -#endif // CONFIG_COMPOUND_SEGMENT && CONFIG_WEDGE -#if CONFIG_COMPOUND_SEGMENT && CONFIG_WEDGE static const aom_cdf_prob default_compound_type_cdf[BLOCK_SIZES_ALL][CDF_SIZE(COMPOUND_TYPES)] = { { AOM_ICDF(16384), AOM_ICDF(24576), AOM_ICDF(32768), 0 }, @@ -826,77 +794,6 @@ { AOM_ICDF(26624), AOM_ICDF(26648), AOM_ICDF(32768), 0 }, #endif }; -#elif !CONFIG_COMPOUND_SEGMENT && CONFIG_WEDGE -static const aom_cdf_prob - default_compound_type_cdf[BLOCK_SIZES_ALL][CDF_SIZE(COMPOUND_TYPES)] = { - { AOM_ICDF(32640), AOM_ICDF(32768), 0 }, // 255 - { AOM_ICDF(32640), AOM_ICDF(32768), 0 }, - { AOM_ICDF(32640), AOM_ICDF(32768), 0 }, - { AOM_ICDF(26624), AOM_ICDF(32768), 0 }, // 208 - { AOM_ICDF(26624), AOM_ICDF(32768), 0 }, - { AOM_ICDF(26624), AOM_ICDF(32768), 0 }, - { AOM_ICDF(26624), AOM_ICDF(32768), 0 }, - { AOM_ICDF(26624), AOM_ICDF(32768), 0 }, - { AOM_ICDF(26624), AOM_ICDF(32768), 0 }, - { AOM_ICDF(27648), AOM_ICDF(32768), 0 }, // 216 - { AOM_ICDF(27648), AOM_ICDF(32768), 0 }, - { AOM_ICDF(27648), AOM_ICDF(32768), 0 }, - { AOM_ICDF(28672), AOM_ICDF(32768), 0 }, // 224 - { AOM_ICDF(28672), AOM_ICDF(32768), 0 }, - { AOM_ICDF(30720), AOM_ICDF(32768), 0 }, // 240 - { AOM_ICDF(30720), AOM_ICDF(32768), 0 }, -#if CONFIG_EXT_PARTITION - { AOM_ICDF(32640), AOM_ICDF(32768), 0 }, // 255 - { AOM_ICDF(32640), AOM_ICDF(32768), 0 }, - { AOM_ICDF(32640), AOM_ICDF(32768), 0 }, -#endif // CONFIG_EXT_PARTITION - { AOM_ICDF(32640), AOM_ICDF(32768), 0 }, - { AOM_ICDF(32640), AOM_ICDF(32768), 0 }, - { AOM_ICDF(32640), AOM_ICDF(32768), 0 }, - { AOM_ICDF(32640), AOM_ICDF(32768), 0 }, - { AOM_ICDF(32640), AOM_ICDF(32768), 0 }, - { AOM_ICDF(32640), AOM_ICDF(32768), 0 }, -#if CONFIG_EXT_PARTITION - { AOM_ICDF(32640), AOM_ICDF(32768), 0 }, - { AOM_ICDF(32640), AOM_ICDF(32768), 0 }, -#endif // CONFIG_EXT_PARTITION - }; -#elif CONFIG_COMPOUND_SEGMENT && !CONFIG_WEDGE -static const aom_cdf_prob - default_compound_type_cdf[BLOCK_SIZES_ALL][CDF_SIZE(COMPOUND_TYPES)] = { - { AOM_ICDF(32640), AOM_ICDF(32768), 0 }, // 255 - { AOM_ICDF(32640), AOM_ICDF(32768), 0 }, - { AOM_ICDF(32640), AOM_ICDF(32768), 0 }, - { AOM_ICDF(26624), AOM_ICDF(32768), 0 }, // 208 - { AOM_ICDF(26624), AOM_ICDF(32768), 0 }, - { AOM_ICDF(26624), AOM_ICDF(32768), 0 }, - { AOM_ICDF(26624), AOM_ICDF(32768), 0 }, - { AOM_ICDF(26624), AOM_ICDF(32768), 0 }, - { AOM_ICDF(26624), AOM_ICDF(32768), 0 }, - { AOM_ICDF(27648), AOM_ICDF(32768), 0 }, // 216 - { AOM_ICDF(27648), AOM_ICDF(32768), 0 }, - { AOM_ICDF(27648), AOM_ICDF(32768), 0 }, - { AOM_ICDF(28672), AOM_ICDF(32768), 0 }, // 224 - { AOM_ICDF(28672), AOM_ICDF(32768), 0 }, - { AOM_ICDF(30720), AOM_ICDF(32768), 0 }, // 240 - { AOM_ICDF(30720), AOM_ICDF(32768), 0 }, -#if CONFIG_EXT_PARTITION - { AOM_ICDF(32640), AOM_ICDF(32768), 0 }, // 255 - { AOM_ICDF(32640), AOM_ICDF(32768), 0 }, - { AOM_ICDF(32640), AOM_ICDF(32768), 0 }, -#endif // CONFIG_EXT_PARTITION - { AOM_ICDF(26624), AOM_ICDF(32768), 0 }, // 208 - { AOM_ICDF(26624), AOM_ICDF(32768), 0 }, - { AOM_ICDF(26624), AOM_ICDF(32768), 0 }, - { AOM_ICDF(26624), AOM_ICDF(32768), 0 }, - { AOM_ICDF(26624), AOM_ICDF(32768), 0 }, - { AOM_ICDF(26624), AOM_ICDF(32768), 0 }, -#if CONFIG_EXT_PARTITION - { AOM_ICDF(26624), AOM_ICDF(32768), 0 }, - { AOM_ICDF(26624), AOM_ICDF(32768), 0 }, -#endif // CONFIG_EXT_PARTITION - }; -#endif // CONFIG_COMPOUND_SEGMENT && CONFIG_WEDGE #if CONFIG_INTERINTRA static const aom_prob default_interintra_prob[BLOCK_SIZE_GROUPS] = { @@ -1482,21 +1379,9 @@ }; #endif // CONFIG_COMPOUND_SINGLEREF -#if CONFIG_COMPOUND_SEGMENT && CONFIG_WEDGE const aom_tree_index av1_compound_type_tree[TREE_SIZE(COMPOUND_TYPES)] = { -COMPOUND_AVERAGE, 2, -COMPOUND_WEDGE, -COMPOUND_SEG }; -#elif !CONFIG_COMPOUND_SEGMENT && CONFIG_WEDGE -const aom_tree_index av1_compound_type_tree[TREE_SIZE(COMPOUND_TYPES)] = { - -COMPOUND_AVERAGE, -COMPOUND_WEDGE -}; -#elif CONFIG_COMPOUND_SEGMENT && !CONFIG_WEDGE -const aom_tree_index av1_compound_type_tree[TREE_SIZE(COMPOUND_TYPES)] = { - -COMPOUND_AVERAGE, -COMPOUND_SEG -}; -#else -const aom_tree_index av1_compound_type_tree[TREE_SIZE(COMPOUND_TYPES)] = {}; -#endif // CONFIG_COMPOUND_SEGMENT && CONFIG_WEDGE /* clang-format on */ const aom_tree_index av1_partition_tree[TREE_SIZE(PARTITION_TYPES)] = { @@ -6301,9 +6186,7 @@ default_inter_singleref_comp_mode_cdf); #endif // CONFIG_COMPOUND_SINGLEREF av1_copy(fc->compound_type_prob, default_compound_type_probs); -#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT av1_copy(fc->compound_type_cdf, default_compound_type_cdf); -#endif // CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT #if CONFIG_INTERINTRA av1_copy(fc->interintra_prob, default_interintra_prob); av1_copy(fc->wedge_interintra_prob, default_wedge_interintra_prob); @@ -6476,17 +6359,14 @@ av1_interintra_mode_tree, pre_fc->interintra_mode_prob[i], counts->interintra_mode[i], fc->interintra_mode_prob[i]); } -#if CONFIG_WEDGE for (i = 0; i < BLOCK_SIZES_ALL; ++i) { if (is_interintra_allowed_bsize(i) && is_interintra_wedge_used(i)) fc->wedge_interintra_prob[i] = av1_mode_mv_merge_probs( pre_fc->wedge_interintra_prob[i], counts->wedge_interintra[i]); } -#endif // CONFIG_WEDGE } #endif // CONFIG_INTERINTRA -#if CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE if (cm->allow_masked_compound) { for (i = 0; i < BLOCK_SIZES_ALL; ++i) { aom_tree_merge_probs( @@ -6494,7 +6374,6 @@ counts->compound_interinter[i], fc->compound_type_prob[i]); } } -#endif // CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE #if CONFIG_JNT_COMP for (i = 0; i < COMP_INDEX_CONTEXTS; ++i)
diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h index db24722..6046492 100644 --- a/av1/common/entropymode.h +++ b/av1/common/entropymode.h
@@ -206,9 +206,7 @@ INTER_SINGLEREF_COMP_MODES)]; #endif // CONFIG_COMPOUND_SINGLEREF aom_prob compound_type_prob[BLOCK_SIZES_ALL][COMPOUND_TYPES - 1]; -#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT aom_cdf_prob compound_type_cdf[BLOCK_SIZES_ALL][CDF_SIZE(COMPOUND_TYPES)]; -#endif // CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT #if CONFIG_INTERINTRA aom_prob interintra_prob[BLOCK_SIZE_GROUPS]; aom_prob wedge_interintra_prob[BLOCK_SIZES_ALL];
diff --git a/av1/common/enums.h b/av1/common/enums.h index 7f2f1c9..9353acc 100644 --- a/av1/common/enums.h +++ b/av1/common/enums.h
@@ -601,12 +601,8 @@ typedef enum { COMPOUND_AVERAGE, -#if CONFIG_WEDGE COMPOUND_WEDGE, -#endif // CONFIG_WEDGE -#if CONFIG_COMPOUND_SEGMENT COMPOUND_SEG, -#endif // CONFIG_COMPOUND_SEGMENT COMPOUND_TYPES, } COMPOUND_TYPE;
diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h index 50b4904..d5fb410 100644 --- a/av1/common/onyxc_int.h +++ b/av1/common/onyxc_int.h
@@ -270,9 +270,7 @@ #if CONFIG_INTERINTRA int allow_interintra_compound; #endif // CONFIG_INTERINTRA -#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT int allow_masked_compound; -#endif // CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT #if !CONFIG_NO_FRAME_CONTEXT_SIGNALING // Flag signaling which frame contexts should be reset to default values.
diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c index c5a78f8..7c260eb 100644 --- a/av1/common/reconinter.c +++ b/av1/common/reconinter.c
@@ -317,7 +317,6 @@ { 0, NULL, NULL, 0, NULL }, { 0, NULL, NULL, 0, NULL }, { 0, NULL, NULL, 0, NULL }, -#if CONFIG_WEDGE { 4, wedge_codebook_16_heqw, wedge_signflip_lookup[BLOCK_8X8], 0, wedge_masks[BLOCK_8X8] }, { 4, wedge_codebook_16_hgtw, wedge_signflip_lookup[BLOCK_8X16], 0, @@ -332,22 +331,6 @@ wedge_masks[BLOCK_32X16] }, { 4, wedge_codebook_16_heqw, wedge_signflip_lookup[BLOCK_32X32], 0, wedge_masks[BLOCK_32X32] }, -#else - { 0, wedge_codebook_16_heqw, wedge_signflip_lookup[BLOCK_8X8], 0, - wedge_masks[BLOCK_8X8] }, - { 0, wedge_codebook_16_hgtw, wedge_signflip_lookup[BLOCK_8X16], 0, - wedge_masks[BLOCK_8X16] }, - { 0, wedge_codebook_16_hltw, wedge_signflip_lookup[BLOCK_16X8], 0, - wedge_masks[BLOCK_16X8] }, - { 0, wedge_codebook_16_heqw, wedge_signflip_lookup[BLOCK_16X16], 0, - wedge_masks[BLOCK_16X16] }, - { 0, wedge_codebook_16_hgtw, wedge_signflip_lookup[BLOCK_16X32], 0, - wedge_masks[BLOCK_16X32] }, - { 0, wedge_codebook_16_hltw, wedge_signflip_lookup[BLOCK_32X16], 0, - wedge_masks[BLOCK_32X16] }, - { 0, wedge_codebook_16_heqw, wedge_signflip_lookup[BLOCK_32X32], 0, - wedge_masks[BLOCK_32X32] }, -#endif // CONFIG_WEDGE { 0, NULL, NULL, 0, NULL }, { 0, NULL, NULL, 0, NULL }, { 0, NULL, NULL, 0, NULL }, @@ -356,7 +339,6 @@ { 0, NULL, NULL, 0, NULL }, { 0, NULL, NULL, 0, NULL }, #endif // CONFIG_EXT_PARTITION -#if CONFIG_WEDGE { 0, wedge_codebook_16_hgtw, wedge_signflip_lookup[BLOCK_4X16], 0, wedge_masks[BLOCK_4X16] }, { 0, wedge_codebook_16_hltw, wedge_signflip_lookup[BLOCK_16X4], 0, @@ -365,16 +347,6 @@ wedge_masks[BLOCK_8X32] }, { 4, wedge_codebook_16_hltw, wedge_signflip_lookup[BLOCK_32X8], 0, wedge_masks[BLOCK_32X8] }, -#else - { 0, wedge_codebook_16_hgtw, wedge_signflip_lookup[BLOCK_4X16], 0, - wedge_masks[BLOCK_4X16] }, - { 0, wedge_codebook_16_hltw, wedge_signflip_lookup[BLOCK_16X4], 0, - wedge_masks[BLOCK_16X4] }, - { 0, wedge_codebook_16_hgtw, wedge_signflip_lookup[BLOCK_8X32], 0, - wedge_masks[BLOCK_8X32] }, - { 0, wedge_codebook_16_hltw, wedge_signflip_lookup[BLOCK_32X8], 0, - wedge_masks[BLOCK_32X8] }, -#endif // CONFIG_WEDGE { 0, NULL, NULL, 0, NULL }, { 0, NULL, NULL, 0, NULL }, #if CONFIG_EXT_PARTITION @@ -413,7 +385,6 @@ return mask; } -#if CONFIG_COMPOUND_SEGMENT static uint8_t *invert_mask(uint8_t *mask_inv_buffer, const uint8_t *const mask, int h, int w, int stride) { int i, j; @@ -425,26 +396,18 @@ } return mask_inv_buffer; } -#endif // CONFIG_COMPOUND_SEGMENT const uint8_t *av1_get_compound_type_mask_inverse( - const INTERINTER_COMPOUND_DATA *const comp_data, -#if CONFIG_COMPOUND_SEGMENT - uint8_t *mask_buffer, int h, int w, int stride, -#endif - BLOCK_SIZE sb_type) { + const INTERINTER_COMPOUND_DATA *const comp_data, uint8_t *mask_buffer, + int h, int w, int stride, BLOCK_SIZE sb_type) { assert(is_masked_compound_type(comp_data->interinter_compound_type)); (void)sb_type; switch (comp_data->interinter_compound_type) { -#if CONFIG_WEDGE case COMPOUND_WEDGE: return av1_get_contiguous_soft_mask(comp_data->wedge_index, !comp_data->wedge_sign, sb_type); -#endif // CONFIG_WEDGE -#if CONFIG_COMPOUND_SEGMENT case COMPOUND_SEG: return invert_mask(mask_buffer, comp_data->seg_mask, h, w, stride); -#endif // CONFIG_COMPOUND_SEGMENT default: assert(0); return NULL; } } @@ -454,19 +417,14 @@ assert(is_masked_compound_type(comp_data->interinter_compound_type)); (void)sb_type; switch (comp_data->interinter_compound_type) { -#if CONFIG_WEDGE case COMPOUND_WEDGE: return av1_get_contiguous_soft_mask(comp_data->wedge_index, comp_data->wedge_sign, sb_type); -#endif // CONFIG_WEDGE -#if CONFIG_COMPOUND_SEGMENT case COMPOUND_SEG: return comp_data->seg_mask; -#endif // CONFIG_COMPOUND_SEGMENT default: assert(0); return NULL; } } -#if CONFIG_COMPOUND_SEGMENT #if COMPOUND_SEGMENT_TYPE == 0 static void uniform_mask(uint8_t *mask, int which_inverse, BLOCK_SIZE sb_type, int h, int w, int mask_val) { @@ -553,7 +511,7 @@ default: assert(0); } } -#endif +#endif // CONFIG_CONVOLVE_ROUND static void diffwtd_mask(uint8_t *mask, int which_inverse, int mask_base, const uint8_t *src0, int src0_stride, @@ -628,7 +586,6 @@ } #endif // CONFIG_HIGHBITDEPTH #endif // COMPOUND_SEGMENT_TYPE -#endif // CONFIG_COMPOUND_SEGMENT #if MASK_MASTER_SIZE == 64 static const uint8_t wedge_master_oblique_odd[NSMOOTHERS][MASK_MASTER_SIZE] = { @@ -861,14 +818,7 @@ const MODE_INFO *mi = xd->mi[0]; const INTERINTER_COMPOUND_DATA comp_data = { -#if CONFIG_WEDGE - mi->mbmi.wedge_index, - mi->mbmi.wedge_sign, -#endif // CONFIG_WEDGE -#if CONFIG_COMPOUND_SEGMENT - mi->mbmi.mask_type, - xd->seg_mask, -#endif // CONFIG_COMPOUND_SEGMENT + mi->mbmi.wedge_index, mi->mbmi.wedge_sign, mi->mbmi.mask_type, xd->seg_mask, mi->mbmi.interinter_compound_type }; @@ -921,7 +871,6 @@ #endif xs, ys, xd); -#if CONFIG_COMPOUND_SEGMENT if (!plane && comp_data.interinter_compound_type == COMPOUND_SEG) { #if CONFIG_CONVOLVE_ROUND if (is_conv_no_round) { @@ -948,7 +897,6 @@ } #endif } -#endif // CONFIG_COMPOUND_SEGMENT #if CONFIG_CONVOLVE_ROUND if (is_conv_no_round) { @@ -2867,17 +2815,10 @@ MACROBLOCKD_PLANE *const pd = &xd->plane[plane]; struct buf_2d *const dst_buf = &pd->dst; uint8_t *const dst = dst_buf->buf + dst_buf->stride * y + x; - const INTERINTER_COMPOUND_DATA comp_data = { -#if CONFIG_WEDGE - mbmi->wedge_index, - mbmi->wedge_sign, -#endif // CONFIG_WEDGE -#if CONFIG_COMPOUND_SEGMENT - mbmi->mask_type, - xd->seg_mask, -#endif // CONFIG_COMPOUND_SEGMENT - mbmi->interinter_compound_type - }; + const INTERINTER_COMPOUND_DATA comp_data = { mbmi->wedge_index, + mbmi->wedge_sign, + mbmi->mask_type, xd->seg_mask, + mbmi->interinter_compound_type }; #if CONFIG_COMPOUND_SINGLEREF if ((is_compound || is_inter_singleref_comp_mode(mbmi->mode)) && @@ -2886,7 +2827,6 @@ if (is_compound && is_masked_compound_type(mbmi->interinter_compound_type)) #endif // CONFIG_COMPOUND_SINGLEREF { -#if CONFIG_COMPOUND_SEGMENT if (!plane && comp_data.interinter_compound_type == COMPOUND_SEG) { #if CONFIG_HIGHBITDEPTH if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) @@ -2901,7 +2841,6 @@ ext_dst0, ext_dst_stride0, ext_dst1, ext_dst_stride1, mbmi->sb_type, h, w); } -#endif // CONFIG_COMPOUND_SEGMENT #if CONFIG_HIGHBITDEPTH if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH)
diff --git a/av1/common/reconinter.h b/av1/common/reconinter.h index 74cac24..bda783a 100644 --- a/av1/common/reconinter.h +++ b/av1/common/reconinter.h
@@ -231,13 +231,9 @@ (void)sb_type; switch (type) { case COMPOUND_AVERAGE: return sb_type >= BLOCK_4X4; -#if CONFIG_WEDGE case COMPOUND_WEDGE: return wedge_params_lookup[sb_type].bits > 0; -#endif // CONFIG_WEDGE -#if CONFIG_COMPOUND_SEGMENT case COMPOUND_SEG: return AOMMIN(block_size_wide[sb_type], block_size_high[sb_type]) >= 8; -#endif // CONFIG_COMPOUND_SEGMENT default: assert(0); return 0; } } @@ -271,7 +267,6 @@ return wedge_params_lookup[sb_type].bits; } -#if CONFIG_COMPOUND_SEGMENT void build_compound_seg_mask(uint8_t *mask, SEG_MASK_TYPE mask_type, const uint8_t *src0, int src0_stride, const uint8_t *src1, int src1_stride, @@ -282,7 +277,6 @@ const uint8_t *src1, int src1_stride, BLOCK_SIZE sb_type, int h, int w, int bd); #endif // CONFIG_HIGHBITDEPTH -#endif // CONFIG_COMPOUND_SEGMENT void av1_make_masked_inter_predictor( const uint8_t *pre, int pre_stride, uint8_t *dst, int dst_stride, @@ -527,11 +521,8 @@ int wedge_offset_y); const uint8_t *av1_get_compound_type_mask_inverse( - const INTERINTER_COMPOUND_DATA *const comp_data, -#if CONFIG_COMPOUND_SEGMENT - uint8_t *mask_buffer, int h, int w, int stride, -#endif - BLOCK_SIZE sb_type); + const INTERINTER_COMPOUND_DATA *const comp_data, uint8_t *mask_buffer, + int h, int w, int stride, BLOCK_SIZE sb_type); const uint8_t *av1_get_compound_type_mask( const INTERINTER_COMPOUND_DATA *const comp_data, BLOCK_SIZE sb_type);
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c index 01776f9..23e9900 100644 --- a/av1/decoder/decodeframe.c +++ b/av1/decoder/decodeframe.c
@@ -2740,7 +2740,6 @@ cm->allow_interintra_compound = 0; } #endif // CONFIG_INTERINTRA -#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT #if CONFIG_COMPOUND_SINGLEREF if (!frame_is_intra_only(cm)) { #else // !CONFIG_COMPOUND_SINGLEREF @@ -2750,7 +2749,6 @@ } else { cm->allow_masked_compound = 0; } -#endif // CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT } #if CONFIG_VAR_REFS @@ -3548,7 +3546,7 @@ } } #endif -#if CONFIG_WEDGE && !CONFIG_NEW_MULTISYMBOL +#if !CONFIG_NEW_MULTISYMBOL #if CONFIG_EXT_PARTITION_TYPES int block_sizes_to_update = BLOCK_SIZES_ALL; #else @@ -3559,7 +3557,7 @@ av1_diff_update_prob(&r, &fc->wedge_interintra_prob[i], ACCT_STR); } } -#endif // CONFIG_WEDGE +#endif // !CONFIG_NEW_MULTISYMBOL } #endif // CONFIG_INTERINTRA @@ -3613,10 +3611,8 @@ #if CONFIG_INTERINTRA assert(!memcmp(cm->counts.interintra, zero_counts.interintra, sizeof(cm->counts.interintra))); -#if CONFIG_WEDGE assert(!memcmp(cm->counts.wedge_interintra, zero_counts.wedge_interintra, sizeof(cm->counts.wedge_interintra))); -#endif // CONFIG_WEDGE #endif // CONFIG_INTERINTRA assert(!memcmp(cm->counts.compound_interinter, zero_counts.compound_interinter,
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c index dc0c291..b244031 100644 --- a/av1/decoder/decodemv.c +++ b/av1/decoder/decodemv.c
@@ -2611,36 +2611,28 @@ #endif // CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION ) { if (is_any_masked_compound_used(bsize)) { -#if CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE #if CONFIG_JNT_COMP if (cm->allow_masked_compound && mbmi->compound_idx) #else if (cm->allow_masked_compound) #endif // CONFIG_JNT_COMP { -#if CONFIG_WEDGE && CONFIG_COMPOUND_SEGMENT if (!is_interinter_compound_used(COMPOUND_WEDGE, bsize)) mbmi->interinter_compound_type = aom_read_bit(r, ACCT_STR) ? COMPOUND_AVERAGE : COMPOUND_SEG; else -#endif // CONFIG_WEDGE && CONFIG_COMPOUND_SEGMENT mbmi->interinter_compound_type = aom_read_symbol( r, ec_ctx->compound_type_cdf[bsize], COMPOUND_TYPES, ACCT_STR); -#if CONFIG_WEDGE if (mbmi->interinter_compound_type == COMPOUND_WEDGE) { assert(is_interinter_compound_used(COMPOUND_WEDGE, bsize)); mbmi->wedge_index = aom_read_literal(r, get_wedge_bits_lookup(bsize), ACCT_STR); mbmi->wedge_sign = aom_read_bit(r, ACCT_STR); } -#endif // CONFIG_WEDGE -#if CONFIG_COMPOUND_SEGMENT if (mbmi->interinter_compound_type == COMPOUND_SEG) { mbmi->mask_type = aom_read_literal(r, MAX_SEG_MASK_BITS, ACCT_STR); } -#endif // CONFIG_COMPOUND_SEGMENT } -#endif // CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE } else { mbmi->interinter_compound_type = COMPOUND_AVERAGE; }
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c index 6fc5d55..f2ef095 100644 --- a/av1/encoder/bitstream.c +++ b/av1/encoder/bitstream.c
@@ -76,9 +76,7 @@ #if CONFIG_INTERINTRA static struct av1_token interintra_mode_encodings[INTERINTRA_MODES]; #endif -#if CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE static struct av1_token compound_type_encodings[COMPOUND_TYPES]; -#endif // CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE #if CONFIG_LOOP_RESTORATION static void loop_restoration_write_sb_coeffs(const AV1_COMMON *const cm, MACROBLOCKD *xd, @@ -110,9 +108,7 @@ av1_tokens_from_tree(inter_singleref_comp_mode_encodings, av1_inter_singleref_comp_mode_tree); #endif // CONFIG_COMPOUND_SINGLEREF -#if CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE av1_tokens_from_tree(compound_type_encodings, av1_compound_type_tree); -#endif // CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE } static void write_intra_mode_kf(const AV1_COMMON *cm, FRAME_CONTEXT *frame_ctx, @@ -1757,34 +1753,26 @@ mbmi->motion_mode == SIMPLE_TRANSLATION && #endif // CONFIG_MOTION_VAR is_any_masked_compound_used(bsize)) { -#if CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE #if CONFIG_JNT_COMP if (cm->allow_masked_compound && mbmi->compound_idx) #else if (cm->allow_masked_compound) #endif // CONFIG_JNT_COMP { -#if CONFIG_WEDGE && CONFIG_COMPOUND_SEGMENT if (!is_interinter_compound_used(COMPOUND_WEDGE, bsize)) aom_write_bit(w, mbmi->interinter_compound_type == COMPOUND_AVERAGE); else -#endif // CONFIG_WEDGE && CONFIG_COMPOUND_SEGMENT aom_write_symbol(w, mbmi->interinter_compound_type, ec_ctx->compound_type_cdf[bsize], COMPOUND_TYPES); -#if CONFIG_WEDGE if (is_interinter_compound_used(COMPOUND_WEDGE, bsize) && mbmi->interinter_compound_type == COMPOUND_WEDGE) { aom_write_literal(w, mbmi->wedge_index, get_wedge_bits_lookup(bsize)); aom_write_bit(w, mbmi->wedge_sign); } -#endif // CONFIG_WEDGE -#if CONFIG_COMPOUND_SEGMENT if (mbmi->interinter_compound_type == COMPOUND_SEG) { aom_write_literal(w, mbmi->mask_type, MAX_SEG_MASK_BITS); } -#endif // CONFIG_COMPOUND_SEGMENT } -#endif // CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE } write_mb_interp_filter(cpi, xd, w); @@ -3824,7 +3812,6 @@ assert(cm->allow_interintra_compound == 0); } #endif // CONFIG_INTERINTRA -#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT #if CONFIG_COMPOUND_SINGLEREF if (!frame_is_intra_only(cm)) { #else // !CONFIG_COMPOUND_SINGLEREF @@ -3834,7 +3821,6 @@ } else { assert(cm->allow_masked_compound == 0); } -#endif // CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT } static void write_global_motion_params(const WarpedMotionParams *params, @@ -4615,7 +4601,7 @@ } } #endif -#if CONFIG_WEDGE && !CONFIG_NEW_MULTISYMBOL +#if !CONFIG_NEW_MULTISYMBOL #if CONFIG_EXT_PARTITION_TYPES int block_sizes_to_update = BLOCK_SIZES_ALL; #else @@ -4626,7 +4612,7 @@ av1_cond_prob_diff_update(header_bc, &fc->wedge_interintra_prob[i], cm->counts.wedge_interintra[i], probwt); } -#endif // CONFIG_WEDGE && CONFIG_NEW_MULTISYMBOL +#endif // !CONFIG_NEW_MULTISYMBOL } #endif // CONFIG_INTERINTRA
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c index b0d43f5..2381c77 100644 --- a/av1/encoder/encodeframe.c +++ b/av1/encoder/encodeframe.c
@@ -1261,18 +1261,12 @@ && mbmi->motion_mode == SIMPLE_TRANSLATION #endif // CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION ) { -#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT -#if CONFIG_WEDGE && CONFIG_COMPOUND_SEGMENT if (is_interinter_compound_used(COMPOUND_WEDGE, bsize)) { -#endif counts ->compound_interinter[bsize][mbmi->interinter_compound_type]++; update_cdf(fc->compound_type_cdf[bsize], mbmi->interinter_compound_type, COMPOUND_TYPES); -#if CONFIG_WEDGE && CONFIG_COMPOUND_SEGMENT } -#endif -#endif // CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT } } } @@ -4026,14 +4020,12 @@ if (frame_is_intra_only(cm) || cm->reference_mode == COMPOUND_REFERENCE) cm->allow_interintra_compound = 0; #endif // CONFIG_INTERINTRA -#if CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE #if CONFIG_COMPOUND_SINGLEREF if (frame_is_intra_only(cm)) #else // !CONFIG_COMPOUND_SINGLEREF if (frame_is_intra_only(cm) || cm->reference_mode == SINGLE_REFERENCE) #endif // CONFIG_COMPOUND_SINGLEREF cm->allow_masked_compound = 0; -#endif // CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE } void av1_encode_frame(AV1_COMP *cpi) {
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c index 259798d..e0476fb 100644 --- a/av1/encoder/encoder.c +++ b/av1/encoder/encoder.c
@@ -2435,9 +2435,7 @@ #if CONFIG_INTERINTRA cm->allow_interintra_compound = 1; #endif // CONFIG_INTERINTRA -#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT cm->allow_masked_compound = 1; -#endif // CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT } void av1_change_config(struct AV1_COMP *cpi, const AV1EncoderConfig *oxcf) {
diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c index 607745d..8dcaa88 100644 --- a/av1/encoder/rd.c +++ b/av1/encoder/rd.c
@@ -367,11 +367,9 @@ for (i = 0; i < INTER_MODE_CONTEXTS; ++i) av1_cost_tokens_from_cdf(x->inter_compound_mode_cost[i], fc->inter_compound_mode_cdf[i], NULL); -#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT for (i = 0; i < BLOCK_SIZES_ALL; ++i) av1_cost_tokens_from_cdf(x->compound_type_cost[i], fc->compound_type_cdf[i], NULL); -#endif // CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT #if CONFIG_COMPOUND_SINGLEREF for (i = 0; i < INTER_MODE_CONTEXTS; ++i) av1_cost_tokens_from_cdf(x->inter_singleref_comp_mode_cost[i],
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c index 174d7cf..e3d8219 100644 --- a/av1/encoder/rdopt.c +++ b/av1/encoder/rdopt.c
@@ -2500,7 +2500,6 @@ return 0; } -#if (CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT || CONFIG_INTERINTRA) static int64_t estimate_yrd_for_sb(const AV1_COMP *const cpi, BLOCK_SIZE bs, MACROBLOCK *x, int *r, int64_t *d, int *s, int64_t *sse, int64_t ref_best_rd) { @@ -2513,7 +2512,6 @@ *sse = rd_stats.sse; return rd; } -#endif // (CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT) static void choose_largest_tx_size(const AV1_COMP *const cpi, MACROBLOCK *x, RD_STATS *rd_stats, int64_t ref_best_rd, @@ -5667,22 +5665,16 @@ } } -#if (CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT) static int get_interinter_compound_type_bits(BLOCK_SIZE bsize, COMPOUND_TYPE comp_type) { (void)bsize; switch (comp_type) { case COMPOUND_AVERAGE: return 0; -#if CONFIG_WEDGE case COMPOUND_WEDGE: return get_interinter_wedge_bits(bsize); -#endif // CONFIG_WEDGE -#if CONFIG_COMPOUND_SEGMENT case COMPOUND_SEG: return 1; -#endif // CONFIG_COMPOUND_SEGMENT default: assert(0); return 0; } } -#endif // (CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT) typedef struct { int eobs; @@ -7007,7 +6999,6 @@ ref_idx); } -#if CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE static void do_masked_motion_search_indexed( const AV1_COMP *const cpi, MACROBLOCK *x, const int_mv *const cur_mv, const INTERINTER_COMPOUND_DATA *const comp_data, BLOCK_SIZE bsize, @@ -7056,7 +7047,6 @@ #endif // CONFIG_COMPOUND_SINGLEREF tmp_mv[1].as_int = frame_mv[rf[1]].as_int; } -#endif // CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE // In some situations we want to discount the apparent cost of a new motion // vector. Where there is a subtle motion field and especially where there is @@ -7088,7 +7078,6 @@ xd->mb_to_bottom_edge + RIGHT_BOTTOM_MARGIN); } -#if CONFIG_WEDGE static int estimate_wedge_sign(const AV1_COMP *cpi, const MACROBLOCK *x, const BLOCK_SIZE bsize, const uint8_t *pred0, int stride0, const uint8_t *pred1, int stride1) { @@ -7131,7 +7120,6 @@ (int64_t)(esq[0][3] + esq[0][1] + esq[0][2]); return (tl + br > 0); } -#endif // CONFIG_WEDGE #if !CONFIG_DUAL_FILTER static InterpFilter predict_interp_filter( @@ -7218,7 +7206,6 @@ #endif // !CONFIG_DUAL_FILTER // Choose the best wedge index and sign -#if CONFIG_WEDGE static int64_t pick_wedge(const AV1_COMP *const cpi, const MACROBLOCK *const x, const BLOCK_SIZE bsize, const uint8_t *const p0, const uint8_t *const p1, int *const best_wedge_sign, @@ -7391,9 +7378,7 @@ mbmi->wedge_index = wedge_index; return rd; } -#endif // CONFIG_WEDGE -#if CONFIG_COMPOUND_SEGMENT static int64_t pick_interinter_seg(const AV1_COMP *const cpi, MACROBLOCK *const x, const BLOCK_SIZE bsize, const uint8_t *const p0, @@ -7477,9 +7462,8 @@ return best_rd; } -#endif // CONFIG_COMPOUND_SEGMENT -#if CONFIG_WEDGE && CONFIG_INTERINTRA +#if CONFIG_INTERINTRA static int64_t pick_interintra_wedge(const AV1_COMP *const cpi, const MACROBLOCK *const x, const BLOCK_SIZE bsize, @@ -7500,9 +7484,8 @@ mbmi->interintra_wedge_index = wedge_index; return rd; } -#endif // CONFIG_WEDGE && CONFIG_INTERINTRA +#endif // CONFIG_INTERINTRA -#if CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE static int64_t pick_interinter_mask(const AV1_COMP *const cpi, MACROBLOCK *x, const BLOCK_SIZE bsize, const uint8_t *const p0, @@ -7510,12 +7493,8 @@ const COMPOUND_TYPE compound_type = x->e_mbd.mi[0]->mbmi.interinter_compound_type; switch (compound_type) { -#if CONFIG_WEDGE case COMPOUND_WEDGE: return pick_interinter_wedge(cpi, x, bsize, p0, p1); -#endif // CONFIG_WEDGE -#if CONFIG_COMPOUND_SEGMENT case COMPOUND_SEG: return pick_interinter_seg(cpi, x, bsize, p0, p1); -#endif // CONFIG_COMPOUND_SEGMENT default: assert(0); return 0; } } @@ -7528,14 +7507,7 @@ int_mv tmp_mv[2]; int tmp_rate_mv = 0; const INTERINTER_COMPOUND_DATA compound_data = { -#if CONFIG_WEDGE - mbmi->wedge_index, - mbmi->wedge_sign, -#endif // CONFIG_WEDGE -#if CONFIG_COMPOUND_SEGMENT - mbmi->mask_type, - xd->seg_mask, -#endif // CONFIG_COMPOUND_SEGMENT + mbmi->wedge_index, mbmi->wedge_sign, mbmi->mask_type, xd->seg_mask, mbmi->interinter_compound_type }; #if CONFIG_COMPOUND_SINGLEREF @@ -7623,7 +7595,6 @@ } return best_rd_cur; } -#endif // CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE typedef struct { #if CONFIG_MOTION_VAR @@ -8318,9 +8289,7 @@ int_mv cur_mv[2]; int rate_mv = 0; int pred_exists = 1; -#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT || CONFIG_INTERINTRA const int bw = block_size_wide[bsize]; -#endif // CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT int_mv single_newmv[TOTAL_REFS_PER_FRAME]; #if CONFIG_INTERINTRA const int *const interintra_mode_cost = @@ -8357,10 +8326,8 @@ int compmode_interintra_cost = 0; mbmi->use_wedge_interintra = 0; #endif -#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT int compmode_interinter_cost = 0; mbmi->interinter_compound_type = COMPOUND_AVERAGE; -#endif #if CONFIG_LGT_FROM_PRED mbmi->use_lgt = 0; #endif @@ -8590,7 +8557,6 @@ rate_mv_bmc = rate_mv; #endif // CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION -#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT #if CONFIG_COMPOUND_SINGLEREF if (is_comp_pred || is_singleref_comp_mode) #else @@ -8616,19 +8582,15 @@ int strides[1] = { bw }; int tmp_rate_mv; int masked_compound_used = is_any_masked_compound_used(bsize); -#if CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE masked_compound_used = masked_compound_used && cm->allow_masked_compound; -#endif // CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE COMPOUND_TYPE cur_type; int best_compmode_interinter_cost = 0; best_mv[0].as_int = cur_mv[0].as_int; best_mv[1].as_int = cur_mv[1].as_int; memset(&best_compound_data, 0, sizeof(best_compound_data)); -#if CONFIG_COMPOUND_SEGMENT uint8_t tmp_mask_buf[2 * MAX_SB_SQUARE]; best_compound_data.seg_mask = tmp_mask_buf; -#endif // CONFIG_COMPOUND_SEGMENT #if CONFIG_COMPOUND_SINGLEREF // TODO(zoeliu): To further check whether the following setups are needed. @@ -8657,11 +8619,9 @@ mbmi->interinter_compound_type = cur_type; int masked_type_cost = 0; if (masked_compound_used) { -#if CONFIG_WEDGE && CONFIG_COMPOUND_SEGMENT if (!is_interinter_compound_used(COMPOUND_WEDGE, bsize)) masked_type_cost += av1_cost_literal(1); else -#endif // CONFIG_WEDGE && CONFIG_COMPOUND_SEGMENT masked_type_cost += x->compound_type_cost[bsize][mbmi->interinter_compound_type]; } @@ -8681,7 +8641,6 @@ best_rd_cur = RDCOST(x->rdmult, rs2 + rate_mv + rate_sum, dist_sum); best_rd_compound = best_rd_cur; break; -#if CONFIG_WEDGE case COMPOUND_WEDGE: if (x->source_variance > cpi->sf.disable_wedge_search_var_thresh && best_rd_compound / 3 < ref_best_rd) { @@ -8690,8 +8649,6 @@ &tmp_rate_mv, preds0, preds1, strides, mi_row, mi_col); } break; -#endif // CONFIG_WEDGE -#if CONFIG_COMPOUND_SEGMENT case COMPOUND_SEG: if (x->source_variance > cpi->sf.disable_wedge_search_var_thresh && best_rd_compound / 3 < ref_best_rd) { @@ -8700,21 +8657,16 @@ &tmp_rate_mv, preds0, preds1, strides, mi_row, mi_col); } break; -#endif // CONFIG_COMPOUND_SEGMENT default: assert(0); return 0; } if (best_rd_cur < best_rd_compound) { best_rd_compound = best_rd_cur; -#if CONFIG_WEDGE best_compound_data.wedge_index = mbmi->wedge_index; best_compound_data.wedge_sign = mbmi->wedge_sign; -#endif // CONFIG_WEDGE -#if CONFIG_COMPOUND_SEGMENT best_compound_data.mask_type = mbmi->mask_type; memcpy(best_compound_data.seg_mask, xd->seg_mask, 2 * MAX_SB_SQUARE * sizeof(uint8_t)); -#endif // CONFIG_COMPOUND_SEGMENT best_compound_data.interinter_compound_type = mbmi->interinter_compound_type; best_compmode_interinter_cost = rs2; @@ -8733,15 +8685,11 @@ mbmi->mv[0].as_int = cur_mv[0].as_int; mbmi->mv[1].as_int = cur_mv[1].as_int; } -#if CONFIG_WEDGE mbmi->wedge_index = best_compound_data.wedge_index; mbmi->wedge_sign = best_compound_data.wedge_sign; -#endif // CONFIG_WEDGE -#if CONFIG_COMPOUND_SEGMENT mbmi->mask_type = best_compound_data.mask_type; memcpy(xd->seg_mask, best_compound_data.seg_mask, 2 * MAX_SB_SQUARE * sizeof(uint8_t)); -#endif // CONFIG_COMPOUND_SEGMENT mbmi->interinter_compound_type = best_compound_data.interinter_compound_type; if (have_newmv_in_inter_mode(this_mode)) { @@ -8764,7 +8712,6 @@ compmode_interinter_cost = best_compmode_interinter_cost; } -#endif // CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT #if CONFIG_INTERINTRA if (is_comp_interintra_pred) { @@ -8826,7 +8773,6 @@ // Don't need to call restore_dst_buf here return INT64_MAX; } -#if CONFIG_WEDGE if (is_interintra_wedge_used(bsize)) { int64_t best_interintra_rd_nowedge = INT64_MAX; int64_t best_interintra_rd_wedge = INT64_MAX; @@ -8895,7 +8841,6 @@ mbmi->use_wedge_interintra = 0; } } -#endif // CONFIG_WEDGE pred_exists = 0; compmode_interintra_cost = x->interintra_cost[size_group_lookup[bsize]][1] + @@ -8956,9 +8901,7 @@ rate2_bmc_nocoeff += compmode_interintra_cost; #endif #endif -#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT rd_stats->rate += compmode_interinter_cost; -#endif ret_val = motion_mode_rd( cpi, x, bsize, rd_stats, rd_stats_y, rd_stats_uv, disable_skip, mode_mv,
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake index 6e6bda7..2d7ebb3 100644 --- a/build/cmake/aom_config_defaults.cmake +++ b/build/cmake/aom_config_defaults.cmake
@@ -116,7 +116,6 @@ set(CONFIG_COEF_INTERLEAVE 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_COLORSPACE_HEADERS 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_COMPOUND_ROUND 0 CACHE NUMBER "AV1 experiment flag.") -set(CONFIG_COMPOUND_SEGMENT 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_COMPOUND_SINGLEREF 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_CONVOLVE_ROUND 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_CTX1D 0 CACHE NUMBER "AV1 experiment flag.") @@ -204,5 +203,4 @@ set(CONFIG_VAR_REFS 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_VAR_TX_NO_TX_MODE 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_WARPED_MOTION 1 CACHE NUMBER "AV1 experiment flag.") -set(CONFIG_WEDGE 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_XIPHRC 0 CACHE NUMBER "AV1 experiment flag.")
diff --git a/configure b/configure index 6c7c5ad..a437fa3 100755 --- a/configure +++ b/configure
@@ -263,8 +263,6 @@ ext_intra_mod intrabc interintra - wedge - compound_segment new_quant ans loop_restoration @@ -510,8 +508,6 @@ soft_enable dual_filter soft_enable motion_var soft_enable warped_motion - soft_enable wedge - soft_enable compound_segment soft_enable interintra soft_enable one_sided_compound soft_enable convolve_round