commit 1687085bc0e1702531838237f437ce1e753d4e20
author Debargha Mukherjee <debargha@google.com> Wed Feb 28 10:00:17 2018 -0800
committer Debargha Mukherjee <debargha@google.com> Wed Feb 28 22:17:59 2018 +0000
tree 6efe42636a66e5361361c407c95549f69a1e4f0b
parent e8ed5908b29e4ca0297586a85981eda2de941c65

Remove CONFIG_EXT_PARTITION_TYPES config flag

This tool is fully adopted.

Change-Id: I51a89d62c97dff0fd6bdbd5bd9c39aa04936b4fe

aom_dsp/variance.c

diff --git a/aom_dsp/variance.c b/aom_dsp/variance.c
index ddbb248..5050055 100644
--- a/aom_dsp/variance.c
+++ b/aom_dsp/variance.c
@@ -289,7 +289,7 @@
 VARIANCES(2, 4)
 VARIANCES(2, 2)
 
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION_TYPES
+#if CONFIG_AV1
 VARIANCES(4, 16)
 VARIANCES(16, 4)
 VARIANCES(8, 32)
@@ -298,7 +298,7 @@
 VARIANCES(64, 16)
 VARIANCES(32, 128)
 VARIANCES(128, 32)
-#endif  // CONFIG_AV1 && CONFIG_EXT_PARTITION_TYPES
+#endif  // CONFIG_AV1
 
 GET_VAR(16, 16)
 GET_VAR(8, 8)
@@ -864,7 +864,7 @@
 HIGHBD_VARIANCES(2, 4)
 HIGHBD_VARIANCES(2, 2)
 
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION_TYPES
+#if CONFIG_AV1
 HIGHBD_VARIANCES(4, 16)
 HIGHBD_VARIANCES(16, 4)
 HIGHBD_VARIANCES(8, 32)
@@ -873,7 +873,7 @@
 HIGHBD_VARIANCES(64, 16)
 HIGHBD_VARIANCES(32, 128)
 HIGHBD_VARIANCES(128, 32)
-#endif  // CONFIG_AV1 && CONFIG_EXT_PARTITION_TYPES
+#endif  // CONFIG_AV1
 
 HIGHBD_GET_VAR(8)
 HIGHBD_GET_VAR(16)
@@ -1091,8 +1091,6 @@
 MASK_SUBPIX_VAR(64, 128)
 MASK_SUBPIX_VAR(128, 64)
 MASK_SUBPIX_VAR(128, 128)
-
-#if CONFIG_EXT_PARTITION_TYPES
 MASK_SUBPIX_VAR(4, 16)
 MASK_SUBPIX_VAR(16, 4)
 MASK_SUBPIX_VAR(8, 32)
@@ -1101,7 +1099,6 @@
 MASK_SUBPIX_VAR(64, 16)
 MASK_SUBPIX_VAR(32, 128)
 MASK_SUBPIX_VAR(128, 32)
-#endif  // CONFIG_EXT_PARTITION_TYPES
 
 void aom_highbd_comp_mask_pred_c(uint16_t *comp_pred, const uint8_t *pred8,
                                  int width, int height, const uint8_t *ref8,
@@ -1229,8 +1226,6 @@
 HIGHBD_MASK_SUBPIX_VAR(64, 128)
 HIGHBD_MASK_SUBPIX_VAR(128, 64)
 HIGHBD_MASK_SUBPIX_VAR(128, 128)
-
-#if CONFIG_EXT_PARTITION_TYPES
 HIGHBD_MASK_SUBPIX_VAR(4, 16)
 HIGHBD_MASK_SUBPIX_VAR(16, 4)
 HIGHBD_MASK_SUBPIX_VAR(8, 32)
@@ -1239,7 +1234,6 @@
 HIGHBD_MASK_SUBPIX_VAR(64, 16)
 HIGHBD_MASK_SUBPIX_VAR(32, 128)
 HIGHBD_MASK_SUBPIX_VAR(128, 32)
-#endif  // CONFIG_EXT_PARTITION_TYPES
 #endif  // CONFIG_AV1
 
 #if CONFIG_AV1
@@ -1336,7 +1330,6 @@
 OBMC_VAR(128, 128)
 OBMC_SUBPIX_VAR(128, 128)
 
-#if CONFIG_EXT_PARTITION_TYPES
 OBMC_VAR(4, 16)
 OBMC_SUBPIX_VAR(4, 16)
 OBMC_VAR(16, 4)
@@ -1353,7 +1346,6 @@
 OBMC_SUBPIX_VAR(32, 128)
 OBMC_VAR(128, 32)
 OBMC_SUBPIX_VAR(128, 32)
-#endif  // CONFIG_EXT_PARTITION_TYPES
 
 static INLINE void highbd_obmc_variance64(const uint8_t *pre8, int pre_stride,
                                           const int32_t *wsrc,
@@ -1534,7 +1526,6 @@
 HIGHBD_OBMC_VAR(128, 128)
 HIGHBD_OBMC_SUBPIX_VAR(128, 128)
 
-#if CONFIG_EXT_PARTITION_TYPES
 HIGHBD_OBMC_VAR(4, 16)
 HIGHBD_OBMC_SUBPIX_VAR(4, 16)
 HIGHBD_OBMC_VAR(16, 4)
@@ -1551,5 +1542,4 @@
 HIGHBD_OBMC_SUBPIX_VAR(32, 128)
 HIGHBD_OBMC_VAR(128, 32)
 HIGHBD_OBMC_SUBPIX_VAR(128, 32)
-#endif  // CONFIG_EXT_PARTITION_TYPES
 #endif  // CONFIG_AV1