commit b2f3adf36d10cea87105922fda980790e2e1e889
author Yunqing Wang <yunqingwang@google.com> Fri Feb 16 17:59:34 2018 -0800
committer Yunqing Wang <yunqingwang@google.com> Sun Feb 18 18:43:49 2018 +0000
tree c2634bb1fc80df10f0c3e8e1dad5ed39ba56eebd
parent 948f2a99796505245bb846c7889b92442a652f08

Allocate restoration buffers only when necessary

The restoration buffers are freed and allocated at every frame, which
is not necessary. This patch makes the allocation to happen only when
it is necessary.

Change-Id: I773f7ec9202d17c57bba44a698350e05101fa871

av1/common/alloccommon.c

diff --git a/av1/common/alloccommon.c b/av1/common/alloccommon.c
index 8a6646e..76b17c3 100644
--- a/av1/common/alloccommon.c
+++ b/av1/common/alloccommon.c
@@ -112,9 +112,12 @@
   const int num_planes = av1_num_planes(cm);
   for (int p = 0; p < num_planes; ++p)
     av1_alloc_restoration_struct(cm, &cm->rst_info[p], p > 0);
-  aom_free(cm->rst_tmpbuf);
-  CHECK_MEM_ERROR(cm, cm->rst_tmpbuf,
-                  (int32_t *)aom_memalign(16, RESTORATION_TMPBUF_SIZE));
+
+  if (cm->rst_tmpbuf == NULL) {
+    aom_free(cm->rst_tmpbuf);
+    CHECK_MEM_ERROR(cm, cm->rst_tmpbuf,
+                    (int32_t *)aom_memalign(16, RESTORATION_TMPBUF_SIZE));
+  }
 
   // For striped loop restoration, we divide each row of tiles into "stripes",
   // of height 64 luma pixels but with an offset by RESTORATION_TILE_OFFSET
@@ -156,15 +159,21 @@
     const int buf_size = num_stripes * stride * RESTORATION_CTX_VERT
                          << use_highbd;
     RestorationStripeBoundaries *boundaries = &cm->rst_info[p].boundaries;
-    aom_free(boundaries->stripe_boundary_above);
-    aom_free(boundaries->stripe_boundary_below);
 
-    CHECK_MEM_ERROR(cm, boundaries->stripe_boundary_above,
-                    (uint8_t *)aom_memalign(32, buf_size));
-    CHECK_MEM_ERROR(cm, boundaries->stripe_boundary_below,
-                    (uint8_t *)aom_memalign(32, buf_size));
+    if (buf_size != boundaries->stripe_boundary_size ||
+        boundaries->stripe_boundary_above == NULL ||
+        boundaries->stripe_boundary_below == NULL) {
+      aom_free(boundaries->stripe_boundary_above);
+      aom_free(boundaries->stripe_boundary_below);
 
-    boundaries->stripe_boundary_stride = stride;
+      CHECK_MEM_ERROR(cm, boundaries->stripe_boundary_above,
+                      (uint8_t *)aom_memalign(32, buf_size));
+      CHECK_MEM_ERROR(cm, boundaries->stripe_boundary_below,
+                      (uint8_t *)aom_memalign(32, buf_size));
+
+      boundaries->stripe_boundary_stride = stride;
+      boundaries->stripe_boundary_size = buf_size;
+    }
   }
 }
 

av1/common/restoration.h

diff --git a/av1/common/restoration.h b/av1/common/restoration.h
index 2f55ec4..8734754 100644
--- a/av1/common/restoration.h
+++ b/av1/common/restoration.h
@@ -220,6 +220,7 @@
   uint8_t *stripe_boundary_above;
   uint8_t *stripe_boundary_below;
   int stripe_boundary_stride;
+  int stripe_boundary_size;
 } RestorationStripeBoundaries;
 
 typedef struct {