Commit b0e7c1a2 authored by Sebastien Alaiwan's avatar Sebastien Alaiwan

Remove TPL_MV experiment

This experiment has been abandonned for AV1.

Change-Id: Ief159fa7cf41dafa1e71b140f585cbc5a7d0a67d
parent c3ef32a4
......@@ -816,17 +816,6 @@ static void setup_ref_mv_list(const AV1_COMMON *cm, const MACROBLOCKD *xd,
? 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 @@ static void setup_ref_mv_list(const AV1_COMMON *cm, const MACROBLOCKD *xd,
}
}
#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);
......
......@@ -188,7 +188,6 @@ set(CONFIG_SIMPLIFY_TX_MODE 0 CACHE NUMBER "AV1 experiment flag.")
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.")
......
......@@ -250,7 +250,6 @@ EXPERIMENT_LIST="
cdef_singlepass
rect_tx_ext
rect_tx_ext_intra
tpl_mv
short_filter
dual_filter
convolve_round
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment