shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix allocation of context buffers on frame resize"

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

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

@@ -627,9 +627,13 @@

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

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

+        aligned_width > cm->width ||

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

       if (vp9_alloc_context_buffers(cm, width, height))

         vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,

                            "Failed to allocate frame buffers");