commit 934af35bdeb87420b19222b8c63108774c35dcba
author Soo-Chul Han <shan@vidyo.com> Sun Oct 15 15:21:51 2017 -0400
committer Soo-Chul Han <shan@vidyo.com> Tue Nov 21 00:50:19 2017 +0000
tree 8519ece74ddd20bdb93578036983a6eaf2eb5bb7
parent 8263f80cf4bcf23744b250a81079e25789f0504c

add segment_pred_last(adopted)

temporal segment map prediction from LAST frame instead of previous

Change-Id: I2f803581c2a6ff72ae428783e596aa3281492073

av1/common/alloccommon.c

diff --git a/av1/common/alloccommon.c b/av1/common/alloccommon.c
index b8e30cf..df85848 100644
--- a/av1/common/alloccommon.c
+++ b/av1/common/alloccommon.c
@@ -48,6 +48,7 @@
   cm->MBs = cm->mb_rows * cm->mb_cols;
 }
 
+#if !CONFIG_SEGMENT_PRED_LAST
 static int alloc_seg_map(AV1_COMMON *cm, int rows, int cols) {
   int i;
   int seg_map_size = rows * cols;
@@ -94,6 +95,7 @@
   }
   cm->seg_map_alloc_size = 0;
 }
+#endif
 
 void av1_free_ref_frame_buffers(BufferPool *pool) {
   int i;
@@ -106,6 +108,10 @@
     }
     aom_free(pool->frame_bufs[i].mvs);
     pool->frame_bufs[i].mvs = NULL;
+#if CONFIG_SEGMENT_PRED_LAST
+    aom_free(pool->frame_bufs[i].seg_map);
+    pool->frame_bufs[i].seg_map = NULL;
+#endif
     aom_free_frame_buffer(&pool->frame_bufs[i].buf);
 #if CONFIG_HASH_ME
     av1_hash_table_destroy(&pool->frame_bufs[i].hash_table);
@@ -203,7 +209,9 @@
 void av1_free_context_buffers(AV1_COMMON *cm) {
   int i;
   cm->free_mi(cm);
+#if !CONFIG_SEGMENT_PRED_LAST
   free_seg_map(cm);
+#endif
   for (i = 0; i < MAX_MB_PLANE; i++) {
     aom_free(cm->above_context[i]);
     cm->above_context[i] = NULL;
@@ -230,11 +238,13 @@
     if (cm->alloc_mi(cm, new_mi_size)) goto fail;
   }
 
+#if !CONFIG_SEGMENT_PRED_LAST
   if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) {
     // Create the segmentation map structure and set to 0.
     free_seg_map(cm);
     if (alloc_seg_map(cm, cm->mi_rows, cm->mi_cols)) goto fail;
   }
+#endif
 
   if (cm->above_context_alloc_cols < cm->mi_cols) {
     // TODO(geza.lore): These are bigger than they need to be.
@@ -293,10 +303,12 @@
 
 void av1_init_context_buffers(AV1_COMMON *cm) {
   cm->setup_mi(cm);
+#if !CONFIG_SEGMENT_PRED_LAST
   if (cm->last_frame_seg_map && !cm->frame_parallel_decode)
     memset(cm->last_frame_seg_map, 0, cm->mi_rows * cm->mi_cols);
+#endif
 }
-
+#if !CONFIG_SEGMENT_PRED_LAST
 void av1_swap_current_and_last_seg_map(AV1_COMMON *cm) {
   // Swap indices.
   const int tmp = cm->seg_map_idx;
@@ -306,3 +318,4 @@
   cm->current_frame_seg_map = cm->seg_map_array[cm->seg_map_idx];
   cm->last_frame_seg_map = cm->seg_map_array[cm->prev_seg_map_idx];
 }
+#endif