Remove experimental flag of MV_COMPRESS This experiment has been adopted, we can simplify the code by dropping the associated preprocessor conditionals. Change-Id: Iba2f4637c429780ed8d5f20730557524f8b3c607
diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c index de11373..397da1b 100644 --- a/av1/common/mvref_common.c +++ b/av1/common/mvref_common.c
@@ -460,13 +460,8 @@ (void)gm_mv_candidates; -#if CONFIG_MV_COMPRESS mi_pos.row = (mi_row & 0x01) ? blk_row : blk_row + 1; mi_pos.col = (mi_col & 0x01) ? blk_col : blk_col + 1; -#else - mi_pos.row = blk_row; - mi_pos.col = blk_col; -#endif if (!is_inside(&xd->tile, mi_col, mi_row, cm->mi_rows, cm, &mi_pos)) return coll_blk_count; @@ -623,13 +618,8 @@ mi_pos.row = blk_row; mi_pos.col = blk_col; #else -#if CONFIG_MV_COMPRESS mi_pos.row = (mi_row & 0x01) ? blk_row : blk_row + 1; mi_pos.col = (mi_col & 0x01) ? blk_col : blk_col + 1; -#else - mi_pos.row = blk_row; - mi_pos.col = blk_col; -#endif #endif // CONFIG_TMV if (!is_inside(&xd->tile, mi_col, mi_row, cm->mi_rows, cm, &mi_pos)) @@ -692,19 +682,12 @@ : NULL; #else const int prev_frame_mvs_stride = cm->mi_cols; -#if CONFIG_MV_COMPRESS const MV_REF *const prev_frame_mvs_base = cm->use_prev_frame_mvs ? cm->prev_frame->mvs + (((mi_row >> 1) << 1) + 1) * prev_frame_mvs_stride + ((mi_col >> 1) << 1) + 1 : NULL; -#else - const MV_REF *const prev_frame_mvs_base = - cm->use_prev_frame_mvs - ? cm->prev_frame->mvs + mi_row * prev_frame_mvs_stride + mi_col - : NULL; -#endif #endif // CONFIG_TMV const int bs = AOMMAX(xd->n8_w, xd->n8_h); @@ -1014,7 +997,6 @@ (tmi_col >> 1) : NULL; #else -#if CONFIG_MV_COMPRESS const TileInfo *const tile_ = &xd->tile; int mi_row_end = tile_->mi_row_end; int mi_col_end = tile_->mi_col_end; @@ -1027,12 +1009,6 @@ AOMMIN(((mi_col >> 1) << 1) + 1 + (((xd->n8_w - 1) >> 1) << 1), mi_col_end - 1) : NULL; -#else - const MV_REF *const prev_frame_mvs = - cm->use_prev_frame_mvs - ? cm->prev_frame->mvs + mi_row * cm->mi_cols + mi_col - : NULL; -#endif // CONFIG_MV_COMPRESS #endif // CONFIG_TMV #endif // CONFIG_MFMV
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake index 1a6494f..a48d42f 100644 --- a/build/cmake/aom_config_defaults.cmake +++ b/build/cmake/aom_config_defaults.cmake
@@ -134,7 +134,6 @@ set(CONFIG_MAX_TILE 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_MFMV 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_MONO_VIDEO 1 CACHE NUMBER "AV1 experiment flag.") -set(CONFIG_MV_COMPRESS 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_NEW_QUANT 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_NO_FRAME_CONTEXT_SIGNALING 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_OBU 1 CACHE NUMBER "AV1 experiment flag.")