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/onyx_if.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/onyx_if.c')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index ea6e45d83..ca6570e68 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -40,7 +40,7 @@ #include "bitstream.h" #include "ratectrl.h" -#if CONFIG_NEW_MVREF +#if CONFIG_NEWBESTREFMV #include "vp8/common/mvref_common.h" #endif @@ -3874,25 +3874,10 @@ static void encode_frame_to_data_rate // in this frame. update_base_skip_probs(cpi); - -#if CONFIG_NEW_MVREF -#if 0 && CONFIG_INTERNAL_STATS +#if 0 //CONFIG_NEW_MVREF && CONFIG_INTERNAL_STATS { FILE *f = fopen("mv_ref_dist.stt", "a"); unsigned int i; - //fprintf(f, "%10d %10d %10d %10d %10d %10d %10d %10d %10d %10d\n", - /*fprintf(f, "%10d %10d %10d %10d %10d %10d %10d %10d %10d %10d", - cpi->common.current_video_frame, - cpi->mv_ref_sum_distance[1][0], - cpi->mv_ref_sum_distance[1][1], - cpi->mv_ref_sum_distance[1][2], - cpi->mv_ref_sum_distance[2][0], - cpi->mv_ref_sum_distance[2][1], - cpi->mv_ref_sum_distance[2][2], - cpi->mv_ref_sum_distance[3][0], - cpi->mv_ref_sum_distance[3][1], - cpi->mv_ref_sum_distance[3][2] );*/ - for (i = 0; i < MAX_MV_REFS; ++i) { fprintf(f, "%10d", cpi->best_ref_index_counts[i] ); } @@ -3901,8 +3886,6 @@ static void encode_frame_to_data_rate fclose(f); } #endif -#endif - #if 0// 1 && CONFIG_INTERNAL_STATS { |