Commit 24e0a184 authored by Jingning Han's avatar Jingning Han

Merge simp_pred_mv changes into ref_mv

Merge the modifications in simp_pred_mv to ref_mv.

Change-Id: I5662124c1ac7133d76697522f06e42b277a4ad8d
parent 4a97d6ac
......@@ -405,8 +405,7 @@ static void setup_ref_mv_list(const AV1_COMMON *cm, const MACROBLOCKD *xd,
mode_context[ref_frame] |= (1 << ZEROMV_OFFSET);
}
// Scan the second outer area.
#if CONFIG_SIMP_MV_PRED
// Scan the second outer area.
scan_blk_mbmi(cm, xd, mi_row, mi_col, block, rf, -1, -1, ref_mv_stack,
refmv_count);
for (idx = 2; idx <= 3; ++idx) {
......@@ -417,14 +416,6 @@ static void setup_ref_mv_list(const AV1_COMMON *cm, const MACROBLOCKD *xd,
}
scan_col_mbmi(cm, xd, mi_row, mi_col, block, rf, -4, ref_mv_stack,
refmv_count);
#else
for (idx = 2; idx <= 4; ++idx) {
scan_row_mbmi(cm, xd, mi_row, mi_col, block, rf, -idx, ref_mv_stack,
refmv_count);
scan_col_mbmi(cm, xd, mi_row, mi_col, block, rf, -idx, ref_mv_stack,
refmv_count);
}
#endif
switch (nearest_refmv_count) {
case 0:
......
......@@ -289,15 +289,9 @@ static INLINE int_mv get_sub_block_mv(const MODE_INFO *candidate, int which_mv,
static INLINE int_mv get_sub_block_pred_mv(const MODE_INFO *candidate,
int which_mv, int search_col,
int block_idx) {
#if CONFIG_SIMP_MV_PRED
(void)search_col;
(void)block_idx;
return candidate->mbmi.mv[which_mv];
#else
return block_idx >= 0 && candidate->mbmi.sb_type < BLOCK_8X8
? candidate
->bmi[idx_n_column_to_subblock[block_idx][search_col == 0]]
.pred_mv[which_mv]
: candidate->mbmi.pred_mv[which_mv];
#endif
}
#endif
......
......@@ -4423,7 +4423,7 @@ void av1_decode_frame(AV1Decoder *pbi, const uint8_t *data,
aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
"Truncated packet or corrupt header length");
#if CONFIG_SIMP_MV_PRED
#if CONFIG_REF_MV
cm->setup_mi(cm);
#endif
......
......@@ -4823,7 +4823,7 @@ static void encode_frame_internal(AV1_COMP *cpi) {
x->min_partition_size = AOMMIN(x->min_partition_size, cm->sb_size);
x->max_partition_size = AOMMIN(x->max_partition_size, cm->sb_size);
#if CONFIG_SIMP_MV_PRED
#if CONFIG_REF_MV
cm->setup_mi(cm);
#endif
......
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