diff options
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/common/generic/systemdependent.c | 2 | ||||
| -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 | ||||
| -rw-r--r-- | vp8/vp8cx.mk | 6 |
7 files changed, 17 insertions, 17 deletions
diff --git a/vp8/common/generic/systemdependent.c b/vp8/common/generic/systemdependent.c index c36ae2119..6473443bb 100644 --- a/vp8/common/generic/systemdependent.c +++ b/vp8/common/generic/systemdependent.c @@ -68,7 +68,7 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) rtcd->loopfilter.simple_mb_h = vp8_loop_filter_mbhs_c; rtcd->loopfilter.simple_b_h = vp8_loop_filter_bhs_c; -#if CONFIG_POSTPROC || (CONFIG_VP8_ENCODER && CONFIG_PSNR) +#if CONFIG_POSTPROC || (CONFIG_VP8_ENCODER && CONFIG_INTERNAL_STATS) rtcd->postproc.down = vp8_mbpost_proc_down_c; rtcd->postproc.across = vp8_mbpost_proc_across_ip_c; rtcd->postproc.downacross = vp8_post_proc_down_and_across_c; diff --git a/vp8/encoder/generic/csystemdependent.c b/vp8/encoder/generic/csystemdependent.c index d48c95bf7..bb3c58972 100644 --- a/vp8/encoder/generic/csystemdependent.c +++ b/vp8/encoder/generic/csystemdependent.c @@ -99,7 +99,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 15fd4f2e8..8a2572f0c 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -76,7 +76,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 @@ -1906,8 +1906,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; @@ -2128,7 +2128,7 @@ void vp8_remove_compressor(VP8_PTR *ptr) print_mode_context(); #endif -#if CONFIG_PSNR +#if CONFIG_INTERNAL_STATS if (cpi->pass != 1) { @@ -3418,7 +3418,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 @@ -4019,7 +4019,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 } @@ -4293,7 +4293,7 @@ static void encode_frame_to_data_rate } } -#if 0 && CONFIG_PSNR +#if 0 && CONFIG_INTERNAL_STATS { FILE *f = fopen("tmp.stt", "a"); @@ -4837,7 +4837,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 a66056dff..c0ef4c162 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -625,7 +625,7 @@ typedef struct 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 b01319fa4..285d7d74f 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 ( @@ -292,7 +292,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; diff --git a/vp8/vp8cx.mk b/vp8/vp8cx.mk index c17837164..d46d99df6 100644 --- a/vp8/vp8cx.mk +++ b/vp8/vp8cx.mk @@ -77,12 +77,12 @@ VP8_CX_SRCS-yes += encoder/rdopt.c VP8_CX_SRCS-yes += encoder/sad_c.c VP8_CX_SRCS-yes += encoder/segmentation.c VP8_CX_SRCS-yes += encoder/segmentation.h -VP8_CX_SRCS-$(CONFIG_PSNR) += encoder/ssim.c +VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/ssim.c VP8_CX_SRCS-yes += encoder/tokenize.c VP8_CX_SRCS-yes += encoder/treewriter.c VP8_CX_SRCS-yes += encoder/variance_c.c -VP8_CX_SRCS-$(CONFIG_PSNR) += common/postproc.h -VP8_CX_SRCS-$(CONFIG_PSNR) += common/postproc.c +VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.h +VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.c VP8_CX_SRCS-yes += encoder/temporal_filter.c VP8_CX_SRCS-yes += encoder/temporal_filter.h |