Commit 41ae3d02 authored by Dmitry Kovalev's avatar Dmitry Kovalev

Removing two unused arguments from vp9_inc_mv signature.

Change-Id: Ieffea49eb7a5e5092f21f8694c546aff69b07c6d
parent 5b65a71c
...@@ -187,11 +187,9 @@ static void counts_to_context(nmv_component_counts *mvcomp, int usehp) { ...@@ -187,11 +187,9 @@ static void counts_to_context(nmv_component_counts *mvcomp, int usehp) {
} }
} }
void vp9_inc_mv(const MV *mv, const MV *ref, nmv_context_counts *mvctx, void vp9_inc_mv(const MV *mv, nmv_context_counts *mvctx) {
int usehp) {
const MV_JOINT_TYPE j = vp9_get_mv_joint(mv); const MV_JOINT_TYPE j = vp9_get_mv_joint(mv);
mvctx->joints[j]++; mvctx->joints[j]++;
usehp = usehp && vp9_use_mv_hp(ref);
if (mv_joint_vertical(j)) if (mv_joint_vertical(j))
inc_mv_component_count(mv->row, &mvctx->comps[0], 1); inc_mv_component_count(mv->row, &mvctx->comps[0], 1);
......
...@@ -128,8 +128,7 @@ typedef struct { ...@@ -128,8 +128,7 @@ typedef struct {
nmv_component_counts comps[2]; nmv_component_counts comps[2];
} nmv_context_counts; } nmv_context_counts;
void vp9_inc_mv(const MV *mv, const MV *ref, nmv_context_counts *mvctx, void vp9_inc_mv(const MV *mv, nmv_context_counts *mvctx);
int usehp);
void vp9_counts_process(nmv_context_counts *NMVcount, int usehp); void vp9_counts_process(nmv_context_counts *NMVcount, int usehp);
......
...@@ -255,7 +255,7 @@ static INLINE void read_mv(vp9_reader *r, MV *mv, const MV *ref, ...@@ -255,7 +255,7 @@ static INLINE void read_mv(vp9_reader *r, MV *mv, const MV *ref,
if (mv_joint_horizontal(j)) if (mv_joint_horizontal(j))
diff.col = read_mv_component(r, &ctx->comps[1], usehp); diff.col = read_mv_component(r, &ctx->comps[1], usehp);
vp9_inc_mv(&diff, ref, counts, usehp); vp9_inc_mv(&diff, counts);
mv->row = ref->row + diff.row; mv->row = ref->row + diff.row;
mv->col = ref->col + diff.col; mv->col = ref->col + diff.col;
......
...@@ -581,44 +581,41 @@ void vp9_build_nmv_cost_table(int *mvjoint, ...@@ -581,44 +581,41 @@ void vp9_build_nmv_cost_table(int *mvjoint,
void vp9_update_nmv_count(VP9_COMP *cpi, MACROBLOCK *x, void vp9_update_nmv_count(VP9_COMP *cpi, MACROBLOCK *x,
int_mv *best_ref_mv, int_mv *second_best_ref_mv) { int_mv *best_ref_mv, int_mv *second_best_ref_mv) {
MB_MODE_INFO * mbmi = &x->e_mbd.mode_info_context->mbmi; MB_MODE_INFO *mbmi = &x->e_mbd.mode_info_context->mbmi;
MV mv; MV diff;
int bwl = b_width_log2(mbmi->sb_type), bw = 1 << bwl; const int bw = 1 << b_width_log2(mbmi->sb_type);
int bhl = b_height_log2(mbmi->sb_type), bh = 1 << bhl; const int bh = 1 << b_height_log2(mbmi->sb_type);
int idx, idy; int idx, idy;
if (mbmi->sb_type < BLOCK_SIZE_SB8X8) { if (mbmi->sb_type < BLOCK_SIZE_SB8X8) {
int i;
PARTITION_INFO *pi = x->partition_info; PARTITION_INFO *pi = x->partition_info;
for (idy = 0; idy < 2; idy += bh) { for (idy = 0; idy < 2; idy += bh) {
for (idx = 0; idx < 2; idx += bw) { for (idx = 0; idx < 2; idx += bw) {
i = idy * 2 + idx; const int i = idy * 2 + idx;
if (pi->bmi[i].mode == NEWMV) { if (pi->bmi[i].mode == NEWMV) {
mv.row = (pi->bmi[i].mv.as_mv.row - best_ref_mv->as_mv.row); diff.row = pi->bmi[i].mv.as_mv.row - best_ref_mv->as_mv.row;
mv.col = (pi->bmi[i].mv.as_mv.col - best_ref_mv->as_mv.col); diff.col = pi->bmi[i].mv.as_mv.col - best_ref_mv->as_mv.col;
vp9_inc_mv(&mv, &best_ref_mv->as_mv, &cpi->NMVcount, vp9_inc_mv(&diff, &cpi->NMVcount);
x->e_mbd.allow_high_precision_mv);
if (x->e_mbd.mode_info_context->mbmi.ref_frame[1] > INTRA_FRAME) { if (x->e_mbd.mode_info_context->mbmi.ref_frame[1] > INTRA_FRAME) {
mv.row = pi->bmi[i].second_mv.as_mv.row - diff.row = pi->bmi[i].second_mv.as_mv.row -
second_best_ref_mv->as_mv.row; second_best_ref_mv->as_mv.row;
mv.col = pi->bmi[i].second_mv.as_mv.col - diff.col = pi->bmi[i].second_mv.as_mv.col -
second_best_ref_mv->as_mv.col; second_best_ref_mv->as_mv.col;
vp9_inc_mv(&mv, &second_best_ref_mv->as_mv, &cpi->NMVcount, vp9_inc_mv(&diff, &cpi->NMVcount);
x->e_mbd.allow_high_precision_mv);
} }
} }
} }
} }
} else if (mbmi->mode == NEWMV) { } else if (mbmi->mode == NEWMV) {
mv.row = mbmi->mv[0].as_mv.row - best_ref_mv->as_mv.row; diff.row = mbmi->mv[0].as_mv.row - best_ref_mv->as_mv.row;
mv.col = mbmi->mv[0].as_mv.col - best_ref_mv->as_mv.col; diff.col = mbmi->mv[0].as_mv.col - best_ref_mv->as_mv.col;
vp9_inc_mv(&mv, &best_ref_mv->as_mv, &cpi->NMVcount, vp9_inc_mv(&diff, &cpi->NMVcount);
x->e_mbd.allow_high_precision_mv);
if (mbmi->ref_frame[1] > INTRA_FRAME) { if (mbmi->ref_frame[1] > INTRA_FRAME) {
mv.row = mbmi->mv[1].as_mv.row - second_best_ref_mv->as_mv.row; diff.row = mbmi->mv[1].as_mv.row - second_best_ref_mv->as_mv.row;
mv.col = mbmi->mv[1].as_mv.col - second_best_ref_mv->as_mv.col; diff.col = mbmi->mv[1].as_mv.col - second_best_ref_mv->as_mv.col;
vp9_inc_mv(&mv, &second_best_ref_mv->as_mv, &cpi->NMVcount, vp9_inc_mv(&diff, &cpi->NMVcount);
x->e_mbd.allow_high_precision_mv);
} }
} }
} }
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