libvpx: Pull from upstream

source/libvpx/vp8/encoder/onyx_if.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 80 matching lines @@
     double *ssim_v
 );
 
 
 #endif
 
 
 #ifdef OUTPUT_YUV_SRC
 FILE *yuv_file;
 #endif
+#ifdef OUTPUT_YUV_DENOISED
+FILE *yuv_denoised_file;
+#endif
 
 #if 0
 FILE *framepsnr;
 FILE *kf_list;
 FILE *keyfile;
 #endif
 
 #if 0
 extern int skip_true_count;
 extern int skip_false_count;
@@ skipping 1630 matching lines @@
     cpi->alt_ref_source = NULL;
     cpi->is_src_frame_alt_ref = 0;
 
 #if CONFIG_TEMPORAL_DENOISING
     if (cpi->oxcf.noise_sensitivity)
     {
       if (!cpi->denoiser.yv12_mc_running_avg.buffer_alloc)
       {
         int width = (cpi->oxcf.Width + 15) & ~15;
         int height = (cpi->oxcf.Height + 15) & ~15;
-        vp8_denoiser_allocate(&cpi->denoiser, width, height);
+        vp8_denoiser_allocate(&cpi->denoiser, width, height,
+                              cpi->common.mb_rows, cpi->common.mb_cols);
       }
     }
 #endif
 
 #if 0
     /* Experimental RD Code */
     cpi->frame_distortion = 0;
     cpi->last_frame_distortion = 0;
 #endif
 
@@ skipping 192 matching lines @@
     cpi->twopass.est_max_qcorrection_factor  = 1.0;
 
     for (i = 0; i < KEY_FRAME_CONTEXT; i++)
     {
         cpi->prior_key_frame_distance[i] = (int)cpi->output_framerate;
     }
 
 #ifdef OUTPUT_YUV_SRC
     yuv_file = fopen("bd.yuv", "ab");
 #endif
+#ifdef OUTPUT_YUV_DENOISED
+    yuv_denoised_file = fopen("denoised.yuv", "ab");
+#endif
 
 #if 0
     framepsnr = fopen("framepsnr.stt", "a");
     kf_list = fopen("kf_list.stt", "w");
 #endif
 
     cpi->output_pkt_list = oxcf->output_pkt_list;
 
 #if !(CONFIG_REALTIME_ONLY)
 
@@ skipping 429 matching lines @@
     vpx_free(cpi->tok);
     vpx_free(cpi->cyclic_refresh_map);
 
     vp8_remove_common(&cpi->common);
     vpx_free(cpi);
     *ptr = 0;
 
 #ifdef OUTPUT_YUV_SRC
     fclose(yuv_file);
 #endif
+#ifdef OUTPUT_YUV_DENOISED
+    fclose(yuv_denoised_file);
+#endif
 
 #if 0
 
     if (keyfile)
         fclose(keyfile);
 
     if (framepsnr)
         fclose(framepsnr);
 
     if (kf_list)
@@ skipping 180 matching lines @@
 }
 int vp8_update_entropy(VP8_COMP *cpi, int update)
 {
     VP8_COMMON *cm = &cpi->common;
     cm->refresh_entropy_probs = update;
 
     return 0;
 }
 
 
-#if OUTPUT_YUV_SRC
-void vp8_write_yuv_frame(const char *name, YV12_BUFFER_CONFIG *s)
+#if defined(OUTPUT_YUV_SRC) || defined(OUTPUT_YUV_DENOISED)
+void vp8_write_yuv_frame(FILE *yuv_file, YV12_BUFFER_CONFIG *s)
 {
-    FILE *yuv_file = fopen(name, "ab");
     unsigned char *src = s->y_buffer;
     int h = s->y_height;
 
     do
     {
         fwrite(src, s->y_width, 1,  yuv_file);
         src += s->y_stride;
     }
     while (--h);
 
     src = s->u_buffer;
     h = s->uv_height;
 
     do
     {
         fwrite(src, s->uv_width, 1,  yuv_file);
         src += s->uv_stride;
     }
     while (--h);
 
     src = s->v_buffer;
     h = s->uv_height;
 
     do
     {
         fwrite(src, s->uv_width, 1, yuv_file);
         src += s->uv_stride;
     }
     while (--h);
-
-    fclose(yuv_file);
 }
 #endif
 
-
 static void scale_and_extend_source(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi)
 {
     VP8_COMMON *cm = &cpi->common;
 
     /* are we resizing the image */
     if (cm->horiz_scale != 0 || cm->vert_scale != 0)
     {
 #if CONFIG_SPATIAL_RESAMPLING
         int UNINITIALIZED_IS_SAFE(hr), UNINITIALIZED_IS_SAFE(hs);
         int UNINITIALIZED_IS_SAFE(vr), UNINITIALIZED_IS_SAFE(vs);
@@ skipping 1226 matching lines @@
             if (cpi->Source->y_stride < 0)
             {
                 src += cpi->Source->y_stride * (cpi->Source->y_height - 1);
             }
         }
     }
 
 #endif
 
 #ifdef OUTPUT_YUV_SRC
-    vp8_write_yuv_frame(cpi->Source);
+    vp8_write_yuv_frame(yuv_file, cpi->Source);
 #endif
 
     do
     {
         vp8_clear_system_state();
 
         vp8_set_quantizer(cpi, Q);
 
         /* setup skip prob for costing in mode/mv decision */
         if (cpi->common.mb_no_coeff_skip)
@@ skipping 518 matching lines @@
         cpi->b_lpf_running = 1;
     }
     else
 #endif
     {
         vp8_loopfilter_frame(cpi, cm);
     }
 
     update_reference_frames(cpi);
 
+#ifdef OUTPUT_YUV_DENOISED
+    vp8_write_yuv_frame(yuv_denoised_file,
+                        &cpi->denoiser.yv12_running_avg[INTRA_FRAME]);
+#endif
+
 #if !(CONFIG_REALTIME_ONLY & CONFIG_ONTHEFLY_BITPACKING)
     if (cpi->oxcf.error_resilient_mode)
     {
         cm->refresh_entropy_probs = 0;
     }
 #endif
 
 #if CONFIG_MULTITHREAD
     /* wait that filter_level is picked so that we can continue with stream packing */
     if (cpi->b_multi_threaded)
@@ skipping 1091 matching lines @@
     }
 
     return Total;
 }
 
 
 int vp8_get_quantizer(VP8_COMP *cpi)
 {
     return cpi->common.base_qindex;
 }