Commit c7d6eaa5 authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review

Merge "rename pred_mv_s8 to pred_mv" into nextgenv2

parents f94296de f5bbbfad
...@@ -146,7 +146,7 @@ typedef struct { ...@@ -146,7 +146,7 @@ typedef struct {
PREDICTION_MODE as_mode; PREDICTION_MODE as_mode;
int_mv as_mv[2]; // first, second inter predictor motion vectors int_mv as_mv[2]; // first, second inter predictor motion vectors
#if CONFIG_REF_MV #if CONFIG_REF_MV
int_mv pred_mv_s8[2]; int_mv pred_mv[2];
#endif #endif
#if CONFIG_EXT_INTER #if CONFIG_EXT_INTER
int_mv ref_mv[2]; int_mv ref_mv[2];
......
...@@ -282,7 +282,7 @@ static INLINE int_mv get_sub_block_pred_mv(const MODE_INFO *candidate, ...@@ -282,7 +282,7 @@ static INLINE int_mv get_sub_block_pred_mv(const MODE_INFO *candidate,
return block_idx >= 0 && candidate->mbmi.sb_type < BLOCK_8X8 return block_idx >= 0 && candidate->mbmi.sb_type < BLOCK_8X8
? candidate ? candidate
->bmi[idx_n_column_to_subblock[block_idx][search_col == 0]] ->bmi[idx_n_column_to_subblock[block_idx][search_col == 0]]
.pred_mv_s8[which_mv] .pred_mv[which_mv]
: candidate->mbmi.pred_mv[which_mv]; : candidate->mbmi.pred_mv[which_mv];
} }
#endif #endif
......
...@@ -951,7 +951,7 @@ static INLINE int assign_mv(AV1_COMMON *cm, MACROBLOCKD *xd, ...@@ -951,7 +951,7 @@ static INLINE int assign_mv(AV1_COMMON *cm, MACROBLOCKD *xd,
MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi; MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;
BLOCK_SIZE bsize = mbmi->sb_type; BLOCK_SIZE bsize = mbmi->sb_type;
int_mv *pred_mv = int_mv *pred_mv =
(bsize >= BLOCK_8X8) ? mbmi->pred_mv : xd->mi[0]->bmi[block].pred_mv_s8; (bsize >= BLOCK_8X8) ? mbmi->pred_mv : xd->mi[0]->bmi[block].pred_mv;
#endif #endif
(void)ref_frame; (void)ref_frame;
...@@ -1462,8 +1462,8 @@ static void read_inter_block_mode_info(AV1Decoder *const pbi, ...@@ -1462,8 +1462,8 @@ static void read_inter_block_mode_info(AV1Decoder *const pbi,
} }
#if CONFIG_REF_MV #if CONFIG_REF_MV
mbmi->pred_mv[0].as_int = mi->bmi[3].pred_mv_s8[0].as_int; mbmi->pred_mv[0].as_int = mi->bmi[3].pred_mv[0].as_int;
mbmi->pred_mv[1].as_int = mi->bmi[3].pred_mv_s8[1].as_int; mbmi->pred_mv[1].as_int = mi->bmi[3].pred_mv[1].as_int;
#endif #endif
mi->mbmi.mode = b_mode; mi->mbmi.mode = b_mode;
......
...@@ -1269,7 +1269,7 @@ static void pack_inter_mode_mvs(AV1_COMP *cpi, const MODE_INFO *mi, ...@@ -1269,7 +1269,7 @@ static void pack_inter_mode_mvs(AV1_COMP *cpi, const MODE_INFO *mi,
#endif #endif
#else #else
#if CONFIG_REF_MV #if CONFIG_REF_MV
&mi->bmi[j].pred_mv_s8[ref].as_mv, is_compound, &mi->bmi[j].pred_mv[ref].as_mv, is_compound,
#else #else
&mbmi_ext->ref_mvs[mbmi->ref_frame[ref]][0].as_mv, &mbmi_ext->ref_mvs[mbmi->ref_frame[ref]][0].as_mv,
#endif // CONFIG_REF_MV #endif // CONFIG_REF_MV
......
...@@ -430,7 +430,7 @@ void av1_update_mv_count(ThreadData *td) { ...@@ -430,7 +430,7 @@ void av1_update_mv_count(ThreadData *td) {
if (mi->bmi[i].as_mode == NEWMV) if (mi->bmi[i].as_mode == NEWMV)
inc_mvs(mbmi, mbmi_ext, mi->bmi[i].as_mv, inc_mvs(mbmi, mbmi_ext, mi->bmi[i].as_mv,
#if CONFIG_REF_MV #if CONFIG_REF_MV
mi->bmi[i].pred_mv_s8, td->counts->mv); mi->bmi[i].pred_mv, td->counts->mv);
#else #else
&td->counts->mv); &td->counts->mv);
#endif #endif
......
...@@ -4264,11 +4264,11 @@ static int set_and_cost_bmi_mvs(AV1_COMP *cpi, MACROBLOCK *x, MACROBLOCKD *xd, ...@@ -4264,11 +4264,11 @@ static int set_and_cost_bmi_mvs(AV1_COMP *cpi, MACROBLOCK *x, MACROBLOCKD *xd,
#if CONFIG_REF_MV #if CONFIG_REF_MV
if (mode == NEWMV) { if (mode == NEWMV) {
mic->bmi[i].pred_mv_s8[0].as_int = best_ref_mv[0]->as_int; mic->bmi[i].pred_mv[0].as_int = best_ref_mv[0]->as_int;
if (is_compound) mic->bmi[i].pred_mv_s8[1].as_int = best_ref_mv[1]->as_int; if (is_compound) mic->bmi[i].pred_mv[1].as_int = best_ref_mv[1]->as_int;
} else { } else {
mic->bmi[i].pred_mv_s8[0].as_int = this_mv[0].as_int; mic->bmi[i].pred_mv[0].as_int = this_mv[0].as_int;
if (is_compound) mic->bmi[i].pred_mv_s8[1].as_int = this_mv[1].as_int; if (is_compound) mic->bmi[i].pred_mv[1].as_int = this_mv[1].as_int;
} }
#endif #endif
...@@ -5325,13 +5325,13 @@ static int64_t rd_pick_best_sub8x8_mode( ...@@ -5325,13 +5325,13 @@ static int64_t rd_pick_best_sub8x8_mode(
mode_mv[this_mode][ref].as_int; mode_mv[this_mode][ref].as_int;
#if CONFIG_REF_MV #if CONFIG_REF_MV
bsi->rdstat[i][mode_idx].pred_mv[ref].as_int = bsi->rdstat[i][mode_idx].pred_mv[ref].as_int =
mi->bmi[i].pred_mv_s8[ref].as_int; mi->bmi[i].pred_mv[ref].as_int;
if (num_4x4_blocks_wide > 1) if (num_4x4_blocks_wide > 1)
bsi->rdstat[i + 1][mode_idx].pred_mv[ref].as_int = bsi->rdstat[i + 1][mode_idx].pred_mv[ref].as_int =
mi->bmi[i].pred_mv_s8[ref].as_int; mi->bmi[i].pred_mv[ref].as_int;
if (num_4x4_blocks_high > 1) if (num_4x4_blocks_high > 1)
bsi->rdstat[i + 2][mode_idx].pred_mv[ref].as_int = bsi->rdstat[i + 2][mode_idx].pred_mv[ref].as_int =
mi->bmi[i].pred_mv_s8[ref].as_int; mi->bmi[i].pred_mv[ref].as_int;
#endif #endif
#if CONFIG_EXT_INTER #if CONFIG_EXT_INTER
bsi->rdstat[i][mode_idx].ref_mv[ref].as_int = bsi->rdstat[i][mode_idx].ref_mv[ref].as_int =
...@@ -5556,9 +5556,9 @@ static int64_t rd_pick_best_sub8x8_mode( ...@@ -5556,9 +5556,9 @@ static int64_t rd_pick_best_sub8x8_mode(
if (has_second_ref(mbmi)) if (has_second_ref(mbmi))
mi->bmi[idx].as_mv[1].as_int = bsi->rdstat[idx][mode_idx].mvs[1].as_int; mi->bmi[idx].as_mv[1].as_int = bsi->rdstat[idx][mode_idx].mvs[1].as_int;
#if CONFIG_REF_MV #if CONFIG_REF_MV
mi->bmi[idx].pred_mv_s8[0] = bsi->rdstat[idx][mode_idx].pred_mv[0]; mi->bmi[idx].pred_mv[0] = bsi->rdstat[idx][mode_idx].pred_mv[0];
if (has_second_ref(mbmi)) if (has_second_ref(mbmi))
mi->bmi[idx].pred_mv_s8[1] = bsi->rdstat[idx][mode_idx].pred_mv[1]; mi->bmi[idx].pred_mv[1] = bsi->rdstat[idx][mode_idx].pred_mv[1];
#endif #endif
#if CONFIG_EXT_INTER #if CONFIG_EXT_INTER
mi->bmi[idx].ref_mv[0].as_int = bsi->rdstat[idx][mode_idx].ref_mv[0].as_int; mi->bmi[idx].ref_mv[0].as_int = bsi->rdstat[idx][mode_idx].ref_mv[0].as_int;
...@@ -10682,8 +10682,8 @@ void av1_rd_pick_inter_mode_sub8x8(struct AV1_COMP *cpi, TileDataEnc *tile_data, ...@@ -10682,8 +10682,8 @@ void av1_rd_pick_inter_mode_sub8x8(struct AV1_COMP *cpi, TileDataEnc *tile_data,
mbmi->mv[0].as_int = xd->mi[0]->bmi[3].as_mv[0].as_int; mbmi->mv[0].as_int = xd->mi[0]->bmi[3].as_mv[0].as_int;
mbmi->mv[1].as_int = xd->mi[0]->bmi[3].as_mv[1].as_int; mbmi->mv[1].as_int = xd->mi[0]->bmi[3].as_mv[1].as_int;
#if CONFIG_REF_MV #if CONFIG_REF_MV
mbmi->pred_mv[0].as_int = xd->mi[0]->bmi[3].pred_mv_s8[0].as_int; mbmi->pred_mv[0].as_int = xd->mi[0]->bmi[3].pred_mv[0].as_int;
mbmi->pred_mv[1].as_int = xd->mi[0]->bmi[3].pred_mv_s8[1].as_int; mbmi->pred_mv[1].as_int = xd->mi[0]->bmi[3].pred_mv[1].as_int;
#endif #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