Commit 4d5c9148 authored by Adrian Grange's avatar Adrian Grange Committed by Gerrit Code Review
Browse files

Merge "Fix bug 837 (Part 2): Handle increase in frame width"

parents c72f0ee3 7b2177ce
......@@ -627,11 +627,12 @@ static void resize_context_buffers(VP9_COMMON *cm, int width, int height) {
"Width and height beyond allowed size.");
#endif
if (cm->width != width || cm->height != 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) {
const int new_mi_rows =
calc_mi_size(ALIGN_POWER_OF_TWO(height, MI_SIZE_LOG2) >> MI_SIZE_LOG2);
const int new_mi_cols =
calc_mi_size(ALIGN_POWER_OF_TWO(width, MI_SIZE_LOG2) >> MI_SIZE_LOG2);
if (new_mi_cols > cm->mi_stride ||
(new_mi_rows * new_mi_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 context buffers");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment