summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_onyx_if.c
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2013-10-24 18:10:59 +0200
committerJames Zern <jzern@google.com>2013-10-25 22:01:14 +0200
commitd72dfab29667cc1dff7472699856d568a1dbb1b1 (patch)
treeb7907200554e6a0bf7fb6a75cdf7e5bee2d1c374 /vp9/encoder/vp9_onyx_if.c
parentd2bf696ee02893204e1f505384ea385ac49eb9a3 (diff)
downloadlibvpx-d72dfab29667cc1dff7472699856d568a1dbb1b1.tar
libvpx-d72dfab29667cc1dff7472699856d568a1dbb1b1.tar.gz
libvpx-d72dfab29667cc1dff7472699856d568a1dbb1b1.tar.bz2
libvpx-d72dfab29667cc1dff7472699856d568a1dbb1b1.zip
vp9: add above/left_seg_context to encoder
Change-Id: I969406574c6658936e9f6db5752f1b295025aab5
Diffstat (limited to 'vp9/encoder/vp9_onyx_if.c')
-rw-r--r--vp9/encoder/vp9_onyx_if.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c
index afd6fc5fa..9d4630706 100644
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -312,6 +312,9 @@ static void dealloc_compressor_data(VP9_COMP *cpi) {
cpi->mb_activity_map = 0;
vpx_free(cpi->mb_norm_activity_map);
cpi->mb_norm_activity_map = 0;
+
+ vpx_free(cpi->above_seg_context);
+ cpi->above_seg_context = NULL;
}
// Computes a q delta (in "q index" terms) to get from a starting q value
@@ -1040,6 +1043,11 @@ void vp9_alloc_compressor_data(VP9_COMP *cpi) {
CHECK_MEM_ERROR(cm, cpi->mb_norm_activity_map,
vpx_calloc(sizeof(unsigned int),
cm->mb_rows * cm->mb_cols));
+
+ vpx_free(cpi->above_seg_context);
+ CHECK_MEM_ERROR(cm, cpi->above_seg_context,
+ vpx_calloc(mi_cols_aligned_to_sb(cm->mi_cols),
+ sizeof(*cpi->above_seg_context)));
}