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

Merge "Cleaning up vp9_get_mvpred_var()."

Browse Source
This commit is contained in:
Dmitry Kovalev
2014-03-09 10:26:39 -07:00
committed by Gerrit Code Review
parent 62e1d37eb4 ee7d26d50c
commit eece45fe23
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
vp9/encoder/vp9_mcomp.c
View File

@@ -711,23 +711,21 @@ static int vp9_pattern_search(const MACROBLOCK *x,
} }
int vp9_get_mvpred_var(const MACROBLOCK *x, int vp9_get_mvpred_var(const MACROBLOCK *x,
MV *best_mv, const MV *best_mv, const MV *center_mv,
const MV *center_mv,
const vp9_variance_fn_ptr_t *vfp, const vp9_variance_fn_ptr_t *vfp,
int use_mvcost) { int use_mvcost) {
unsigned int bestsad; unsigned int unused;
MV this_mv;
const MACROBLOCKD *const xd = &x->e_mbd; const MACROBLOCKD *const xd = &x->e_mbd;
const uint8_t *what = x->plane[0].src.buf; const uint8_t *what = x->plane[0].src.buf;
const int what_stride = x->plane[0].src.stride; const int what_stride = x->plane[0].src.stride;
const int in_what_stride = xd->plane[0].pre[0].stride; const int in_what_stride = xd->plane[0].pre[0].stride;
const uint8_t *base_offset = xd->plane[0].pre[0].buf; const uint8_t *base_offset = xd->plane[0].pre[0].buf;
const uint8_t *this_offset = base_offset + (best_mv->row * in_what_stride) + const uint8_t *this_offset = &base_offset[best_mv->row * in_what_stride +
best_mv->col; best_mv->col];
this_mv.row = best_mv->row * 8; const MV mv = {best_mv->row * 8, best_mv->col * 8};
this_mv.col = best_mv->col * 8; return vfp->vf(what, what_stride, this_offset, in_what_stride, &unused) +
return vfp->vf(what, what_stride, this_offset, in_what_stride, &bestsad) + (use_mvcost ? mv_err_cost(&mv, center_mv, x->nmvjointcost,
(use_mvcost ? mv_err_cost(&this_mv, center_mv, x->nmvjointcost,
x->mvcost, x->errorperbit) : 0); x->mvcost, x->errorperbit) : 0);
} }

3
vp9/encoder/vp9_mcomp.h
View File

@@ -38,8 +38,7 @@ int vp9_mv_bit_cost(const MV *mv, const MV *ref,
// Utility to compute variance + MV rate cost for a given MV // Utility to compute variance + MV rate cost for a given MV
int vp9_get_mvpred_var(const MACROBLOCK *x, int vp9_get_mvpred_var(const MACROBLOCK *x,
MV *best_mv, const MV *best_mv, const MV *center_mv,
const MV *center_mv,
const vp9_variance_fn_ptr_t *vfp, const vp9_variance_fn_ptr_t *vfp,
int use_mvcost); int use_mvcost);
int vp9_get_mvpred_av_var(const MACROBLOCK *x, int vp9_get_mvpred_av_var(const MACROBLOCK *x,