diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-07-16 11:23:38 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-07-16 11:23:38 -0700 |
| commit | cc1aac1b3cca2a4e388ba9c6d814a472eab33bca (patch) | |
| tree | 3297da74f9b77ab2f45d76c3c9ec74c96842a476 /vp9/common | |
| parent | 585190474411493efa279339e74153d2ffa9474f (diff) | |
| parent | 5efd9609e30eb4220d100a8f32991f8e8b7b63a3 (diff) | |
| download | libvpx-cc1aac1b3cca2a4e388ba9c6d814a472eab33bca.tar libvpx-cc1aac1b3cca2a4e388ba9c6d814a472eab33bca.tar.gz libvpx-cc1aac1b3cca2a4e388ba9c6d814a472eab33bca.tar.bz2 libvpx-cc1aac1b3cca2a4e388ba9c6d814a472eab33bca.zip | |
Merge "Fix above context pointers"
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_alloccommon.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c index 96b27bf7c..bcc8645d4 100644 --- a/vp9/common/vp9_alloccommon.c +++ b/vp9/common/vp9_alloccommon.c @@ -158,10 +158,6 @@ int vp9_alloc_frame_buffers(VP9_COMMON *oci, int width, int height) { if (!oci->above_context[0]) goto fail; - for (i = 1; i < MAX_MB_PLANE; i++) - oci->above_context[i] = - oci->above_context[0] + i * sizeof(ENTROPY_CONTEXT) * 2 * mi_cols; - oci->above_seg_context = vpx_calloc(sizeof(PARTITION_CONTEXT) * mi_cols, 1); if (!oci->above_seg_context) goto fail; @@ -197,9 +193,15 @@ void vp9_initialize_common() { } void vp9_update_frame_size(VP9_COMMON *cm) { + int i, mi_cols; const int aligned_width = ALIGN_POWER_OF_TWO(cm->width, LOG2_MI_SIZE); const int aligned_height = ALIGN_POWER_OF_TWO(cm->height, LOG2_MI_SIZE); set_mb_mi(cm, aligned_width, aligned_height); setup_mi(cm); + + mi_cols = mi_cols_aligned_to_sb(cm->mi_cols); + for (i = 1; i < MAX_MB_PLANE; i++) + cm->above_context[i] = + cm->above_context[0] + i * sizeof(ENTROPY_CONTEXT) * 2 * mi_cols; } |