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/encoder/encodeframe.c | |
| 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/encoder/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 4670c314d..bbbbc7870 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -34,7 +34,7 @@ #include "vp8/common/pred_common.h" #define DBG_PRNT_SEGMAP 0 -#if CONFIG_NEW_MVREF +#if CONFIG_NEWBESTREFMV #include "vp8/common/mvref_common.h" #endif @@ -1304,7 +1304,6 @@ static void encode_frame_internal(VP8_COMP *cpi) { #if CONFIG_NEW_MVREF // temp stats reset - vp8_zero( cpi->mv_ref_sum_distance ); vp8_zero( cpi->best_ref_index_counts ); #endif |