shithub: libvpx

Info  •  Files  •  Log  •  Branches

vp9_encoder: add missing alloc checks

Change-Id: I08939ab22446b86fae884daaebd1f14c49b21897

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

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

@@ -1771,8 +1771,9 @@

   }

   if (cpi->b_calculate_consistency) {

-    cpi->ssim_vars = vpx_malloc(sizeof(*cpi->ssim_vars) *

-                                4 * cpi->common.mi_rows * cpi->common.mi_cols);

+    CHECK_MEM_ERROR(cm, cpi->ssim_vars,

+                    vpx_malloc(sizeof(*cpi->ssim_vars) * 4 *

+                               cpi->common.mi_rows * cpi->common.mi_cols));

     cpi->worst_consistency = 100.0;

   }

@@ -2899,7 +2900,7 @@

   vpx_extend_frame_inner_borders(cm->frame_to_show);

 }

-static INLINE void alloc_frame_mvs(const VP9_COMMON *cm,

+static INLINE void alloc_frame_mvs(VP9_COMMON *const cm,

                                    int buffer_idx) {

   RefCntBuffer *const new_fb_ptr = &cm->buffer_pool->frame_bufs[buffer_idx];

   if (new_fb_ptr->mvs == NULL ||

@@ -2906,9 +2907,9 @@

       new_fb_ptr->mi_rows < cm->mi_rows ||

       new_fb_ptr->mi_cols < cm->mi_cols) {

     vpx_free(new_fb_ptr->mvs);

-    new_fb_ptr->mvs =

-      (MV_REF *)vpx_calloc(cm->mi_rows * cm->mi_cols,

-                           sizeof(*new_fb_ptr->mvs));

+    CHECK_MEM_ERROR(cm, new_fb_ptr->mvs,

+                    (MV_REF *)vpx_calloc(cm->mi_rows * cm->mi_cols,

+                                         sizeof(*new_fb_ptr->mvs)));

     new_fb_ptr->mi_rows = cm->mi_rows;

     new_fb_ptr->mi_cols = cm->mi_cols;

   }

@@ -2946,12 +2947,13 @@

         if (force_scaling ||

             new_fb_ptr->buf.y_crop_width != cm->width ||

             new_fb_ptr->buf.y_crop_height != cm->height) {

-          vpx_realloc_frame_buffer(&new_fb_ptr->buf,

-                                   cm->width, cm->height,

-                                   cm->subsampling_x, cm->subsampling_y,

-                                   cm->use_highbitdepth,

-                                   VP9_ENC_BORDER_IN_PIXELS, cm->byte_alignment,

-                                   NULL, NULL, NULL);

+          if (vpx_realloc_frame_buffer(&new_fb_ptr->buf, cm->width, cm->height,

+                                       cm->subsampling_x, cm->subsampling_y,

+                                       cm->use_highbitdepth,

+                                       VP9_ENC_BORDER_IN_PIXELS,

+                                       cm->byte_alignment, NULL, NULL, NULL))

+            vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,

+                               "Failed to allocate frame buffer");

           scale_and_extend_frame(ref, &new_fb_ptr->buf, (int)cm->bit_depth);

           cpi->scaled_ref_idx[ref_frame - 1] = new_fb;

           alloc_frame_mvs(cm, new_fb);

@@ -2971,11 +2973,12 @@

         if (force_scaling ||

             new_fb_ptr->buf.y_crop_width != cm->width ||

             new_fb_ptr->buf.y_crop_height != cm->height) {

-          vpx_realloc_frame_buffer(&new_fb_ptr->buf,

-                                   cm->width, cm->height,

-                                   cm->subsampling_x, cm->subsampling_y,

-                                   VP9_ENC_BORDER_IN_PIXELS, cm->byte_alignment,

-                                   NULL, NULL, NULL);

+          if (vpx_realloc_frame_buffer(&new_fb_ptr->buf, cm->width, cm->height,

+                                       cm->subsampling_x, cm->subsampling_y,

+                                       VP9_ENC_BORDER_IN_PIXELS,

+                                       cm->byte_alignment, NULL, NULL, NULL))

+            vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,

+                               "Failed to allocate frame buffer");

           vp9_scale_and_extend_frame(ref, &new_fb_ptr->buf);

           cpi->scaled_ref_idx[ref_frame - 1] = new_fb;

           alloc_frame_mvs(cm, new_fb);

@@ -3222,12 +3225,14 @@

   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 (vp9_denoiser_alloc(&cpi->denoiser, cm->width, cm->height,

+                           cm->subsampling_x, cm->subsampling_y,

 #if CONFIG_VP9_HIGHBITDEPTH

-                       cm->use_highbitdepth,

+                           cm->use_highbitdepth,

 #endif

-                       VP9_ENC_BORDER_IN_PIXELS);

+                           VP9_ENC_BORDER_IN_PIXELS))

+      vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,

+                         "Failed to allocate denoiser");

   }

 }

 #endif

@@ -3300,14 +3305,15 @@

   alloc_frame_mvs(cm, cm->new_fb_idx);

   // Reset the frame pointers to the current frame size.

-  vpx_realloc_frame_buffer(get_frame_new_buffer(cm),

-                           cm->width, cm->height,

-                           cm->subsampling_x, cm->subsampling_y,

+  if (vpx_realloc_frame_buffer(get_frame_new_buffer(cm), cm->width, cm->height,

+                               cm->subsampling_x, cm->subsampling_y,

 #if CONFIG_VP9_HIGHBITDEPTH

-                           cm->use_highbitdepth,

+                               cm->use_highbitdepth,

 #endif

-                           VP9_ENC_BORDER_IN_PIXELS, cm->byte_alignment,

-                           NULL, NULL, NULL);

+                               VP9_ENC_BORDER_IN_PIXELS, cm->byte_alignment,

+                               NULL, NULL, NULL))

+    vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,

+                       "Failed to allocate frame buffer");

   alloc_util_frame_buffers(cpi);

   init_motion_estimation(cpi);