diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-07-13 00:05:04 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-07-13 00:05:04 -0400 |
| commit | ffc4587a47bf9a12e867310da8060662d08c0da2 (patch) | |
| tree | ff62f03f0f8f4cacc8d964cc6f82c44ccca5e231 /vp8/encoder/rdopt.c | |
| parent | 6058c9ce0cd8305b13a4766370c67059f789b816 (diff) | |
| parent | 587ca06da9d652d60309679c14a1c0b310c93c66 (diff) | |
| download | libvpx-ffc4587a47bf9a12e867310da8060662d08c0da2.tar libvpx-ffc4587a47bf9a12e867310da8060662d08c0da2.tar.gz libvpx-ffc4587a47bf9a12e867310da8060662d08c0da2.tar.bz2 libvpx-ffc4587a47bf9a12e867310da8060662d08c0da2.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I9dab62c24d71f71cdc36732ed8ed469bee67d7e1
Diffstat (limited to 'vp8/encoder/rdopt.c')
| -rw-r--r-- | vp8/encoder/rdopt.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index cc3c9b71e..31d765782 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -1932,18 +1932,6 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int lf_or_gf = frame_lf_or_gf[x->e_mbd.mode_info_context->mbmi.ref_frame]; } - if(x->e_mbd.mode_info_context->mbmi.mode == NEWMV) - { - if(!saddone) - { - vp8_cal_sad(cpi,xd,x, recon_yoffset ,&near_sadidx[0] ); - saddone = 1; - } - - vp8_mv_pred(cpi, &x->e_mbd, x->e_mbd.mode_info_context, &mvp, - x->e_mbd.mode_info_context->mbmi.ref_frame, cpi->common.ref_frame_sign_bias, &sr, &near_sadidx[0]); - } - // Check to see if the testing frequency for this mode is at its max // If so then prevent it from being tested and increase the threshold for its testing if (cpi->mode_test_hit_counts[mode_index] && (cpi->mode_check_freq[mode_index] > 1)) @@ -2084,6 +2072,15 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int int tmp_row_min = x->mv_row_min; int tmp_row_max = x->mv_row_max; + if(!saddone) + { + vp8_cal_sad(cpi,xd,x, recon_yoffset ,&near_sadidx[0] ); + saddone = 1; + } + + vp8_mv_pred(cpi, &x->e_mbd, x->e_mbd.mode_info_context, &mvp, + x->e_mbd.mode_info_context->mbmi.ref_frame, cpi->common.ref_frame_sign_bias, &sr, &near_sadidx[0]); + mvp_full.as_mv.col = mvp.as_mv.col>>3; mvp_full.as_mv.row = mvp.as_mv.row>>3; |