commit 874d36d9c99629e30e46c0113e6e41d6ca32eb9d
author Debargha Mukherjee <debargha@google.com> Wed Dec 14 16:53:17 2016 -0800
committer Debargha Mukherjee <debargha@google.com> Thu Dec 15 19:11:46 2016 +0000
tree 51cc00a3ca27b009b65a54794855af0f3b3f29a8
parent e0954ad6c03bb0b3a57c87d3fe330f8e7493647c

Misc cleanups and enhancements on loop restoration

Includes:
Some cleanups/refactoring
Better buffer management.
Some preps for future chrominance restoration.

Change-Id: Ia264b8989b5f4a53c0764ed3e8258ddc212723fc

av1/common/alloccommon.c

diff --git a/av1/common/alloccommon.c b/av1/common/alloccommon.c
index 86051c8..31c1bf7 100644
--- a/av1/common/alloccommon.c
+++ b/av1/common/alloccommon.c
@@ -87,15 +87,17 @@
 }
 
 #if CONFIG_LOOP_RESTORATION
+void av1_alloc_restoration_buffers(AV1_COMMON *cm) {
+  av1_alloc_restoration_struct(&cm->rst_info, cm->width, cm->height);
+  cm->rst_internal.tmpbuf =
+      (uint8_t *)aom_realloc(cm->rst_internal.tmpbuf, RESTORATION_TMPBUF_SIZE);
+  assert(cm->rst_internal.tmpbuf != NULL);
+}
+
 void av1_free_restoration_buffers(AV1_COMMON *cm) {
-  aom_free(cm->rst_info.restoration_type);
-  cm->rst_info.restoration_type = NULL;
-  aom_free(cm->rst_info.wiener_info);
-  cm->rst_info.wiener_info = NULL;
-  aom_free(cm->rst_info.sgrproj_info);
-  cm->rst_info.sgrproj_info = NULL;
-  aom_free(cm->rst_info.domaintxfmrf_info);
-  cm->rst_info.domaintxfmrf_info = NULL;
+  av1_free_restoration_struct(&cm->rst_info);
+  aom_free(cm->rst_internal.tmpbuf);
+  cm->rst_internal.tmpbuf = NULL;
 }
 #endif  // CONFIG_LOOP_RESTORATION