Commit 02423b2e authored by Yunqing Wang's avatar Yunqing Wang
Browse files

Minor modification

A small change.

Change-Id: I2e7726e58370a95d0319361f4f6ad231138d1328
parent 91036996
...@@ -1208,8 +1208,8 @@ int vp8_full_search_sad(MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *ref_mv, int erro ...@@ -1208,8 +1208,8 @@ int vp8_full_search_sad(MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *ref_mv, int erro
unsigned char *check_here; unsigned char *check_here;
int thissad; int thissad;
int ref_row = ref_mv->row >> 3; int ref_row = ref_mv->row;
int ref_col = ref_mv->col >> 3; int ref_col = ref_mv->col;
int row_min = ref_row - distance; int row_min = ref_row - distance;
int row_max = ref_row + distance; int row_max = ref_row + distance;
...@@ -1303,8 +1303,8 @@ int vp8_full_search_sadx3(MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *ref_mv, int er ...@@ -1303,8 +1303,8 @@ int vp8_full_search_sadx3(MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *ref_mv, int er
unsigned char *check_here; unsigned char *check_here;
unsigned int thissad; unsigned int thissad;
int ref_row = ref_mv->row >> 3; int ref_row = ref_mv->row;
int ref_col = ref_mv->col >> 3; int ref_col = ref_mv->col;
int row_min = ref_row - distance; int row_min = ref_row - distance;
int row_max = ref_row + distance; int row_max = ref_row + distance;
...@@ -1431,8 +1431,8 @@ int vp8_full_search_sadx8(MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *ref_mv, int er ...@@ -1431,8 +1431,8 @@ int vp8_full_search_sadx8(MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *ref_mv, int er
unsigned char *check_here; unsigned char *check_here;
unsigned int thissad; unsigned int thissad;
int ref_row = ref_mv->row >> 3; int ref_row = ref_mv->row;
int ref_col = ref_mv->col >> 3; int ref_col = ref_mv->col;
int row_min = ref_row - distance; int row_min = ref_row - distance;
int row_max = ref_row + distance; int row_max = ref_row + distance;
......
...@@ -2145,10 +2145,6 @@ int vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int ...@@ -2145,10 +2145,6 @@ int vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
{ {
int thissme; int thissme;
int full_flag_thresh = 0; int full_flag_thresh = 0;
MV full_mvp;
full_mvp.row = d->bmi.mv.as_mv.row <<3; // use diamond search result as full search staring point
full_mvp.col = d->bmi.mv.as_mv.col <<3;
// Update x->vector_range based on best vector found in step search // Update x->vector_range based on best vector found in step search
search_range = MAXF(abs((mvp.row>>3) - d->bmi.mv.as_mv.row), abs((mvp.col>>3) - d->bmi.mv.as_mv.col)); search_range = MAXF(abs((mvp.row>>3) - d->bmi.mv.as_mv.row), abs((mvp.col>>3) - d->bmi.mv.as_mv.col));
...@@ -2167,7 +2163,8 @@ int vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int ...@@ -2167,7 +2163,8 @@ int vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
{ {
int sadpb = x->sadperbit16 >> 2; int sadpb = x->sadperbit16 >> 2;
thissme = cpi->full_search_sad(x, b, d, &full_mvp, sadpb, search_range, &cpi->fn_ptr[BLOCK_16X16], x->mvcost, &best_ref_mv); /* use diamond search result as full search staring point */
thissme = cpi->full_search_sad(x, b, d, &d->bmi.mv.as_mv, sadpb, search_range, &cpi->fn_ptr[BLOCK_16X16], x->mvcost, &best_ref_mv);
} }
// Barrier threshold to initiating full search // Barrier threshold to initiating full search
......
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