diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-04-07 00:05:11 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-04-07 00:05:11 -0400 |
| commit | 6e4f6c96b31ce43850beb5384117f6171bf643ad (patch) | |
| tree | e1e52e5423a23ce1ecb5ae03ac2f9e8d5498e160 /vp8/encoder/rdopt.c | |
| parent | d64aa018be236d4c87029b292739ae96df2cb7fb (diff) | |
| parent | 2de858b9fcdc1b8c0db265047c5bf387fe31de3a (diff) | |
| download | libvpx-6e4f6c96b31ce43850beb5384117f6171bf643ad.tar libvpx-6e4f6c96b31ce43850beb5384117f6171bf643ad.tar.gz libvpx-6e4f6c96b31ce43850beb5384117f6171bf643ad.tar.bz2 libvpx-6e4f6c96b31ce43850beb5384117f6171bf643ad.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: Icee86a4b25e53dc04b508179101b1a782b688f61
Diffstat (limited to 'vp8/encoder/rdopt.c')
| -rw-r--r-- | vp8/encoder/rdopt.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index f125e952a..cd8ac85ba 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -2210,10 +2210,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)); @@ -2232,7 +2228,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 |