shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "disable compilation of debugging code"

--- a/vp8/encoder/onyx_if.c

+++ b/vp8/encoder/onyx_if.c

@@ -2676,6 +2676,8 @@

     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,7 +2713,9 @@

     fclose(yuv_file);

 }

+#endif

+

 static void scale_and_extend_source(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi)

 {

     VP8_COMMON *cm = &cpi->common;

@@ -4355,12 +4359,13 @@

     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 @@

         }

     }

-#if CONFIG_PSNR

-

-    if (0)

+#if 0 && CONFIG_PSNR

     {

         FILE *f = fopen("tmp.stt", "a");

@@ -4731,7 +4734,7 @@

-    if (0)

+#if 0

     {

         char filename[512];

         FILE *recon_file;

@@ -4741,6 +4744,7 @@

                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 @@

     }

 #if 0

-

-    if (0)

     {

         FILE *f = fopen("gfneeded.stt", "a");

         fprintf(f, "%10d %10d %10d %10d %10ld \n",