generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adrian Grange 2014-08-21 15:25:34 -07:00 committed by Gerrit Code Review
commit 4d5c914809
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vp9/decoder/vp9_decodeframe.c
View File

@ -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");