Remove TPL_MV experiment This experiment has been abandonned for AV1. Change-Id: Ief159fa7cf41dafa1e71b140f585cbc5a7d0a67d
diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c index c8e30a4..fbda1c6 100644 --- a/av1/common/mvref_common.c +++ b/av1/common/mvref_common.c
@@ -816,17 +816,6 @@ ? mi_size_wide[BLOCK_8X8] : mi_size_wide[BLOCK_16X16]; -#if CONFIG_TPL_MV - // Modified sample positions to be consistent with frame_mvs - // spatial resolution. - int tpl_sample_pos[5][2] = { { -1, xd->n8_w }, - { 0, xd->n8_w }, - { xd->n8_h, xd->n8_w }, - { xd->n8_h, 0 }, - { xd->n8_h, -1 } }; - int i; -#endif - for (blk_row = 0; blk_row < xd->n8_h; blk_row += mi_step) { for (blk_col = 0; blk_col < xd->n8_w; blk_col += mi_step) { #if CONFIG_TMV @@ -848,22 +837,6 @@ } } -#if CONFIG_TPL_MV - for (i = 0; i < 5; ++i) { - blk_row = tpl_sample_pos[i][0]; - blk_col = tpl_sample_pos[i][1]; -#if CONFIG_TMV - coll_blk_count += add_col_ref_mv( - cm, prev_frame_mvs_base, prev_frame_mvs_stride, xd, tmi_row, tmi_col, - ref_frame, blk_row, blk_col, refmv_count, ref_mv_stack, mode_context); -#else - coll_blk_count += add_col_ref_mv( - cm, prev_frame_mvs_base, prev_frame_mvs_stride, xd, mi_row, mi_col, - ref_frame, blk_row, blk_col, refmv_count, ref_mv_stack, mode_context); -#endif // CONFIG_TMV - } -#endif - if (coll_blk_count == 0) mode_context[ref_frame] |= (1 << GLOBALMV_OFFSET); } else { mode_context[ref_frame] |= (1 << GLOBALMV_OFFSET);
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake index ac9709b..3591914 100644 --- a/build/cmake/aom_config_defaults.cmake +++ b/build/cmake/aom_config_defaults.cmake
@@ -188,7 +188,6 @@ set(CONFIG_STRIPED_LOOP_RESTORATION 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_TEMPMV_SIGNALING 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_TMV 1 CACHE NUMBER "AV1 experiment flag.") -set(CONFIG_TPL_MV 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_TX64X64 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_TXK_SEL 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_TXMG 1 CACHE NUMBER "AV1 experiment flag.")
diff --git a/configure b/configure index 20483dd..9e0017c 100755 --- a/configure +++ b/configure
@@ -250,7 +250,6 @@ cdef_singlepass rect_tx_ext rect_tx_ext_intra - tpl_mv short_filter dual_filter convolve_round