shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix bug 837: realloc mode info buffers on resize"

--- a/vp9/common/vp9_alloccommon.c

+++ b/vp9/common/vp9_alloccommon.c

@@ -34,7 +34,7 @@

   cm->mi_cols = aligned_width >> MI_SIZE_LOG2;

   cm->mi_rows = aligned_height >> MI_SIZE_LOG2;

-  cm->mi_stride = cm->mi_cols + MI_BLOCK_SIZE;

+  cm->mi_stride = calc_mi_size(cm->mi_cols);

   cm->mb_cols = (cm->mi_cols + 1) >> 1;

   cm->mb_rows = (cm->mi_rows + 1) >> 1;

@@ -60,16 +60,18 @@

   for (i = 0; i < 2; ++i) {

     cm->mip_array[i] =

-        (MODE_INFO *)vpx_calloc(mi_size, sizeof(*cm->mip));

+        (MODE_INFO *)vpx_calloc(mi_size, sizeof(MODE_INFO));

     if (cm->mip_array[i] == NULL)

       return 1;

     cm->mi_grid_base_array[i] =

-        (MODE_INFO **)vpx_calloc(mi_size, sizeof(*cm->mi_grid_base));

+        (MODE_INFO **)vpx_calloc(mi_size, sizeof(MODE_INFO*));

     if (cm->mi_grid_base_array[i] == NULL)

       return 1;

   }

+  cm->mi_alloc_size = mi_size;

+

   // Init the index.

   cm->mi_idx = 0;

   cm->prev_mi_idx = 1;

@@ -131,7 +133,8 @@

   vp9_free_context_buffers(cm);

   vp9_set_mb_mi(cm, width, height);

-  if (alloc_mi(cm, cm->mi_stride * (cm->mi_rows + MI_BLOCK_SIZE))) goto fail;

+  if (alloc_mi(cm, cm->mi_stride * calc_mi_size(cm->mi_rows)))

+    goto fail;

   cm->last_frame_seg_map = (uint8_t *)vpx_calloc(cm->mi_rows * cm->mi_cols, 1);

   if (!cm->last_frame_seg_map) goto fail;

--- a/vp9/common/vp9_onyxc_int.h

+++ b/vp9/common/vp9_onyxc_int.h

@@ -137,6 +137,7 @@

   int mi_idx;

   int prev_mi_idx;

+  int mi_alloc_size;

   MODE_INFO *mip_array[2];

   MODE_INFO **mi_grid_base_array[2];

@@ -273,6 +274,11 @@

     pd->above_context = &xd->above_context[i][above_idx >> pd->subsampling_x];

     pd->left_context = &xd->left_context[i][left_idx >> pd->subsampling_y];

   }

+}

+

+static INLINE int calc_mi_size(int len) {

+  // len is in mi units.

+  return len + MI_BLOCK_SIZE;

 }

 static INLINE void set_mi_row_col(MACROBLOCKD *xd, const TileInfo *const tile,

--- a/vp9/decoder/vp9_decodeframe.c

+++ b/vp9/decoder/vp9_decodeframe.c

@@ -627,16 +627,14 @@

                        "Width and height beyond allowed size.");

 #endif

   if (cm->width != width || cm->height != height) {

-    const int aligned_width = ALIGN_POWER_OF_TWO(width, MI_SIZE_LOG2);

-    const int aligned_height = ALIGN_POWER_OF_TWO(height, MI_SIZE_LOG2);

-

-    // Change in frame size (assumption: color format does not change).

-    if (cm->width == 0 || cm->height == 0 ||

-        aligned_width > cm->width ||

-        aligned_width * aligned_height > cm->width * cm->height) {

+    const int new_rows = ALIGN_POWER_OF_TWO(height,

+                                            MI_SIZE_LOG2) >> MI_SIZE_LOG2;

+    const int new_cols = ALIGN_POWER_OF_TWO(width,

+                                            MI_SIZE_LOG2) >> MI_SIZE_LOG2;

+    if (calc_mi_size(new_rows) * calc_mi_size(new_cols) > cm->mi_alloc_size) {

       if (vp9_alloc_context_buffers(cm, width, height))

         vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,

-                           "Failed to allocate frame buffers");

+                           "Failed to allocate context buffers");

     } else {

       vp9_set_mb_mi(cm, width, height);

     }

--- a/vp9/encoder/vp9_bitstream.c

+++ b/vp9/encoder/vp9_bitstream.c

@@ -421,10 +421,12 @@

   const int bs = (1 << bsl) / 4;

   PARTITION_TYPE partition;

   BLOCK_SIZE subsize;

-  const MODE_INFO *m = cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col];

+  const MODE_INFO *m = NULL;

   if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols)

     return;

+

+  m = cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col];

   partition = partition_lookup[bsl][m->mbmi.sb_type];

   write_partition(cm, xd, bs, mi_row, mi_col, partition, bsize, w);