diff options
author | John Koleszar <jkoleszar@google.com> | 2011-05-19 11:17:08 -0700 |
---|---|---|
committer | Code Review <code-review@webmproject.org> | 2011-05-19 11:17:08 -0700 |
commit | c684d5e5f2c7c38b867b0c177c82af26335dcb3f (patch) | |
tree | 0b899e7bac2052fe96b15042218fb278eefaad39 /vp8/encoder | |
parent | ff39958cee5de02395b767bad9c02613418fa9d6 (diff) | |
parent | 57ad189129b2041b68411c05e29840bad793d538 (diff) | |
download | libvpx-c684d5e5f2c7c38b867b0c177c82af26335dcb3f.tar libvpx-c684d5e5f2c7c38b867b0c177c82af26335dcb3f.tar.gz libvpx-c684d5e5f2c7c38b867b0c177c82af26335dcb3f.tar.bz2 libvpx-c684d5e5f2c7c38b867b0c177c82af26335dcb3f.zip |
Merge "changed configure option name to reduce confusion"
Diffstat (limited to 'vp8/encoder')
-rw-r--r-- | vp8/encoder/generic/csystemdependent.c | 2 | ||||
-rw-r--r-- | vp8/encoder/onyx_if.c | 16 | ||||
-rw-r--r-- | vp8/encoder/onyx_int.h | 2 | ||||
-rw-r--r-- | vp8/encoder/variance.h | 2 | ||||
-rw-r--r-- | vp8/encoder/x86/x86_csystemdependent.c | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/vp8/encoder/generic/csystemdependent.c b/vp8/encoder/generic/csystemdependent.c index 58f810d5f..928f559f3 100644 --- a/vp8/encoder/generic/csystemdependent.c +++ b/vp8/encoder/generic/csystemdependent.c @@ -100,7 +100,7 @@ void vp8_cmachine_specific_config(VP8_COMP *cpi) // Pure C: vp8_yv12_copy_partial_frame_ptr = vp8_yv12_copy_partial_frame; -#if CONFIG_PSNR +#if CONFIG_INTERNAL_STATS cpi->rtcd.variance.ssimpf_8x8 = ssim_parms_8x8_c; cpi->rtcd.variance.ssimpf = ssim_parms_c; #endif diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index fc7a86373..20d5539c7 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -75,7 +75,7 @@ static void set_default_lf_deltas(VP8_COMP *cpi); extern const int vp8_gf_interval_table[101]; -#if CONFIG_PSNR +#if CONFIG_INTERNAL_STATS #include "math.h" extern double vp8_calc_ssim @@ -1917,8 +1917,8 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf) cpi->source_alt_ref_active = FALSE; cpi->common.refresh_alt_ref_frame = 0; - cpi->b_calculate_psnr = CONFIG_PSNR; -#if CONFIG_PSNR + cpi->b_calculate_psnr = CONFIG_INTERNAL_STATS; +#if CONFIG_INTERNAL_STATS cpi->b_calculate_ssimg = 0; cpi->count = 0; @@ -2137,7 +2137,7 @@ void vp8_remove_compressor(VP8_PTR *ptr) print_mode_context(); #endif -#if CONFIG_PSNR +#if CONFIG_INTERNAL_STATS if (cpi->pass != 1) { @@ -3388,7 +3388,7 @@ static void encode_frame_to_data_rate cm->current_video_frame++; cpi->frames_since_key++; -#if CONFIG_PSNR +#if CONFIG_INTERNAL_STATS cpi->count ++; #endif @@ -3989,7 +3989,7 @@ static void encode_frame_to_data_rate { vp8_restore_coding_context(cpi); loop_count++; -#if CONFIG_PSNR +#if CONFIG_INTERNAL_STATS cpi->tot_recode_hits++; #endif } @@ -4263,7 +4263,7 @@ static void encode_frame_to_data_rate } } -#if 0 && CONFIG_PSNR +#if 0 && CONFIG_INTERNAL_STATS { FILE *f = fopen("tmp.stt", "a"); @@ -4828,7 +4828,7 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon generate_psnr_packet(cpi); } -#if CONFIG_PSNR +#if CONFIG_INTERNAL_STATS if (cpi->pass != 1) { diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index e18d468b4..e23e9d371 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -620,7 +620,7 @@ typedef struct VP8_COMP int fixed_divide[512]; #endif -#if CONFIG_PSNR +#if CONFIG_INTERNAL_STATS int count; double total_y; double total_u; diff --git a/vp8/encoder/variance.h b/vp8/encoder/variance.h index bf17ea8b6..da5a5364a 100644 --- a/vp8/encoder/variance.h +++ b/vp8/encoder/variance.h @@ -391,7 +391,7 @@ typedef struct vp8_sad_multi_d_fn_t sad8x8x4d; vp8_sad_multi_d_fn_t sad4x4x4d; -#if CONFIG_PSNR +#if CONFIG_INTERNAL_STATS vp8_ssimpf_fn_t ssimpf_8x8; vp8_ssimpf_fn_t ssimpf; #endif diff --git a/vp8/encoder/x86/x86_csystemdependent.c b/vp8/encoder/x86/x86_csystemdependent.c index f65ef8a5f..378b14066 100644 --- a/vp8/encoder/x86/x86_csystemdependent.c +++ b/vp8/encoder/x86/x86_csystemdependent.c @@ -112,7 +112,7 @@ static void subtract_b_sse2(BLOCK *be, BLOCKD *bd, int pitch) #endif #if HAVE_SSSE3 -#if CONFIG_PSNR +#if CONFIG_INTERNAL_STATS #if ARCH_X86_64 typedef void ssimpf ( @@ -287,7 +287,7 @@ void vp8_arch_x86_encoder_init(VP8_COMP *cpi) cpi->rtcd.quantize.fastquantb = vp8_fast_quantize_b_ssse3; -#if CONFIG_PSNR +#if CONFIG_INTERNAL_STATS #if ARCH_X86_64 cpi->rtcd.variance.ssimpf_8x8 = vp8_ssim_parms_8x8_sse3; cpi->rtcd.variance.ssimpf = vp8_ssim_parms_16x16_sse3; |