diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2011-04-06 09:08:47 -0400 |
|---|---|---|
| committer | Yunqing Wang <yunqingwang@google.com> | 2011-04-06 09:08:47 -0400 |
| commit | 02423b2e9219eab817235715ea8a89709f97a26e (patch) | |
| tree | d73d9dbad5d4ccec49741bbf7e423e0bfe797675 /vp8/encoder | |
| parent | 91036996ac3871dccf4c6cfe47504c7b99f8555c (diff) | |
| download | libvpx-02423b2e9219eab817235715ea8a89709f97a26e.tar libvpx-02423b2e9219eab817235715ea8a89709f97a26e.tar.gz libvpx-02423b2e9219eab817235715ea8a89709f97a26e.tar.bz2 libvpx-02423b2e9219eab817235715ea8a89709f97a26e.zip | |
Minor modification
A small change.
Change-Id: I2e7726e58370a95d0319361f4f6ad231138d1328
Diffstat (limited to 'vp8/encoder')
| -rw-r--r-- | vp8/encoder/mcomp.c | 12 | ||||
| -rw-r--r-- | vp8/encoder/rdopt.c | 7 |
2 files changed, 8 insertions, 11 deletions
diff --git a/vp8/encoder/mcomp.c b/vp8/encoder/mcomp.c index 37c30da14..716f514af 100644 --- a/vp8/encoder/mcomp.c +++ b/vp8/encoder/mcomp.c @@ -1208,8 +1208,8 @@ int vp8_full_search_sad(MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *ref_mv, int erro unsigned char *check_here; int thissad; - int ref_row = ref_mv->row >> 3; - int ref_col = ref_mv->col >> 3; + int ref_row = ref_mv->row; + int ref_col = ref_mv->col; int row_min = 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 unsigned char *check_here; unsigned int thissad; - int ref_row = ref_mv->row >> 3; - int ref_col = ref_mv->col >> 3; + int ref_row = ref_mv->row; + int ref_col = ref_mv->col; int row_min = 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 unsigned char *check_here; unsigned int thissad; - int ref_row = ref_mv->row >> 3; - int ref_col = ref_mv->col >> 3; + int ref_row = ref_mv->row; + int ref_col = ref_mv->col; int row_min = ref_row - distance; int row_max = ref_row + distance; diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 908e97153..59d19e6fe 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -2145,10 +2145,6 @@ int vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int { int thissme; 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 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 { 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 |