Move bitmask tables.

Change-Id: Ia69c36100537c405b6c144e342d6c6df6ed4f6d9

av1/common/av1_loopfilter.c

diff --git a/av1/common/av1_loopfilter.c b/av1/common/av1_loopfilter.c
index b13f367..39bd1c6 100644
--- a/av1/common/av1_loopfilter.c
+++ b/av1/common/av1_loopfilter.c
@@ -40,7 +40,6 @@
   1, 1, 1, 1, 1, 1, 0, 1  // INTER_COMPOUND_MODES (GLOBAL_GLOBALMV == 0)
 };
 
-#if LOOP_FILTER_BITMASK
 // 256 bit masks (64x64 / 4x4) for left transform size for Y plane.
 // We use 4 uint64_t to represent the 256 bit.
 // Each 1 represents a position where we should apply a loop filter
@@ -406,6 +405,7 @@
       0x0000000000000000ULL } },  // block size 64X16, TX_64X16
 };
 
+#if LOOP_FILTER_BITMASK
 LoopFilterMask *get_loop_filter_mask(const AV1_COMMON *const cm, int mi_row,
                                      int mi_col) {
   assert(cm->lf.lfm != NULL);

av1/common/av1_loopfilter.h

diff --git a/av1/common/av1_loopfilter.h b/av1/common/av1_loopfilter.h
index 3129ce5..ae4d372 100644
--- a/av1/common/av1_loopfilter.h
+++ b/av1/common/av1_loopfilter.h
@@ -33,11 +33,11 @@
   LF_PATH_SLOW,
 };
 
-#if LOOP_FILTER_BITMASK
 typedef struct {
   uint64_t bits[4];
 } FilterMask;
 
+#if LOOP_FILTER_BITMASK
 // This structure holds bit masks for all 4x4 blocks in a 64x64 region.
 // Each 1 bit represents a position in which we want to apply the loop filter.
 // For Y plane, 4x4 in 64x64 requires 16x16 = 256 bit, therefore we use 4
@@ -191,6 +191,8 @@
     struct AV1Common *const cm, struct macroblockd_plane *const plane_ptr,
     int pl, int mi_row, int mi_col);
 
+#endif  // LOOP_FILTER_BITMASK
+
 extern const int mask_id_table_tx_4x4[BLOCK_SIZES_ALL];
 
 extern const int mask_id_table_tx_8x8[BLOCK_SIZES_ALL];
@@ -207,8 +209,6 @@
 
 extern const FilterMask above_mask_univariant_reordered[67];
 
-#endif
-
 #ifdef __cplusplus
 }  // extern "C"
 #endif