diff options
| author | John Koleszar <jkoleszar@google.com> | 2010-09-27 07:00:03 -0700 |
|---|---|---|
| committer | Code Review <code-review@webmproject.org> | 2010-09-27 07:00:03 -0700 |
| commit | 9fdcdc511dd87b5e5fe9013150223e56b6ffaffe (patch) | |
| tree | fb80af7905b79766249412b4cb2f38f8338ac944 | |
| parent | 063be9b82a495987e22ec993cb207b9e40644a1f (diff) | |
| parent | 8ca779aba84866f97665705fc30d662ae8bc06c0 (diff) | |
| download | libvpx-9fdcdc511dd87b5e5fe9013150223e56b6ffaffe.tar libvpx-9fdcdc511dd87b5e5fe9013150223e56b6ffaffe.tar.gz libvpx-9fdcdc511dd87b5e5fe9013150223e56b6ffaffe.tar.bz2 libvpx-9fdcdc511dd87b5e5fe9013150223e56b6ffaffe.zip | |
Merge "disable compilation of debugging code"
| -rw-r--r-- | vp8/encoder/onyx_if.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 56bac0aaa..b024507c7 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -2676,6 +2676,8 @@ int vp8_update_entropy(VP8_PTR comp, int update) return 0; } + +#if OUTPUT_YUV_SRC void vp8_write_yuv_frame(const char *name, YV12_BUFFER_CONFIG *s) { FILE *yuv_file = fopen(name, "ab"); @@ -2711,6 +2713,8 @@ void vp8_write_yuv_frame(const char *name, YV12_BUFFER_CONFIG *s) fclose(yuv_file); } +#endif + static void scale_and_extend_source(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi) { @@ -4355,12 +4359,13 @@ static void encode_frame_to_data_rate(VP8_COMP *cpi, unsigned long *size, unsign if (cm->frame_type == KEY_FRAME) cm->refresh_last_frame = 1; - if (0) +#if 0 { FILE *f = fopen("gfactive.stt", "a"); fprintf(f, "%8d %8d %8d %8d %8d\n", cm->current_video_frame, (100 * cpi->gf_active_count) / (cpi->common.mb_rows * cpi->common.mb_cols), cpi->this_iiratio, cpi->next_iiratio, cm->refresh_golden_frame); fclose(f); } +#endif // For inter frames the current default behaviour is that when cm->refresh_golden_frame is set we copy the old GF over to the ARF buffer // This is purely an encoder descision at present. @@ -4604,9 +4609,7 @@ static void encode_frame_to_data_rate(VP8_COMP *cpi, unsigned long *size, unsign } } -#if CONFIG_PSNR - - if (0) +#if 0 && CONFIG_PSNR { FILE *f = fopen("tmp.stt", "a"); @@ -4731,7 +4734,7 @@ static void encode_frame_to_data_rate(VP8_COMP *cpi, unsigned long *size, unsign - if (0) +#if 0 { char filename[512]; FILE *recon_file; @@ -4741,6 +4744,7 @@ static void encode_frame_to_data_rate(VP8_COMP *cpi, unsigned long *size, unsign cm->yv12_fb[cm->lst_fb_idx].frame_size, 1, recon_file); fclose(recon_file); } +#endif // DEBUG //vp8_write_yuv_frame("encoder_recon.yuv", cm->frame_to_show); @@ -4800,8 +4804,6 @@ void vp8_check_gf_quality(VP8_COMP *cpi) } #if 0 - - if (0) { FILE *f = fopen("gfneeded.stt", "a"); fprintf(f, "%10d %10d %10d %10d %10ld \n", |