Commit 57ad1891 authored by Yaowu Xu's avatar Yaowu Xu
Browse files

changed configure option name to reduce confusion

Renamed configure option "enable-psnr" to "enable-internal-stats" to
better reflect the purpose of the option and eliminate the confusion
reported in http://code.google.com/p/webm/issues/detail?id=35

Change-Id: If72df6fdb9f1e33dab1329240ba4d8911d2f1f7a
parent dfa9e2c5
...@@ -31,7 +31,7 @@ Advanced options: ...@@ -31,7 +31,7 @@ Advanced options:
${toggle_md5} support for output of checksum data ${toggle_md5} support for output of checksum data
${toggle_static_msvcrt} use static MSVCRT (VS builds only) ${toggle_static_msvcrt} use static MSVCRT (VS builds only)
${toggle_vp8} VP8 codec support ${toggle_vp8} VP8 codec support
${toggle_psnr} output of PSNR data, if supported (encoders) ${toggle_internal_stats} output of encoder internal stats for debug, if supported (encoders)
${toggle_mem_tracker} track memory usage ${toggle_mem_tracker} track memory usage
${toggle_postproc} postprocessing ${toggle_postproc} postprocessing
${toggle_multithread} multithreaded encoding and decoding. ${toggle_multithread} multithreaded encoding and decoding.
...@@ -240,7 +240,7 @@ CONFIG_LIST=" ...@@ -240,7 +240,7 @@ CONFIG_LIST="
runtime_cpu_detect runtime_cpu_detect
postproc postproc
multithread multithread
psnr internal_stats
${CODECS} ${CODECS}
${CODEC_FAMILIES} ${CODEC_FAMILIES}
encoders encoders
...@@ -281,7 +281,7 @@ CMDLINE_SELECT=" ...@@ -281,7 +281,7 @@ CMDLINE_SELECT="
dc_recon dc_recon
postproc postproc
multithread multithread
psnr internal_stats
${CODECS} ${CODECS}
${CODEC_FAMILIES} ${CODEC_FAMILIES}
static_msvcrt static_msvcrt
......
...@@ -68,7 +68,7 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) ...@@ -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_mb_h = vp8_loop_filter_mbhs_c;
rtcd->loopfilter.simple_b_h = vp8_loop_filter_bhs_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.down = vp8_mbpost_proc_down_c;
rtcd->postproc.across = vp8_mbpost_proc_across_ip_c; rtcd->postproc.across = vp8_mbpost_proc_across_ip_c;
rtcd->postproc.downacross = vp8_post_proc_down_and_across_c; rtcd->postproc.downacross = vp8_post_proc_down_and_across_c;
......
...@@ -99,7 +99,7 @@ void vp8_cmachine_specific_config(VP8_COMP *cpi) ...@@ -99,7 +99,7 @@ void vp8_cmachine_specific_config(VP8_COMP *cpi)
// Pure C: // Pure C:
vp8_yv12_copy_partial_frame_ptr = vp8_yv12_copy_partial_frame; 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_8x8 = ssim_parms_8x8_c;
cpi->rtcd.variance.ssimpf = ssim_parms_c; cpi->rtcd.variance.ssimpf = ssim_parms_c;
#endif #endif
......
...@@ -76,7 +76,7 @@ static void set_default_lf_deltas(VP8_COMP *cpi); ...@@ -76,7 +76,7 @@ static void set_default_lf_deltas(VP8_COMP *cpi);
extern const int vp8_gf_interval_table[101]; extern const int vp8_gf_interval_table[101];
#if CONFIG_PSNR #if CONFIG_INTERNAL_STATS
#include "math.h" #include "math.h"
extern double vp8_calc_ssim extern double vp8_calc_ssim
...@@ -1906,8 +1906,8 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf) ...@@ -1906,8 +1906,8 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf)
cpi->source_alt_ref_active = FALSE; cpi->source_alt_ref_active = FALSE;
cpi->common.refresh_alt_ref_frame = 0; cpi->common.refresh_alt_ref_frame = 0;
cpi->b_calculate_psnr = CONFIG_PSNR; cpi->b_calculate_psnr = CONFIG_INTERNAL_STATS;
#if CONFIG_PSNR #if CONFIG_INTERNAL_STATS
cpi->b_calculate_ssimg = 0; cpi->b_calculate_ssimg = 0;
cpi->count = 0; cpi->count = 0;
...@@ -2128,7 +2128,7 @@ void vp8_remove_compressor(VP8_PTR *ptr) ...@@ -2128,7 +2128,7 @@ void vp8_remove_compressor(VP8_PTR *ptr)
print_mode_context(); print_mode_context();
#endif #endif
#if CONFIG_PSNR #if CONFIG_INTERNAL_STATS
if (cpi->pass != 1) if (cpi->pass != 1)
{ {
...@@ -3418,7 +3418,7 @@ static void encode_frame_to_data_rate ...@@ -3418,7 +3418,7 @@ static void encode_frame_to_data_rate
cm->current_video_frame++; cm->current_video_frame++;
cpi->frames_since_key++; cpi->frames_since_key++;
#if CONFIG_PSNR #if CONFIG_INTERNAL_STATS
cpi->count ++; cpi->count ++;
#endif #endif
...@@ -4019,7 +4019,7 @@ static void encode_frame_to_data_rate ...@@ -4019,7 +4019,7 @@ static void encode_frame_to_data_rate
{ {
vp8_restore_coding_context(cpi); vp8_restore_coding_context(cpi);
loop_count++; loop_count++;
#if CONFIG_PSNR #if CONFIG_INTERNAL_STATS
cpi->tot_recode_hits++; cpi->tot_recode_hits++;
#endif #endif
} }
...@@ -4293,7 +4293,7 @@ static void encode_frame_to_data_rate ...@@ -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"); FILE *f = fopen("tmp.stt", "a");
...@@ -4837,7 +4837,7 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon ...@@ -4837,7 +4837,7 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon
generate_psnr_packet(cpi); generate_psnr_packet(cpi);
} }
#if CONFIG_PSNR #if CONFIG_INTERNAL_STATS
if (cpi->pass != 1) if (cpi->pass != 1)
{ {
......
...@@ -625,7 +625,7 @@ typedef struct ...@@ -625,7 +625,7 @@ typedef struct
int fixed_divide[512]; int fixed_divide[512];
#endif #endif
#if CONFIG_PSNR #if CONFIG_INTERNAL_STATS
int count; int count;
double total_y; double total_y;
double total_u; double total_u;
......
...@@ -391,7 +391,7 @@ typedef struct ...@@ -391,7 +391,7 @@ typedef struct
vp8_sad_multi_d_fn_t sad8x8x4d; vp8_sad_multi_d_fn_t sad8x8x4d;
vp8_sad_multi_d_fn_t sad4x4x4d; 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_8x8;
vp8_ssimpf_fn_t ssimpf; vp8_ssimpf_fn_t ssimpf;
#endif #endif
......
...@@ -112,7 +112,7 @@ static void subtract_b_sse2(BLOCK *be, BLOCKD *bd, int pitch) ...@@ -112,7 +112,7 @@ static void subtract_b_sse2(BLOCK *be, BLOCKD *bd, int pitch)
#endif #endif
#if HAVE_SSSE3 #if HAVE_SSSE3
#if CONFIG_PSNR #if CONFIG_INTERNAL_STATS
#if ARCH_X86_64 #if ARCH_X86_64
typedef void ssimpf typedef void ssimpf
( (
...@@ -292,7 +292,7 @@ void vp8_arch_x86_encoder_init(VP8_COMP *cpi) ...@@ -292,7 +292,7 @@ void vp8_arch_x86_encoder_init(VP8_COMP *cpi)
cpi->rtcd.quantize.fastquantb = vp8_fast_quantize_b_ssse3; cpi->rtcd.quantize.fastquantb = vp8_fast_quantize_b_ssse3;
#if CONFIG_PSNR #if CONFIG_INTERNAL_STATS
#if ARCH_X86_64 #if ARCH_X86_64
cpi->rtcd.variance.ssimpf_8x8 = vp8_ssim_parms_8x8_sse3; cpi->rtcd.variance.ssimpf_8x8 = vp8_ssim_parms_8x8_sse3;
cpi->rtcd.variance.ssimpf = vp8_ssim_parms_16x16_sse3; cpi->rtcd.variance.ssimpf = vp8_ssim_parms_16x16_sse3;
......
...@@ -77,12 +77,12 @@ VP8_CX_SRCS-yes += encoder/rdopt.c ...@@ -77,12 +77,12 @@ VP8_CX_SRCS-yes += encoder/rdopt.c
VP8_CX_SRCS-yes += encoder/sad_c.c VP8_CX_SRCS-yes += encoder/sad_c.c
VP8_CX_SRCS-yes += encoder/segmentation.c VP8_CX_SRCS-yes += encoder/segmentation.c
VP8_CX_SRCS-yes += encoder/segmentation.h 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/tokenize.c
VP8_CX_SRCS-yes += encoder/treewriter.c VP8_CX_SRCS-yes += encoder/treewriter.c
VP8_CX_SRCS-yes += encoder/variance_c.c VP8_CX_SRCS-yes += encoder/variance_c.c
VP8_CX_SRCS-$(CONFIG_PSNR) += common/postproc.h VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.h
VP8_CX_SRCS-$(CONFIG_PSNR) += common/postproc.c VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.c
VP8_CX_SRCS-yes += encoder/temporal_filter.c VP8_CX_SRCS-yes += encoder/temporal_filter.c
VP8_CX_SRCS-yes += encoder/temporal_filter.h VP8_CX_SRCS-yes += encoder/temporal_filter.h
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment