Commit 55214924 authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "Cleaning up vp9_refining_search_sad() function."

parents 008ef8dd 35092585
...@@ -1830,11 +1830,7 @@ int vp9_refining_search_sad_c(const MACROBLOCK *x, ...@@ -1830,11 +1830,7 @@ int vp9_refining_search_sad_c(const MACROBLOCK *x,
const uint8_t *const in_what = xd->plane[0].pre[0].buf; const uint8_t *const in_what = xd->plane[0].pre[0].buf;
const uint8_t *best_address = &in_what[ref_mv->row * in_what_stride + const uint8_t *best_address = &in_what[ref_mv->row * in_what_stride +
ref_mv->col]; ref_mv->col];
unsigned int thissad;
const MV fcenter_mv = {center_mv->row >> 3, center_mv->col >> 3}; const MV fcenter_mv = {center_mv->row >> 3, center_mv->col >> 3};
MV this_mv;
const int *mvjsadcost = x->nmvjointsadcost; const int *mvjsadcost = x->nmvjointsadcost;
int *mvsadcost[2] = {x->nmvsadcost[0], x->nmvsadcost[1]}; int *mvsadcost[2] = {x->nmvsadcost[0], x->nmvsadcost[1]};
...@@ -1846,15 +1842,13 @@ int vp9_refining_search_sad_c(const MACROBLOCK *x, ...@@ -1846,15 +1842,13 @@ int vp9_refining_search_sad_c(const MACROBLOCK *x,
int best_site = -1; int best_site = -1;
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
this_mv.row = ref_mv->row + neighbors[j].row; const MV this_mv = {ref_mv->row + neighbors[j].row,
this_mv.col = ref_mv->col + neighbors[j].col; ref_mv->col + neighbors[j].col};
if (is_mv_in(x, &this_mv)) { if (is_mv_in(x, &this_mv)) {
const uint8_t *check_here = &in_what[this_mv.row * in_what_stride + const uint8_t *check_here = &in_what[this_mv.row * in_what_stride +
this_mv.col]; this_mv.col];
thissad = fn_ptr->sdf(what, what_stride, check_here, in_what_stride, unsigned int thissad = fn_ptr->sdf(what, what_stride, check_here,
bestsad); in_what_stride, bestsad);
if (thissad < bestsad) { if (thissad < bestsad) {
thissad += mvsad_err_cost(&this_mv, &fcenter_mv, thissad += mvsad_err_cost(&this_mv, &fcenter_mv,
mvjsadcost, mvsadcost, error_per_bit); mvjsadcost, mvsadcost, error_per_bit);
...@@ -1876,15 +1870,15 @@ int vp9_refining_search_sad_c(const MACROBLOCK *x, ...@@ -1876,15 +1870,15 @@ int vp9_refining_search_sad_c(const MACROBLOCK *x,
} }
} }
this_mv.row = ref_mv->row * 8; if (bestsad < INT_MAX) {
this_mv.col = ref_mv->col * 8; unsigned int unused;
const MV mv = {ref_mv->row * 8, ref_mv->col * 8};
if (bestsad < INT_MAX)
return fn_ptr->vf(what, what_stride, best_address, in_what_stride, return fn_ptr->vf(what, what_stride, best_address, in_what_stride,
(unsigned int *)(&thissad)) + &unused) +
mv_err_cost(&this_mv, center_mv, mvjcost, mvcost, x->errorperbit); mv_err_cost(&mv, center_mv, mvjcost, mvcost, x->errorperbit);
else } else {
return INT_MAX; return INT_MAX;
}
} }
int vp9_refining_search_sadx4(const MACROBLOCK *x, int vp9_refining_search_sadx4(const MACROBLOCK *x,
......
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