shithub: libvpx

Info  •  Files  •  Log  •  Branches

Skip duplicate denoiser frame buffer allocation

Allocate the frame buffer allocation for denoiser once during the
encoder initialization. This avoids allocating frame buffer
multiple times and overwriting the buffer pointer without proper
releasing.

Change-Id: I9b3baa6283449d86fd164534d344c036bb035700

--- a/vp9/encoder/vp9_denoiser.c

+++ b/vp9/encoder/vp9_denoiser.c

@@ -458,6 +458,7 @@

   make_grayscale(&denoiser->running_avg_y[i]);

 #endif

   denoiser->increase_denoising = 0;

+  denoiser->frame_buffer_initialized = 1;

   return 0;

 }

@@ -464,6 +465,7 @@

 void vp9_denoiser_free(VP9_DENOISER *denoiser) {

   int i;

+  denoiser->frame_buffer_initialized = 0;

   if (denoiser == NULL) {

     return;

   }

--- a/vp9/encoder/vp9_denoiser.h

+++ b/vp9/encoder/vp9_denoiser.h

@@ -29,6 +29,7 @@

   YV12_BUFFER_CONFIG running_avg_y[MAX_REF_FRAMES];

   YV12_BUFFER_CONFIG mc_running_avg_y;

   int increase_denoising;

+  int frame_buffer_initialized;

 } VP9_DENOISER;

 void vp9_denoiser_update_frame_info(VP9_DENOISER *denoiser,

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -1347,17 +1347,6 @@

 #if CONFIG_VP9_HIGHBITDEPTH

   highbd_set_var_fns(cpi);

 #endif

-

-#if CONFIG_VP9_TEMPORAL_DENOISING

-  if (cpi->oxcf.noise_sensitivity > 0) {

-    vp9_denoiser_alloc(&(cpi->denoiser), cm->width, cm->height,

-                       cm->subsampling_x, cm->subsampling_y,

-#if CONFIG_VP9_HIGHBITDEPTH

-                       cm->use_highbitdepth,

-#endif

-                       VP9_ENC_BORDER_IN_PIXELS);

-  }

-#endif

 }

 #ifndef M_LOG2_E

@@ -3408,6 +3397,20 @@

   }

 }

+#if CONFIG_VP9_TEMPORAL_DENOISING

+static void setup_denoiser_buffer(VP9_COMP *cpi) {

+  VP9_COMMON *const cm = &cpi->common;

+  if (cpi->oxcf.noise_sensitivity > 0 &&

+      !cpi->denoiser.frame_buffer_initialized) {

+    vp9_denoiser_alloc(&(cpi->denoiser), cm->width, cm->height,

+                       cm->subsampling_x, cm->subsampling_y,

+#if CONFIG_VP9_HIGHBITDEPTH

+                       cm->use_highbitdepth,

+#endif

+                       VP9_ENC_BORDER_IN_PIXELS);

+  }

+}

+#endif

 int vp9_receive_raw_frame(VP9_COMP *cpi, unsigned int frame_flags,

                           YV12_BUFFER_CONFIG *sd, int64_t time_stamp,

@@ -3424,6 +3427,9 @@

   check_initial_width(cpi, subsampling_x, subsampling_y);

 #endif  // CONFIG_VP9_HIGHBITDEPTH

+#if CONFIG_VP9_TEMPORAL_DENOISING

+  setup_denoiser_buffer(cpi);

+#endif

   vpx_usec_timer_start(&timer);

   if (vp9_lookahead_push(cpi->lookahead, sd, time_stamp, end_time, frame_flags))

@@ -3997,6 +4003,10 @@

 #else

   check_initial_width(cpi, 1, 1);

 #endif  // CONFIG_VP9_HIGHBITDEPTH

+

+#if CONFIG_VP9_TEMPORAL_DENOISING

+  setup_denoiser_buffer(cpi);

+#endif

   if (width) {

     cm->width = width;