generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename pred_mv_s8 to pred_mv

Browse Source 
Change-Id: Ib1088c3fc80952074e098385fe5eb81742e7dc59
This commit is contained in:
Yaowu Xu
2016-09-26 09:13:38 -07:00
parent d9470c20df
commit f5bbbfad1d
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
av1/encoder/rdopt.c
View File

@@ -4264,11 +4264,11 @@ static int set_and_cost_bmi_mvs(AV1_COMP *cpi, MACROBLOCK *x, MACROBLOCKD *xd,
#if CONFIG_REF_MV
if (mode == NEWMV) {
mic->bmi[i].pred_mv_s8[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;
mic->bmi[i].pred_mv[0].as_int = best_ref_mv[0]->as_int;
if (is_compound) mic->bmi[i].pred_mv[1].as_int = best_ref_mv[1]->as_int;
} else {
mic->bmi[i].pred_mv_s8[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;
mic->bmi[i].pred_mv[0].as_int = this_mv[0].as_int;
if (is_compound) mic->bmi[i].pred_mv[1].as_int = this_mv[1].as_int;
}
#endif
@@ -5325,13 +5325,13 @@ static int64_t rd_pick_best_sub8x8_mode(
mode_mv[this_mode][ref].as_int;
#if CONFIG_REF_MV
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)
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)
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
#if CONFIG_EXT_INTER
bsi->rdstat[i][mode_idx].ref_mv[ref].as_int =
@@ -5556,9 +5556,9 @@ static int64_t rd_pick_best_sub8x8_mode(
if (has_second_ref(mbmi))
mi->bmi[idx].as_mv[1].as_int = bsi->rdstat[idx][mode_idx].mvs[1].as_int;
#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))
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
#if CONFIG_EXT_INTER
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,
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;
#if CONFIG_REF_MV
mbmi->pred_mv[0].as_int = xd->mi[0]->bmi[3].pred_mv_s8[0].as_int;
mbmi->pred_mv[1].as_int = xd->mi[0]->bmi[3].pred_mv_s8[1].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[1].as_int;
#endif
}