diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2012-09-07 14:21:22 +0100 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2012-09-07 14:21:22 +0100 |
| commit | 778ec421e7f5d75e360fa5e67e25fbf9d1714ca3 (patch) | |
| tree | d9b6c7d6e01c0cf9ff5426dbd6a5498465a648c9 /vp8/decoder | |
| parent | 38e1c7918518ac231b2787fabeb45990c8a7995a (diff) | |
| download | libvpx-778ec421e7f5d75e360fa5e67e25fbf9d1714ca3.tar libvpx-778ec421e7f5d75e360fa5e67e25fbf9d1714ca3.tar.gz libvpx-778ec421e7f5d75e360fa5e67e25fbf9d1714ca3.tar.bz2 libvpx-778ec421e7f5d75e360fa5e67e25fbf9d1714ca3.zip | |
Partial merge of NEWBESTREFMV and NEW_MVREF.
This commit merges those parts of the CONFIG_NEW_MVREF
that specifically relate to choosing a better set of candidate
MV references into the NEWBESTREFMV experiment.
CONFIG_NEW_MVREF will then be used for changes relating
to the explicit coding of a cost optimized MV reference in the
bitstream as part of MV coding.
Change-Id: Ied982c0ad72093eab29e38b8cd74d5c3d7458b10
Diffstat (limited to 'vp8/decoder')
| -rw-r--r-- | vp8/decoder/decodemv.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/vp8/decoder/decodemv.c b/vp8/decoder/decodemv.c index 403d13529..8d0f94e65 100644 --- a/vp8/decoder/decodemv.c +++ b/vp8/decoder/decodemv.c @@ -838,7 +838,6 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, xd->pre.u_buffer = cm->yv12_fb[ref_fb_idx].u_buffer + recon_uvoffset; xd->pre.v_buffer = cm->yv12_fb[ref_fb_idx].v_buffer + recon_uvoffset; -#if CONFIG_NEW_MVREF // Update stats on relative distance of chosen vector to the // possible best reference vectors. { @@ -846,16 +845,11 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, ref_frame, mbmi->ref_mvs[ref_frame], cm->ref_frame_sign_bias ); } -#endif vp8_find_best_ref_mvs(xd, xd->pre.y_buffer, recon_y_stride, -#if CONFIG_NEW_MVREF mbmi->ref_mvs[ref_frame], -#else - xd->ref_mv, -#endif &best_mv, &nearest, &nearby); } #endif @@ -938,7 +932,6 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, mbmi->second_ref_frame, cm->ref_frame_sign_bias); -#if CONFIG_NEW_MVREF // Update stats on relative distance of chosen vector to the // possible best reference vectors. { @@ -948,16 +941,11 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, ref_frame, mbmi->ref_mvs[ref_frame], cm->ref_frame_sign_bias ); } -#endif vp8_find_best_ref_mvs(xd, xd->second_pre.y_buffer, recon_y_stride, -#if CONFIG_NEW_MVREF mbmi->ref_mvs[mbmi->second_ref_frame], -#else - xd->ref_mv, -#endif &best_mv_second, &nearest_second, &nearby_second); |