diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2012-02-03 15:10:44 +0000 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2012-02-06 16:40:57 +0000 |
| commit | 9c9300f56f4788ed5a9aade371c185b33dcb7781 (patch) | |
| tree | 66e8754fa7202faa8b6f315880768ff6d47aee8a /vp8/encoder/onyx_if.c | |
| parent | 82b865da9475586341949664d5468a93237867a8 (diff) | |
| download | libvpx-9c9300f56f4788ed5a9aade371c185b33dcb7781.tar libvpx-9c9300f56f4788ed5a9aade371c185b33dcb7781.tar.gz libvpx-9c9300f56f4788ed5a9aade371c185b33dcb7781.tar.bz2 libvpx-9c9300f56f4788ed5a9aade371c185b33dcb7781.zip | |
Merged NEWNEAR experiment
This commit merges the NEWNEAR experiment such that it
is effectively always on.
The fact that there were changes in the threading code again
highlights the need to strip out such features during the
bitstream development phase as trying to maintain this code
(especially as it is not being tested) slows the development cycle.
Change-Id: I8b34950a1333231ced9928aa11cd6d6459984b65
Diffstat (limited to 'vp8/encoder/onyx_if.c')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index c50898886..e5f7c2059 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -2705,7 +2705,7 @@ void vp8_remove_compressor(VP8_PTR *ptr) - cpi->first_time_stamp_ever) / 10000000.000; double total_encode_time = (cpi->time_receive_data + cpi->time_compress_data) / 1000.000; double dr = (double)cpi->bytes * (double) 8 / (double)1000 / time_encoded; -#if CONFIG_NEWNEAR&&defined(MODE_STATS) +#if defined(MODE_STATS) print_mode_contexts(&cpi->common); #endif if (cpi->b_calculate_psnr) @@ -5393,7 +5393,6 @@ static void encode_frame_to_data_rate vp8_write_yuv_rec_frame(cm); #endif -#if CONFIG_NEWNEAR if(cm->show_frame) { vpx_memcpy(cm->prev_mip, cm->mip, @@ -5404,9 +5403,6 @@ static void encode_frame_to_data_rate vpx_memset(cm->prev_mip, 0, (cm->mb_cols + 1) * (cm->mb_rows + 1)* sizeof(MODE_INFO)); } -#endif - - } |