commit a13c19fbecb85d0ad8655e28b034cd6b12216531
author chiyotsai <chiyotsai@google.com> Thu Aug 15 10:12:57 2019 -0700
committer Chi Yo Tsai <chiyotsai@google.com> Thu Aug 15 20:54:56 2019 +0000
tree 5983720e299eec9c71369c0d5ca4866416a13281
parent 9a9dd27f91e0271b595fc766f668854aa884fab7

Make alloc/free_loop_filter non-static

BUG=aomedia:2460

Change-Id: If38b1433b4de3c6260cfa9fc0ac1a087d8018d68

av1/common/alloccommon.c

diff --git a/av1/common/alloccommon.c b/av1/common/alloccommon.c
index 0823db1..c183e38 100644
--- a/av1/common/alloccommon.c
+++ b/av1/common/alloccommon.c
@@ -169,7 +169,7 @@
   av1_free_above_context_buffers(cm, cm->num_allocated_above_contexts);
 
 #if CONFIG_LPF_MASK
-  free_loop_filter_mask(cm);
+  av1_free_loop_filter_mask(cm);
 #endif
 }
 
@@ -241,3 +241,35 @@
 }
 
 void av1_init_context_buffers(AV1_COMMON *cm) { cm->setup_mi(cm); }
+
+#if CONFIG_LPF_MASK
+int av1_alloc_loop_filter_mask(AV1_COMMON *cm) {
+  aom_free(cm->lf.lfm);
+  cm->lf.lfm = NULL;
+
+  // Each lfm holds bit masks for all the 4x4 blocks in a max
+  // 64x64 (128x128 for ext_partitions) region.  The stride
+  // and rows are rounded up / truncated to a multiple of 16
+  // (32 for ext_partition).
+  cm->lf.lfm_stride = (cm->mi_cols + (MI_SIZE_64X64 - 1)) >> MIN_MIB_SIZE_LOG2;
+  cm->lf.lfm_num = ((cm->mi_rows + (MI_SIZE_64X64 - 1)) >> MIN_MIB_SIZE_LOG2) *
+                   cm->lf.lfm_stride;
+  cm->lf.lfm =
+      (LoopFilterMask *)aom_calloc(cm->lf.lfm_num, sizeof(*cm->lf.lfm));
+  if (!cm->lf.lfm) return 1;
+
+  unsigned int i;
+  for (i = 0; i < cm->lf.lfm_num; ++i) av1_zero(cm->lf.lfm[i]);
+
+  return 0;
+}
+
+void av1_free_loop_filter_mask(AV1_COMMON *cm) {
+  if (cm->lf.lfm == NULL) return;
+
+  aom_free(cm->lf.lfm);
+  cm->lf.lfm = NULL;
+  cm->lf.lfm_num = 0;
+  cm->lf.lfm_stride = 0;
+}
+#endif

av1/common/alloccommon.h

diff --git a/av1/common/alloccommon.h b/av1/common/alloccommon.h
index 6f487ad..ab226fb 100644
--- a/av1/common/alloccommon.h
+++ b/av1/common/alloccommon.h
@@ -43,35 +43,8 @@
 int av1_get_MBs(int width, int height);
 
 #if CONFIG_LPF_MASK
-static INLINE int alloc_loop_filter_mask(AV1_COMMON *cm) {
-  aom_free(cm->lf.lfm);
-  cm->lf.lfm = NULL;
-
-  // Each lfm holds bit masks for all the 4x4 blocks in a max
-  // 64x64 (128x128 for ext_partitions) region.  The stride
-  // and rows are rounded up / truncated to a multiple of 16
-  // (32 for ext_partition).
-  cm->lf.lfm_stride = (cm->mi_cols + (MI_SIZE_64X64 - 1)) >> MIN_MIB_SIZE_LOG2;
-  cm->lf.lfm_num = ((cm->mi_rows + (MI_SIZE_64X64 - 1)) >> MIN_MIB_SIZE_LOG2) *
-                   cm->lf.lfm_stride;
-  cm->lf.lfm =
-      (LoopFilterMask *)aom_calloc(cm->lf.lfm_num, sizeof(*cm->lf.lfm));
-  if (!cm->lf.lfm) return 1;
-
-  unsigned int i;
-  for (i = 0; i < cm->lf.lfm_num; ++i) av1_zero(cm->lf.lfm[i]);
-
-  return 0;
-}
-
-static INLINE void free_loop_filter_mask(AV1_COMMON *cm) {
-  if (cm->lf.lfm == NULL) return;
-
-  aom_free(cm->lf.lfm);
-  cm->lf.lfm = NULL;
-  cm->lf.lfm_num = 0;
-  cm->lf.lfm_stride = 0;
-}
+int av1_alloc_loop_filter_mask(struct AV1Common *cm);
+void av1_free_loop_filter_mask(struct AV1Common *cm);
 #endif
 
 #ifdef __cplusplus

av1/decoder/decoder.c

diff --git a/av1/decoder/decoder.c b/av1/decoder/decoder.c
index 1c63ec4..4cef5e6 100644
--- a/av1/decoder/decoder.c
+++ b/av1/decoder/decoder.c
@@ -70,7 +70,7 @@
   assert(mi_size_wide[cm->mi_alloc_bsize] == mi_size_high[cm->mi_alloc_bsize]);
 
 #if CONFIG_LPF_MASK
-  alloc_loop_filter_mask(cm);
+  av1_alloc_loop_filter_mask(cm);
 #endif
 }
 

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 8449756..f2ea5bf 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -406,7 +406,7 @@
   assert(mi_size_wide[cm->mi_alloc_bsize] == mi_size_high[cm->mi_alloc_bsize]);
 
 #if CONFIG_LPF_MASK
-  alloc_loop_filter_mask(cm);
+  av1_alloc_loop_filter_mask(cm);
 #endif
 }