Remove CONFIG_EXT_PARTITION_TYPES config flag
This tool is fully adopted.
Change-Id: I51a89d62c97dff0fd6bdbd5bd9c39aa04936b4fe
diff --git a/aom_dsp/aom_dsp_rtcd_defs.pl b/aom_dsp/aom_dsp_rtcd_defs.pl
index bde8b66..fefa905 100755
--- a/aom_dsp/aom_dsp_rtcd_defs.pl
+++ b/aom_dsp/aom_dsp_rtcd_defs.pl
@@ -47,16 +47,14 @@
push @block_sizes, [$w, $h] if ($w <= 2*$h && $h <= 2*$w) ;
}
}
-if (aom_config("CONFIG_EXT_PARTITION_TYPES") eq "yes") {
- push @block_sizes, [4, 16];
- push @block_sizes, [16, 4];
- push @block_sizes, [8, 32];
- push @block_sizes, [32, 8];
- push @block_sizes, [16, 64];
- push @block_sizes, [64, 16];
- push @block_sizes, [32, 128];
- push @block_sizes, [128, 32];
-}
+push @block_sizes, [4, 16];
+push @block_sizes, [16, 4];
+push @block_sizes, [8, 32];
+push @block_sizes, [32, 8];
+push @block_sizes, [16, 64];
+push @block_sizes, [64, 16];
+push @block_sizes, [32, 128];
+push @block_sizes, [128, 32];
@tx_dims = (2, 4, 8, 16, 32, 64);
@tx_sizes = ();
@@ -689,16 +687,14 @@
specialize qw/aom_jnt_sad4x8_avg ssse3/;
specialize qw/aom_jnt_sad4x4_avg ssse3/;
- if (aom_config("CONFIG_EXT_PARTITION_TYPES") eq "yes") {
- specialize qw/aom_jnt_sad4x16_avg ssse3/;
- specialize qw/aom_jnt_sad16x4_avg ssse3/;
- specialize qw/aom_jnt_sad8x32_avg ssse3/;
- specialize qw/aom_jnt_sad32x8_avg ssse3/;
- specialize qw/aom_jnt_sad16x64_avg ssse3/;
- specialize qw/aom_jnt_sad64x16_avg ssse3/;
- specialize qw/aom_jnt_sad32x128_avg ssse3/;
- specialize qw/aom_jnt_sad128x32_avg ssse3/;
- }
+ specialize qw/aom_jnt_sad4x16_avg ssse3/;
+ specialize qw/aom_jnt_sad16x4_avg ssse3/;
+ specialize qw/aom_jnt_sad8x32_avg ssse3/;
+ specialize qw/aom_jnt_sad32x8_avg ssse3/;
+ specialize qw/aom_jnt_sad16x64_avg ssse3/;
+ specialize qw/aom_jnt_sad64x16_avg ssse3/;
+ specialize qw/aom_jnt_sad32x128_avg ssse3/;
+ specialize qw/aom_jnt_sad128x32_avg ssse3/;
add_proto qw/unsigned int/, "aom_sad4xh", "const uint8_t *a, int a_stride, const uint8_t *b, int b_stride, int width, int height";
add_proto qw/unsigned int/, "aom_sad8xh", "const uint8_t *a, int a_stride, const uint8_t *b, int b_stride, int width, int height";
@@ -754,19 +750,18 @@
specialize qw/aom_highbd_sad16x8_avg avx2 sse2/;
specialize qw/aom_highbd_sad8x4_avg sse2/;
- if (aom_config("CONFIG_EXT_PARTITION_TYPES") eq "yes") {
- specialize qw/aom_highbd_sad16x4 sse2/;
- specialize qw/aom_highbd_sad8x32 sse2/;
- specialize qw/aom_highbd_sad32x8 sse2/;
- specialize qw/aom_highbd_sad16x64 sse2/;
- specialize qw/aom_highbd_sad64x16 sse2/;
+ specialize qw/aom_highbd_sad16x4 sse2/;
+ specialize qw/aom_highbd_sad8x32 sse2/;
+ specialize qw/aom_highbd_sad32x8 sse2/;
+ specialize qw/aom_highbd_sad16x64 sse2/;
+ specialize qw/aom_highbd_sad64x16 sse2/;
- specialize qw/aom_highbd_sad16x4_avg sse2/;
- specialize qw/aom_highbd_sad8x32_avg sse2/;
- specialize qw/aom_highbd_sad32x8_avg sse2/;
- specialize qw/aom_highbd_sad16x64_avg sse2/;
- specialize qw/aom_highbd_sad64x16_avg sse2/;
- }
+ specialize qw/aom_highbd_sad16x4_avg sse2/;
+ specialize qw/aom_highbd_sad8x32_avg sse2/;
+ specialize qw/aom_highbd_sad32x8_avg sse2/;
+ specialize qw/aom_highbd_sad16x64_avg sse2/;
+ specialize qw/aom_highbd_sad64x16_avg sse2/;
+
#
# Masked SAD
#
@@ -884,50 +879,46 @@
specialize qw/aom_sad4x8x4d msa sse2/;
specialize qw/aom_sad4x4x4d msa sse2/;
- if (aom_config("CONFIG_EXT_PARTITION_TYPES") eq "yes") {
- specialize qw/aom_sad4x16x4d sse2/;
- specialize qw/aom_sad16x4x4d sse2/;
- specialize qw/aom_sad8x32x4d sse2/;
- specialize qw/aom_sad32x8x4d sse2/;
- specialize qw/aom_sad16x64x4d sse2/;
- specialize qw/aom_sad64x16x4d sse2/;
+ specialize qw/aom_sad4x16x4d sse2/;
+ specialize qw/aom_sad16x4x4d sse2/;
+ specialize qw/aom_sad8x32x4d sse2/;
+ specialize qw/aom_sad32x8x4d sse2/;
+ specialize qw/aom_sad16x64x4d sse2/;
+ specialize qw/aom_sad64x16x4d sse2/;
+
+ #
+ # Multi-block SAD, comparing a reference to N independent blocks
+ #
+ foreach (@block_sizes) {
+ ($w, $h) = @$_;
+ add_proto qw/void/, "aom_highbd_sad${w}x${h}x4d", "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array";
+ if ($w != 128 && $h != 128) {
+ specialize "aom_highbd_sad${w}x${h}x4d", qw/sse2/;
+ }
}
+ specialize qw/aom_highbd_sad128x128x4d avx2/;
+ specialize qw/aom_highbd_sad128x64x4d avx2/;
+ specialize qw/aom_highbd_sad64x128x4d avx2/;
+ specialize qw/aom_highbd_sad64x64x4d sse2 avx2/;
+ specialize qw/aom_highbd_sad64x32x4d sse2 avx2/;
+ specialize qw/aom_highbd_sad32x64x4d sse2 avx2/;
+ specialize qw/aom_highbd_sad32x32x4d sse2 avx2/;
+ specialize qw/aom_highbd_sad32x16x4d sse2 avx2/;
+ specialize qw/aom_highbd_sad16x32x4d sse2 avx2/;
+ specialize qw/aom_highbd_sad16x16x4d sse2 avx2/;
+ specialize qw/aom_highbd_sad16x8x4d sse2 avx2/;
+ specialize qw/aom_highbd_sad8x16x4d sse2/;
+ specialize qw/aom_highbd_sad8x8x4d sse2/;
+ specialize qw/aom_highbd_sad8x4x4d sse2/;
+ specialize qw/aom_highbd_sad4x8x4d sse2/;
+ specialize qw/aom_highbd_sad4x4x4d sse2/;
- #
- # Multi-block SAD, comparing a reference to N independent blocks
- #
- foreach (@block_sizes) {
- ($w, $h) = @$_;
- add_proto qw/void/, "aom_highbd_sad${w}x${h}x4d", "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array";
- if ($w != 128 && $h != 128) {
- specialize "aom_highbd_sad${w}x${h}x4d", qw/sse2/;
- }
- }
- specialize qw/aom_highbd_sad128x128x4d avx2/;
- specialize qw/aom_highbd_sad128x64x4d avx2/;
- specialize qw/aom_highbd_sad64x128x4d avx2/;
- specialize qw/aom_highbd_sad64x64x4d sse2 avx2/;
- specialize qw/aom_highbd_sad64x32x4d sse2 avx2/;
- specialize qw/aom_highbd_sad32x64x4d sse2 avx2/;
- specialize qw/aom_highbd_sad32x32x4d sse2 avx2/;
- specialize qw/aom_highbd_sad32x16x4d sse2 avx2/;
- specialize qw/aom_highbd_sad16x32x4d sse2 avx2/;
- specialize qw/aom_highbd_sad16x16x4d sse2 avx2/;
- specialize qw/aom_highbd_sad16x8x4d sse2 avx2/;
- specialize qw/aom_highbd_sad8x16x4d sse2/;
- specialize qw/aom_highbd_sad8x8x4d sse2/;
- specialize qw/aom_highbd_sad8x4x4d sse2/;
- specialize qw/aom_highbd_sad4x8x4d sse2/;
- specialize qw/aom_highbd_sad4x4x4d sse2/;
-
- if (aom_config("CONFIG_EXT_PARTITION_TYPES") eq "yes") {
- specialize qw/aom_highbd_sad4x16x4d sse2/;
- specialize qw/aom_highbd_sad16x4x4d sse2/;
- specialize qw/aom_highbd_sad8x32x4d sse2/;
- specialize qw/aom_highbd_sad32x8x4d sse2/;
- specialize qw/aom_highbd_sad16x64x4d sse2/;
- specialize qw/aom_highbd_sad64x16x4d sse2/;
- }
+ specialize qw/aom_highbd_sad4x16x4d sse2/;
+ specialize qw/aom_highbd_sad16x4x4d sse2/;
+ specialize qw/aom_highbd_sad8x32x4d sse2/;
+ specialize qw/aom_highbd_sad32x8x4d sse2/;
+ specialize qw/aom_highbd_sad16x64x4d sse2/;
+ specialize qw/aom_highbd_sad64x16x4d sse2/;
#
@@ -1078,26 +1069,24 @@
specialize qw/aom_sub_pixel_avg_variance4x8 msa sse2 ssse3/;
specialize qw/aom_sub_pixel_avg_variance4x4 msa sse2 ssse3/;
- if (aom_config("CONFIG_EXT_PARTITION_TYPES") eq "yes") {
- specialize qw/aom_variance4x16 sse2/;
- specialize qw/aom_variance16x4 sse2/;
- specialize qw/aom_variance8x32 sse2/;
- specialize qw/aom_variance32x8 sse2/;
- specialize qw/aom_variance16x64 sse2/;
- specialize qw/aom_variance64x16 sse2/;
- specialize qw/aom_sub_pixel_variance4x16 sse2 ssse3/;
- specialize qw/aom_sub_pixel_variance16x4 sse2 ssse3/;
- specialize qw/aom_sub_pixel_variance8x32 sse2 ssse3/;
- specialize qw/aom_sub_pixel_variance32x8 sse2 ssse3/;
- specialize qw/aom_sub_pixel_variance16x64 sse2 ssse3/;
- specialize qw/aom_sub_pixel_variance64x16 sse2 ssse3/;
- specialize qw/aom_sub_pixel_avg_variance4x16 sse2 ssse3/;
- specialize qw/aom_sub_pixel_avg_variance16x4 sse2 ssse3/;
- specialize qw/aom_sub_pixel_avg_variance8x32 sse2 ssse3/;
- specialize qw/aom_sub_pixel_avg_variance32x8 sse2 ssse3/;
- specialize qw/aom_sub_pixel_avg_variance16x64 sse2 ssse3/;
- specialize qw/aom_sub_pixel_avg_variance64x16 sse2 ssse3/;
- }
+ specialize qw/aom_variance4x16 sse2/;
+ specialize qw/aom_variance16x4 sse2/;
+ specialize qw/aom_variance8x32 sse2/;
+ specialize qw/aom_variance32x8 sse2/;
+ specialize qw/aom_variance16x64 sse2/;
+ specialize qw/aom_variance64x16 sse2/;
+ specialize qw/aom_sub_pixel_variance4x16 sse2 ssse3/;
+ specialize qw/aom_sub_pixel_variance16x4 sse2 ssse3/;
+ specialize qw/aom_sub_pixel_variance8x32 sse2 ssse3/;
+ specialize qw/aom_sub_pixel_variance32x8 sse2 ssse3/;
+ specialize qw/aom_sub_pixel_variance16x64 sse2 ssse3/;
+ specialize qw/aom_sub_pixel_variance64x16 sse2 ssse3/;
+ specialize qw/aom_sub_pixel_avg_variance4x16 sse2 ssse3/;
+ specialize qw/aom_sub_pixel_avg_variance16x4 sse2 ssse3/;
+ specialize qw/aom_sub_pixel_avg_variance8x32 sse2 ssse3/;
+ specialize qw/aom_sub_pixel_avg_variance32x8 sse2 ssse3/;
+ specialize qw/aom_sub_pixel_avg_variance16x64 sse2 ssse3/;
+ specialize qw/aom_sub_pixel_avg_variance64x16 sse2 ssse3/;
if (aom_config("CONFIG_JNT_COMP") eq "yes") {
specialize qw/aom_jnt_sub_pixel_avg_variance64x64 ssse3/;
@@ -1114,16 +1103,14 @@
specialize qw/aom_jnt_sub_pixel_avg_variance4x8 ssse3/;
specialize qw/aom_jnt_sub_pixel_avg_variance4x4 ssse3/;
- if (aom_config("CONFIG_EXT_PARTITION_TYPES") eq "yes") {
- specialize qw/aom_jnt_sub_pixel_avg_variance4x16 ssse3/;
- specialize qw/aom_jnt_sub_pixel_avg_variance16x4 ssse3/;
- specialize qw/aom_jnt_sub_pixel_avg_variance8x32 ssse3/;
- specialize qw/aom_jnt_sub_pixel_avg_variance32x8 ssse3/;
- specialize qw/aom_jnt_sub_pixel_avg_variance16x64 ssse3/;
- specialize qw/aom_jnt_sub_pixel_avg_variance64x16 ssse3/;
- specialize qw/aom_jnt_sub_pixel_avg_variance128x32 ssse3/;
- specialize qw/aom_jnt_sub_pixel_avg_variance32x128 ssse3/;
- }
+ specialize qw/aom_jnt_sub_pixel_avg_variance4x16 ssse3/;
+ specialize qw/aom_jnt_sub_pixel_avg_variance16x4 ssse3/;
+ specialize qw/aom_jnt_sub_pixel_avg_variance8x32 ssse3/;
+ specialize qw/aom_jnt_sub_pixel_avg_variance32x8 ssse3/;
+ specialize qw/aom_jnt_sub_pixel_avg_variance16x64 ssse3/;
+ specialize qw/aom_jnt_sub_pixel_avg_variance64x16 ssse3/;
+ specialize qw/aom_jnt_sub_pixel_avg_variance128x32 ssse3/;
+ specialize qw/aom_jnt_sub_pixel_avg_variance32x128 ssse3/;
specialize qw/aom_jnt_sub_pixel_avg_variance128x128 ssse3/;
specialize qw/aom_jnt_sub_pixel_avg_variance128x64 ssse3/;
diff --git a/aom_dsp/sad.c b/aom_dsp/sad.c
index 7237be5..864efe3 100644
--- a/aom_dsp/sad.c
+++ b/aom_dsp/sad.c
@@ -193,7 +193,7 @@
sadMxh(4);
#endif // CONFIG_JNT_COMP
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION_TYPES
+#if CONFIG_AV1
sadMxN(4, 16)
sadMxNx4D(4, 16)
sadMxN(16, 4)
@@ -389,7 +389,7 @@
highbd_sadMxNxK(4, 4, 8)
highbd_sadMxNx4D(4, 4)
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION_TYPES
+#if CONFIG_AV1
highbd_sadMxN(4, 16)
highbd_sadMxNx4D(4, 16)
highbd_sadMxN(16, 4)
diff --git a/aom_dsp/sad_av1.c b/aom_dsp/sad_av1.c
index bb7c946..9216480 100644
--- a/aom_dsp/sad_av1.c
+++ b/aom_dsp/sad_av1.c
@@ -71,7 +71,6 @@
MASKSADMxN(4, 8)
MASKSADMxN(4, 4)
-#if CONFIG_EXT_PARTITION_TYPES
MASKSADMxN(4, 16)
MASKSADMxN(16, 4)
MASKSADMxN(8, 32)
@@ -80,7 +79,7 @@
MASKSADMxN(64, 16)
MASKSADMxN(32, 128)
MASKSADMxN(128, 32)
-#endif
+
/* clang-format on */
static INLINE
@@ -141,7 +140,7 @@
HIGHBD_MASKSADMXN(4, 8)
HIGHBD_MASKSADMXN(4, 4)
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION_TYPES
+#if CONFIG_AV1
HIGHBD_MASKSADMXN(4, 16)
HIGHBD_MASKSADMXN(16, 4)
HIGHBD_MASKSADMXN(8, 32)
@@ -198,7 +197,7 @@
OBMCSADMxN(4, 8)
OBMCSADMxN(4, 4)
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION_TYPES
+#if CONFIG_AV1
OBMCSADMxN(4, 16)
OBMCSADMxN(16, 4)
OBMCSADMxN(8, 32)
@@ -255,7 +254,7 @@
HIGHBD_OBMCSADMXN(4, 8)
HIGHBD_OBMCSADMXN(4, 4)
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION_TYPES
+#if CONFIG_AV1
HIGHBD_OBMCSADMXN(4, 16)
HIGHBD_OBMCSADMXN(16, 4)
HIGHBD_OBMCSADMXN(8, 32)
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
diff --git a/aom_dsp/x86/highbd_sad4d_sse2.asm b/aom_dsp/x86/highbd_sad4d_sse2.asm
index 855bc65..e0d2252 100644
--- a/aom_dsp/x86/highbd_sad4d_sse2.asm
+++ b/aom_dsp/x86/highbd_sad4d_sse2.asm
@@ -288,11 +288,9 @@
HIGH_SADNXN4D 8, 4
HIGH_SADNXN4D 4, 8
HIGH_SADNXN4D 4, 4
-%if CONFIG_EXT_PARTITION_TYPES
HIGH_SADNXN4D 4, 16
HIGH_SADNXN4D 16, 4
HIGH_SADNXN4D 8, 32
HIGH_SADNXN4D 32, 8
HIGH_SADNXN4D 16, 64
HIGH_SADNXN4D 64, 16
-%endif
diff --git a/aom_dsp/x86/highbd_sad_sse2.asm b/aom_dsp/x86/highbd_sad_sse2.asm
index 760e68a..3398d8a 100644
--- a/aom_dsp/x86/highbd_sad_sse2.asm
+++ b/aom_dsp/x86/highbd_sad_sse2.asm
@@ -158,10 +158,8 @@
HIGH_SAD64XN 32 ; highbd_sad64x32_sse2
HIGH_SAD64XN 64, 1 ; highbd_sad64x64_avg_sse2
HIGH_SAD64XN 32, 1 ; highbd_sad64x32_avg_sse2
-%if CONFIG_EXT_PARTITION_TYPES
HIGH_SAD64XN 16 ; highbd_sad_64x16_sse2
HIGH_SAD64XN 16, 1 ; highbd_sad_64x16_avg_sse2
-%endif
; unsigned int aom_highbd_sad32x{16,32,64}_sse2(uint8_t *src, int src_stride,
; uint8_t *ref, int ref_stride);
@@ -230,10 +228,8 @@
HIGH_SAD32XN 64, 1 ; highbd_sad32x64_avg_sse2
HIGH_SAD32XN 32, 1 ; highbd_sad32x32_avg_sse2
HIGH_SAD32XN 16, 1 ; highbd_sad32x16_avg_sse2
-%if CONFIG_EXT_PARTITION_TYPES
HIGH_SAD32XN 8 ; highbd_sad_32x8_sse2
HIGH_SAD32XN 8, 1 ; highbd_sad_32x8_avg_sse2
-%endif
; unsigned int aom_highbd_sad16x{8,16,32}_sse2(uint8_t *src, int src_stride,
; uint8_t *ref, int ref_stride);
@@ -302,12 +298,10 @@
HIGH_SAD16XN 32, 1 ; highbd_sad16x32_avg_sse2
HIGH_SAD16XN 16, 1 ; highbd_sad16x16_avg_sse2
HIGH_SAD16XN 8, 1 ; highbd_sad16x8_avg_sse2
-%if CONFIG_EXT_PARTITION_TYPES
HIGH_SAD16XN 4 ; highbd_sad_16x4_sse2
HIGH_SAD16XN 4, 1 ; highbd_sad_16x4_avg_sse2
HIGH_SAD16XN 64 ; highbd_sad_16x64_sse2
HIGH_SAD16XN 64, 1 ; highbd_sad_16x64_avg_sse2
-%endif
; unsigned int aom_highbd_sad8x{4,8,16}_sse2(uint8_t *src, int src_stride,
; uint8_t *ref, int ref_stride);
@@ -376,7 +370,5 @@
HIGH_SAD8XN 16, 1 ; highbd_sad8x16_avg_sse2
HIGH_SAD8XN 8, 1 ; highbd_sad8x8_avg_sse2
HIGH_SAD8XN 4, 1 ; highbd_sad8x4_avg_sse2
-%if CONFIG_EXT_PARTITION_TYPES
HIGH_SAD8XN 32 ; highbd_sad_8x32_sse2
HIGH_SAD8XN 32, 1 ; highbd_sad_8x32_avg_sse2
-%endif
diff --git a/aom_dsp/x86/highbd_variance_sse2.c b/aom_dsp/x86/highbd_variance_sse2.c
index e8d8cb2..c6f3230 100644
--- a/aom_dsp/x86/highbd_variance_sse2.c
+++ b/aom_dsp/x86/highbd_variance_sse2.c
@@ -187,13 +187,11 @@
VAR_FN(16, 8, 8, 7);
VAR_FN(8, 16, 8, 7);
VAR_FN(8, 8, 8, 6);
-#if CONFIG_EXT_PARTITION_TYPES
VAR_FN(16, 4, 16, 6);
VAR_FN(8, 32, 8, 8);
VAR_FN(32, 8, 8, 8);
VAR_FN(16, 64, 16, 10);
VAR_FN(64, 16, 16, 10);
-#endif
#undef VAR_FN
@@ -400,7 +398,6 @@
return (var >= 0) ? (uint32_t)var : 0; \
}
-#if CONFIG_EXT_PARTITION_TYPES
#define FNS(opt) \
FN(64, 64, 16, 6, 6, opt, (int64_t)); \
FN(64, 32, 16, 6, 5, opt, (int64_t)); \
@@ -418,20 +415,6 @@
FN(32, 8, 16, 5, 3, opt, (int64_t)); \
FN(16, 64, 16, 4, 6, opt, (int64_t)); \
FN(64, 16, 16, 6, 4, opt, (int64_t))
-#else
-#define FNS(opt) \
- FN(64, 64, 16, 6, 6, opt, (int64_t)); \
- FN(64, 32, 16, 6, 5, opt, (int64_t)); \
- FN(32, 64, 16, 5, 6, opt, (int64_t)); \
- FN(32, 32, 16, 5, 5, opt, (int64_t)); \
- FN(32, 16, 16, 5, 4, opt, (int64_t)); \
- FN(16, 32, 16, 4, 5, opt, (int64_t)); \
- FN(16, 16, 16, 4, 4, opt, (int64_t)); \
- FN(16, 8, 16, 4, 3, opt, (int64_t)); \
- FN(8, 16, 8, 3, 4, opt, (int64_t)); \
- FN(8, 8, 8, 3, 3, opt, (int64_t)); \
- FN(8, 4, 8, 3, 2, opt, (int64_t))
-#endif
FNS(sse2);
@@ -579,7 +562,6 @@
return (var >= 0) ? (uint32_t)var : 0; \
}
-#if CONFIG_EXT_PARTITION_TYPES
#define FNS(opt) \
FN(64, 64, 16, 6, 6, opt, (int64_t)); \
FN(64, 32, 16, 6, 5, opt, (int64_t)); \
@@ -597,20 +579,6 @@
FN(32, 8, 16, 5, 3, opt, (int64_t)); \
FN(16, 64, 16, 4, 6, opt, (int64_t)); \
FN(64, 16, 16, 6, 4, opt, (int64_t));
-#else
-#define FNS(opt) \
- FN(64, 64, 16, 6, 6, opt, (int64_t)); \
- FN(64, 32, 16, 6, 5, opt, (int64_t)); \
- FN(32, 64, 16, 5, 6, opt, (int64_t)); \
- FN(32, 32, 16, 5, 5, opt, (int64_t)); \
- FN(32, 16, 16, 5, 4, opt, (int64_t)); \
- FN(16, 32, 16, 4, 5, opt, (int64_t)); \
- FN(16, 16, 16, 4, 4, opt, (int64_t)); \
- FN(16, 8, 16, 4, 3, opt, (int64_t)); \
- FN(8, 16, 8, 3, 4, opt, (int64_t)); \
- FN(8, 8, 8, 3, 3, opt, (int64_t)); \
- FN(8, 4, 8, 3, 2, opt, (int64_t));
-#endif
FNS(sse2);
diff --git a/aom_dsp/x86/jnt_sad_ssse3.c b/aom_dsp/x86/jnt_sad_ssse3.c
index 9c01c65..fe5f2be 100644
--- a/aom_dsp/x86/jnt_sad_ssse3.c
+++ b/aom_dsp/x86/jnt_sad_ssse3.c
@@ -236,7 +236,7 @@
jnt_sadMxN_sse2(4, 8)
jnt_sadMxN_sse2(4, 4)
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION_TYPES
+#if CONFIG_AV1
jnt_sadMxN_sse2(4, 16)
jnt_sadMxN_sse2(16, 4)
jnt_sadMxN_sse2(8, 32)
diff --git a/aom_dsp/x86/jnt_variance_ssse3.c b/aom_dsp/x86/jnt_variance_ssse3.c
index e4201a8..a885223 100644
--- a/aom_dsp/x86/jnt_variance_ssse3.c
+++ b/aom_dsp/x86/jnt_variance_ssse3.c
@@ -292,7 +292,7 @@
JNT_SUBPIX_AVG_VAR(4, 8)
JNT_SUBPIX_AVG_VAR(4, 4)
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION_TYPES
+#if CONFIG_AV1
JNT_SUBPIX_AVG_VAR(4, 16)
JNT_SUBPIX_AVG_VAR(16, 4)
JNT_SUBPIX_AVG_VAR(8, 32)
@@ -301,6 +301,6 @@
JNT_SUBPIX_AVG_VAR(64, 16)
JNT_SUBPIX_AVG_VAR(32, 128)
JNT_SUBPIX_AVG_VAR(128, 32)
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION_TYPES
+#endif // CONFIG_AV1
#endif // CONFIG_JNT_COMP
diff --git a/aom_dsp/x86/masked_sad_intrin_ssse3.c b/aom_dsp/x86/masked_sad_intrin_ssse3.c
index bab9d85..f5c63e8 100644
--- a/aom_dsp/x86/masked_sad_intrin_ssse3.c
+++ b/aom_dsp/x86/masked_sad_intrin_ssse3.c
@@ -91,7 +91,6 @@
MASKSAD8XN_SSSE3(4)
MASKSAD4XN_SSSE3(8)
MASKSAD4XN_SSSE3(4)
-#if CONFIG_EXT_PARTITION_TYPES
MASKSAD4XN_SSSE3(16)
MASKSADMXN_SSSE3(16, 4)
MASKSAD8XN_SSSE3(32)
@@ -100,7 +99,6 @@
MASKSADMXN_SSSE3(64, 16)
MASKSADMXN_SSSE3(32, 128)
MASKSADMXN_SSSE3(128, 32)
-#endif // CONFIG_EXT_PARTITION_TYPES
static INLINE unsigned int masked_sad_ssse3(const uint8_t *src_ptr,
int src_stride,
@@ -288,7 +286,6 @@
HIGHBD_MASKSADMXN_SSSE3(8, 4)
HIGHBD_MASKSAD4XN_SSSE3(8)
HIGHBD_MASKSAD4XN_SSSE3(4)
-#if CONFIG_EXT_PARTITION_TYPES
HIGHBD_MASKSAD4XN_SSSE3(16)
HIGHBD_MASKSADMXN_SSSE3(16, 4)
HIGHBD_MASKSADMXN_SSSE3(8, 32)
@@ -297,7 +294,6 @@
HIGHBD_MASKSADMXN_SSSE3(64, 16)
HIGHBD_MASKSADMXN_SSSE3(32, 128)
HIGHBD_MASKSADMXN_SSSE3(128, 32)
-#endif // CONFIG_EXT_PARTITION_TYPES
static INLINE unsigned int highbd_masked_sad_ssse3(
const uint8_t *src8, int src_stride, const uint8_t *a8, int a_stride,
diff --git a/aom_dsp/x86/masked_variance_intrin_ssse3.c b/aom_dsp/x86/masked_variance_intrin_ssse3.c
index b38cc5a..89deb0e 100644
--- a/aom_dsp/x86/masked_variance_intrin_ssse3.c
+++ b/aom_dsp/x86/masked_variance_intrin_ssse3.c
@@ -125,7 +125,6 @@
MASK_SUBPIX_VAR8XH_SSSE3(4)
MASK_SUBPIX_VAR4XH_SSSE3(8)
MASK_SUBPIX_VAR4XH_SSSE3(4)
-#if CONFIG_EXT_PARTITION_TYPES
MASK_SUBPIX_VAR4XH_SSSE3(16)
MASK_SUBPIX_VAR_SSSE3(16, 4)
MASK_SUBPIX_VAR8XH_SSSE3(32)
@@ -134,7 +133,6 @@
MASK_SUBPIX_VAR_SSSE3(16, 64)
MASK_SUBPIX_VAR_SSSE3(128, 32)
MASK_SUBPIX_VAR_SSSE3(32, 128)
-#endif // CONFIG_EXT_PARTITION_TYPES
static INLINE __m128i filter_block(const __m128i a, const __m128i b,
const __m128i filter) {
@@ -707,7 +705,6 @@
HIGHBD_MASK_SUBPIX_VAR_SSSE3(8, 4)
HIGHBD_MASK_SUBPIX_VAR4XH_SSSE3(8)
HIGHBD_MASK_SUBPIX_VAR4XH_SSSE3(4)
-#if CONFIG_EXT_PARTITION_TYPES
HIGHBD_MASK_SUBPIX_VAR4XH_SSSE3(16)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(16, 4)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(8, 32)
@@ -716,7 +713,6 @@
HIGHBD_MASK_SUBPIX_VAR_SSSE3(64, 16)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(32, 128)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(128, 32)
-#endif
static INLINE __m128i highbd_filter_block(const __m128i a, const __m128i b,
const __m128i filter) {
diff --git a/aom_dsp/x86/obmc_sad_sse4.c b/aom_dsp/x86/obmc_sad_sse4.c
index 622ab46..b3e5aad 100644
--- a/aom_dsp/x86/obmc_sad_sse4.c
+++ b/aom_dsp/x86/obmc_sad_sse4.c
@@ -135,14 +135,12 @@
OBMCSADWXH(8, 4)
OBMCSADWXH(4, 8)
OBMCSADWXH(4, 4)
-#if CONFIG_EXT_PARTITION_TYPES
OBMCSADWXH(4, 16)
OBMCSADWXH(16, 4)
OBMCSADWXH(8, 32)
OBMCSADWXH(32, 8)
OBMCSADWXH(16, 64)
OBMCSADWXH(64, 16)
-#endif
////////////////////////////////////////////////////////////////////////////////
// High bit-depth
@@ -263,11 +261,9 @@
HBD_OBMCSADWXH(8, 4)
HBD_OBMCSADWXH(4, 8)
HBD_OBMCSADWXH(4, 4)
-#if CONFIG_EXT_PARTITION_TYPES
HBD_OBMCSADWXH(4, 16)
HBD_OBMCSADWXH(16, 4)
HBD_OBMCSADWXH(8, 32)
HBD_OBMCSADWXH(32, 8)
HBD_OBMCSADWXH(16, 64)
HBD_OBMCSADWXH(64, 16)
-#endif
diff --git a/aom_dsp/x86/obmc_variance_sse4.c b/aom_dsp/x86/obmc_variance_sse4.c
index 84b9657..4175986 100644
--- a/aom_dsp/x86/obmc_variance_sse4.c
+++ b/aom_dsp/x86/obmc_variance_sse4.c
@@ -144,7 +144,6 @@
OBMCVARWXH(8, 4)
OBMCVARWXH(4, 8)
OBMCVARWXH(4, 4)
-#if CONFIG_EXT_PARTITION_TYPES
OBMCVARWXH(4, 16)
OBMCVARWXH(16, 4)
OBMCVARWXH(8, 32)
@@ -153,7 +152,6 @@
OBMCVARWXH(64, 16)
OBMCVARWXH(32, 128)
OBMCVARWXH(128, 32)
-#endif // CONFIG_EXT_PARTITION_TYPES
////////////////////////////////////////////////////////////////////////////////
// High bit-depth
@@ -358,7 +356,6 @@
HBD_OBMCVARWXH(8, 4)
HBD_OBMCVARWXH(4, 8)
HBD_OBMCVARWXH(4, 4)
-#if CONFIG_EXT_PARTITION_TYPES
HBD_OBMCVARWXH(4, 16)
HBD_OBMCVARWXH(16, 4)
HBD_OBMCVARWXH(8, 32)
@@ -367,4 +364,3 @@
HBD_OBMCVARWXH(64, 16)
HBD_OBMCVARWXH(32, 128)
HBD_OBMCVARWXH(128, 32)
-#endif // CONFIG_EXT_PARTITION_TYPES
diff --git a/aom_dsp/x86/sad4d_sse2.asm b/aom_dsp/x86/sad4d_sse2.asm
index cd9d8d9..55a8569 100644
--- a/aom_dsp/x86/sad4d_sse2.asm
+++ b/aom_dsp/x86/sad4d_sse2.asm
@@ -249,11 +249,9 @@
SADNXN4D 8, 4
SADNXN4D 4, 8
SADNXN4D 4, 4
-%if CONFIG_EXT_PARTITION_TYPES
SADNXN4D 4, 16
SADNXN4D 16, 4
SADNXN4D 8, 32
SADNXN4D 32, 8
SADNXN4D 16, 64
SADNXN4D 64, 16
-%endif
diff --git a/aom_dsp/x86/sad_sse2.asm b/aom_dsp/x86/sad_sse2.asm
index 285a56d..3251b76 100644
--- a/aom_dsp/x86/sad_sse2.asm
+++ b/aom_dsp/x86/sad_sse2.asm
@@ -159,10 +159,8 @@
SAD64XN 32 ; sad64x32_sse2
SAD64XN 64, 1 ; sad64x64_avg_sse2
SAD64XN 32, 1 ; sad64x32_avg_sse2
-%if CONFIG_EXT_PARTITION_TYPES
SAD64XN 16 ; sad64x16_sse2
SAD64XN 16, 1 ; sad64x16_avg_sse2
-%endif
; unsigned int aom_sad32x32_sse2(uint8_t *src, int src_stride,
; uint8_t *ref, int ref_stride);
@@ -208,10 +206,8 @@
SAD32XN 64, 1 ; sad32x64_avg_sse2
SAD32XN 32, 1 ; sad32x32_avg_sse2
SAD32XN 16, 1 ; sad32x16_avg_sse2
-%if CONFIG_EXT_PARTITION_TYPES
SAD32XN 8 ; sad_32x8_sse2
SAD32XN 8, 1 ; sad_32x8_avg_sse2
-%endif
; unsigned int aom_sad16x{8,16}_sse2(uint8_t *src, int src_stride,
; uint8_t *ref, int ref_stride);
@@ -258,12 +254,10 @@
SAD16XN 32, 1 ; sad16x32_avg_sse2
SAD16XN 16, 1 ; sad16x16_avg_sse2
SAD16XN 8, 1 ; sad16x8_avg_sse2
-%if CONFIG_EXT_PARTITION_TYPES
SAD16XN 4 ; sad_16x4_sse2
SAD16XN 4, 1 ; sad_16x4_avg_sse2
SAD16XN 64 ; sad_16x64_sse2
SAD16XN 64, 1 ; sad_16x64_avg_sse2
-%endif
; unsigned int aom_sad8x{8,16}_sse2(uint8_t *src, int src_stride,
; uint8_t *ref, int ref_stride);
@@ -308,10 +302,8 @@
SAD8XN 16, 1 ; sad8x16_avg_sse2
SAD8XN 8, 1 ; sad8x8_avg_sse2
SAD8XN 4, 1 ; sad8x4_avg_sse2
-%if CONFIG_EXT_PARTITION_TYPES
SAD8XN 32 ; sad_8x32_sse2
SAD8XN 32, 1 ; sad_8x32_avg_sse2
-%endif
; unsigned int aom_sad4x{4, 8}_sse2(uint8_t *src, int src_stride,
; uint8_t *ref, int ref_stride);
@@ -357,7 +349,5 @@
SAD4XN 4 ; sad4x4_sse
SAD4XN 8, 1 ; sad4x8_avg_sse
SAD4XN 4, 1 ; sad4x4_avg_sse
-%if CONFIG_EXT_PARTITION_TYPES
SAD4XN 16 ; sad_4x16_sse2
SAD4XN 16, 1 ; sad_4x16_avg_sse2
-%endif
diff --git a/aom_dsp/x86/variance_sse2.c b/aom_dsp/x86/variance_sse2.c
index 5add56a..af4c8ea 100644
--- a/aom_dsp/x86/variance_sse2.c
+++ b/aom_dsp/x86/variance_sse2.c
@@ -343,7 +343,6 @@
return *sse;
}
-#if CONFIG_EXT_PARTITION_TYPES
unsigned int aom_variance4x16_sse2(const uint8_t *src, int src_stride,
const uint8_t *ref, int ref_stride,
unsigned int *sse) {
@@ -409,7 +408,6 @@
assert(sum >= -255 * 64 * 16);
return *sse - (unsigned int)(((int64_t)sum * sum) >> 10);
}
-#endif
// The 2 unused parameters are place holders for PIC enabled build.
// These definitions are for functions defined in subpel_variance.asm
@@ -460,7 +458,6 @@
return sse - (unsigned int)(cast_prod(cast se * se) >> (wlog2 + hlog2)); \
}
-#if CONFIG_EXT_PARTITION_TYPES
#define FNS(opt) \
FN(64, 64, 16, 6, 6, opt, (int64_t), (int64_t)); \
FN(64, 32, 16, 6, 5, opt, (int64_t), (int64_t)); \
@@ -481,22 +478,6 @@
FN(32, 8, 16, 5, 3, opt, (uint32_t), (int64_t)); \
FN(16, 64, 16, 4, 6, opt, (int64_t), (int64_t)); \
FN(64, 16, 16, 6, 4, opt, (int64_t), (int64_t))
-#else
-#define FNS(opt) \
- FN(64, 64, 16, 6, 6, opt, (int64_t), (int64_t)); \
- FN(64, 32, 16, 6, 5, opt, (int64_t), (int64_t)); \
- FN(32, 64, 16, 5, 6, opt, (int64_t), (int64_t)); \
- FN(32, 32, 16, 5, 5, opt, (int64_t), (int64_t)); \
- FN(32, 16, 16, 5, 4, opt, (int64_t), (int64_t)); \
- FN(16, 32, 16, 4, 5, opt, (int64_t), (int64_t)); \
- FN(16, 16, 16, 4, 4, opt, (uint32_t), (int64_t)); \
- FN(16, 8, 16, 4, 3, opt, (int32_t), (int32_t)); \
- FN(8, 16, 8, 3, 4, opt, (int32_t), (int32_t)); \
- FN(8, 8, 8, 3, 3, opt, (int32_t), (int32_t)); \
- FN(8, 4, 8, 3, 2, opt, (int32_t), (int32_t)); \
- FN(4, 8, 4, 2, 3, opt, (int32_t), (int32_t)); \
- FN(4, 4, 4, 2, 2, opt, (int32_t), (int32_t))
-#endif
FNS(sse2);
FNS(ssse3);
@@ -554,7 +535,6 @@
return sse - (unsigned int)(cast_prod(cast se * se) >> (wlog2 + hlog2)); \
}
-#if CONFIG_EXT_PARTITION_TYPES
#define FNS(opt) \
FN(64, 64, 16, 6, 6, opt, (int64_t), (int64_t)); \
FN(64, 32, 16, 6, 5, opt, (int64_t), (int64_t)); \
@@ -575,22 +555,6 @@
FN(32, 8, 16, 5, 3, opt, (uint32_t), (int64_t)); \
FN(16, 64, 16, 4, 6, opt, (int64_t), (int64_t)); \
FN(64, 16, 16, 6, 4, opt, (int64_t), (int64_t))
-#else
-#define FNS(opt) \
- FN(64, 64, 16, 6, 6, opt, (int64_t), (int64_t)); \
- FN(64, 32, 16, 6, 5, opt, (int64_t), (int64_t)); \
- FN(32, 64, 16, 5, 6, opt, (int64_t), (int64_t)); \
- FN(32, 32, 16, 5, 5, opt, (int64_t), (int64_t)); \
- FN(32, 16, 16, 5, 4, opt, (int64_t), (int64_t)); \
- FN(16, 32, 16, 4, 5, opt, (int64_t), (int64_t)); \
- FN(16, 16, 16, 4, 4, opt, (uint32_t), (int64_t)); \
- FN(16, 8, 16, 4, 3, opt, (uint32_t), (int32_t)); \
- FN(8, 16, 8, 3, 4, opt, (uint32_t), (int32_t)); \
- FN(8, 8, 8, 3, 3, opt, (uint32_t), (int32_t)); \
- FN(8, 4, 8, 3, 2, opt, (uint32_t), (int32_t)); \
- FN(4, 8, 4, 2, 3, opt, (uint32_t), (int32_t)); \
- FN(4, 4, 4, 2, 2, opt, (uint32_t), (int32_t))
-#endif
FNS(sse2);
FNS(ssse3);
diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 62bd12b..3fc2e63 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -270,9 +270,7 @@
int_mv mv[2];
int_mv pred_mv[2];
uint8_t ref_mv_idx;
-#if CONFIG_EXT_PARTITION_TYPES
PARTITION_TYPE partition;
-#endif
/* deringing gain *per-superblock* */
int8_t cdef_strength;
int current_q_index;
diff --git a/av1/common/cfl.h b/av1/common/cfl.h
index 8476ddc..b925972 100644
--- a/av1/common/cfl.h
+++ b/av1/common/cfl.h
@@ -17,12 +17,8 @@
static INLINE CFL_ALLOWED_TYPE is_cfl_allowed(const MB_MODE_INFO *mbmi) {
const BLOCK_SIZE bsize = mbmi->sb_type;
assert(bsize < BLOCK_SIZES_ALL);
-#if CONFIG_EXT_PARTITION_TYPES
return (CFL_ALLOWED_TYPE)(block_size_wide[bsize] <= 32 &&
block_size_high[bsize] <= 32);
-#else
- return (CFL_ALLOWED_TYPE)(bsize <= CFL_MAX_BLOCK_SIZE);
-#endif // CONFIG_EXT_PARTITION_TYPES
}
static INLINE int get_scaled_luma_q0(int alpha_q3, int16_t pred_buf_q3) {
diff --git a/av1/common/common_data.h b/av1/common/common_data.h
index 750ac81..a19409d 100644
--- a/av1/common/common_data.h
+++ b/av1/common/common_data.h
@@ -188,11 +188,7 @@
};
/* clang-format off */
-#if CONFIG_EXT_PARTITION_TYPES
static const BLOCK_SIZE subsize_lookup[EXT_PARTITION_TYPES][BLOCK_SIZES_ALL] =
-#else
-static const BLOCK_SIZE subsize_lookup[PARTITION_TYPES][BLOCK_SIZES_ALL] =
-#endif // CONFIG_EXT_PARTITION_TYPES
{
{ // PARTITION_NONE
// 4X4
@@ -270,7 +266,6 @@
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 32x128, 128x32
BLOCK_INVALID, BLOCK_INVALID
-#if CONFIG_EXT_PARTITION_TYPES
}, { // PARTITION_HORZ_A
// 4X4
BLOCK_INVALID,
@@ -385,7 +380,6 @@
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 32x128, 128x32
BLOCK_INVALID, BLOCK_INVALID
-#endif // CONFIG_EXT_PARTITION_TYPES
}
};
@@ -427,21 +421,12 @@
TX_64X64,
// 64x128, 128x64, 128x128
TX_64X64, TX_64X64, TX_64X64,
-#if CONFIG_EXT_PARTITION_TYPES
// 4x16, 16x4,
TX_4X16, TX_16X4,
// 8x32, 32x8
TX_8X32, TX_32X8,
// 16x64, 64x16
TX_16X64, TX_64X16,
-#else
- // 4x16, 16x4,
- TX_4X8, TX_8X4,
- // 8x32, 32x8
- TX_8X16, TX_16X8,
- // 16x64, 64x16
- TX_16X32, TX_32X16,
-#endif // CONFIG_EXT_PARTITION_TYPES
// 32x128 128x32
TX_32X64, TX_64X32
};
@@ -478,21 +463,12 @@
TX_16X16, // TX_32X16
TX_32X32, // TX_32X64
TX_32X32, // TX_64X32
-#if CONFIG_EXT_PARTITION_TYPES
TX_4X8, // TX_4X16
TX_8X4, // TX_16X4
TX_8X16, // TX_8X32
TX_16X8, // TX_32X8
TX_16X32, // TX_16X64
TX_32X16, // TX_64X16
-#else
- TX_4X4, // TX_4X16
- TX_4X4, // TX_16X4
- TX_8X8, // TX_8X32
- TX_8X8, // TX_32X8
- TX_16X16, // TX_16X64
- TX_16X16, // TX_64X16
-#endif // CONFIG_EXT_PARTITION_TYPES
},
{
// Inter
@@ -509,21 +485,12 @@
TX_16X16, // TX_32X16
TX_32X32, // TX_32X64
TX_32X32, // TX_64X32
-#if CONFIG_EXT_PARTITION_TYPES
TX_4X8, // TX_4X16
TX_8X4, // TX_16X4
TX_8X16, // TX_8X32
TX_16X8, // TX_32X8
TX_16X32, // TX_16X64
TX_32X16, // TX_64X16
-#else
- TX_4X4, // TX_4X16
- TX_4X4, // TX_16X4
- TX_8X8, // TX_8X32
- TX_8X8, // TX_32X8
- TX_16X16, // TX_16X64
- TX_16X16, // TX_64X16
-#endif // CONFIG_EXT_PARTITION_TYPES
},
};
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 37914e9..276f03e 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -733,7 +733,6 @@
#endif // CONFIG_CFL
};
-#if CONFIG_EXT_PARTITION_TYPES
static const aom_cdf_prob default_partition_cdf[PARTITION_CONTEXTS][CDF_SIZE(
EXT_PARTITION_TYPES)] = {
// 8x8 -> 4x4 only supports the four legacy partition types
@@ -769,21 +768,6 @@
{ AOM_CDF8(1280, 1710, 2069, 31978, 32193, 32409, 32410) },
#endif // ALLOW_128X32_BLOCKS
};
-#else
-static const aom_cdf_prob
- default_partition_cdf[PARTITION_CONTEXTS][CDF_SIZE(PARTITION_TYPES)] = {
- { AOM_CDF4(25472, 28949, 31052) }, { AOM_CDF4(18816, 22250, 28783) },
- { AOM_CDF4(18944, 26126, 29188) }, { AOM_CDF4(15488, 22508, 27077) },
- { AOM_CDF4(22272, 25265, 27815) }, { AOM_CDF4(11776, 15138, 20854) },
- { AOM_CDF4(10496, 19109, 21777) }, { AOM_CDF4(6784, 10743, 14098) },
- { AOM_CDF4(22656, 24947, 26749) }, { AOM_CDF4(8704, 11148, 16469) },
- { AOM_CDF4(6656, 14714, 16477) }, { AOM_CDF4(2176, 3849, 5205) },
- { AOM_CDF4(28416, 28994, 29436) }, { AOM_CDF4(9216, 10688, 14483) },
- { AOM_CDF4(7424, 10592, 11632) }, { AOM_CDF4(1280, 2141, 2859) },
- { AOM_CDF4(28416, 28994, 29436) }, { AOM_CDF4(9216, 10688, 14483) },
- { AOM_CDF4(7424, 10592, 11632) }, { AOM_CDF4(1280, 2141, 2859) },
- };
-#endif
static const aom_cdf_prob default_intra_ext_tx_cdf
[EXT_TX_SETS_INTRA][EXT_TX_SIZES][INTRA_MODES][CDF_SIZE(TX_TYPES)] = {
diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h
index 3e8d044..693646e 100644
--- a/av1/common/entropymode.h
+++ b/av1/common/entropymode.h
@@ -157,11 +157,7 @@
#else
aom_cdf_prob uv_mode_cdf[INTRA_MODES][CDF_SIZE(UV_INTRA_MODES)];
#endif
-#if CONFIG_EXT_PARTITION_TYPES
aom_cdf_prob partition_cdf[PARTITION_CONTEXTS][CDF_SIZE(EXT_PARTITION_TYPES)];
-#else
- aom_cdf_prob partition_cdf[PARTITION_CONTEXTS][CDF_SIZE(PARTITION_TYPES)];
-#endif
aom_cdf_prob switchable_interp_cdf[SWITCHABLE_FILTER_CONTEXTS]
[CDF_SIZE(SWITCHABLE_FILTERS)];
/* kf_y_cdf is discarded after use, so does not require persistent storage.
@@ -206,11 +202,7 @@
unsigned int uv_mode[INTRA_MODES][UV_INTRA_MODES];
#endif // CONFIG_CFL
#endif // CONFIG_ENTROPY_STATS
-#if CONFIG_EXT_PARTITION_TYPES
unsigned int partition[PARTITION_CONTEXTS][EXT_PARTITION_TYPES];
-#else
- unsigned int partition[PARTITION_CONTEXTS][PARTITION_TYPES];
-#endif
unsigned int switchable_interp[SWITCHABLE_FILTER_CONTEXTS]
[SWITCHABLE_FILTERS];
diff --git a/av1/common/enums.h b/av1/common/enums.h
index 393e829..8daf8cc 100644
--- a/av1/common/enums.h
+++ b/av1/common/enums.h
@@ -147,7 +147,6 @@
PARTITION_HORZ,
PARTITION_VERT,
PARTITION_SPLIT,
-#if CONFIG_EXT_PARTITION_TYPES
PARTITION_HORZ_A, // HORZ split and the top partition is split again
PARTITION_HORZ_B, // HORZ split and the bottom partition is split again
PARTITION_VERT_A, // VERT split and the left partition is split again
@@ -155,7 +154,6 @@
PARTITION_HORZ_4, // 4:1 horizontal partition
PARTITION_VERT_4, // 4:1 vertical partition
EXT_PARTITION_TYPES,
-#endif // CONFIG_EXT_PARTITION_TYPES
PARTITION_TYPES = PARTITION_SPLIT + 1,
PARTITION_INVALID = 255
} PARTITION_TYPE;
diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index 78a19e0..75b9e55 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -387,7 +387,6 @@
if (xd->n8_w > xd->n8_h)
if (xd->is_sec_rect) has_tr = 0;
-#if CONFIG_EXT_PARTITION_TYPES
// The bottom left square of a Vertical A (in the old format) does
// not have a top right as it is decoded before the right hand
// rectangle of the partition
@@ -395,7 +394,6 @@
if (xd->n8_w == xd->n8_h)
if (mask_row & bs) has_tr = 0;
}
-#endif // CONFIG_EXT_PARTITION_TYPES
return has_tr;
}
@@ -1244,7 +1242,6 @@
mv_ref_search[3].col = -1;
mv_ref_search[4].row = -1;
mv_ref_search[4].col = -1;
-#if CONFIG_EXT_PARTITION_TYPES
if (num_8x8_blocks_wide == num_8x8_blocks_high) {
mv_ref_search[5].row = -1;
mv_ref_search[5].col = 0;
@@ -1256,12 +1253,6 @@
mv_ref_search[6].row = num_8x8_blocks_high;
mv_ref_search[6].col = -1;
}
-#else
- mv_ref_search[5].row = -1;
- mv_ref_search[5].col = num_8x8_blocks_wide;
- mv_ref_search[6].row = num_8x8_blocks_high;
- mv_ref_search[6].col = -1;
-#endif // CONFIG_EXT_PARTITION_TYPES
mv_ref_search[7].row = -1;
mv_ref_search[7].col = -3;
mv_ref_search[8].row = num_8x8_blocks_high - 1;
diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index 0960480..0289dc0 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -925,21 +925,10 @@
PARTITION_CONTEXT *const left_ctx =
xd->left_seg_context + (mi_row & MAX_MIB_MASK);
-#if CONFIG_EXT_PARTITION_TYPES
const int bw = mi_size_wide[bsize];
const int bh = mi_size_high[bsize];
memset(above_ctx, partition_context_lookup[subsize].above, bw);
memset(left_ctx, partition_context_lookup[subsize].left, bh);
-#else
- // num_4x4_blocks_wide_lookup[bsize] / 2
- const int bs = mi_size_wide[bsize];
-
- // update the partition context at the end notes. set partition bits
- // of block sizes larger than the current one to be one, and partition
- // bits of smaller block sizes to be zero.
- memset(above_ctx, partition_context_lookup[subsize].above, bs);
- memset(left_ctx, partition_context_lookup[subsize].left, bs);
-#endif // CONFIG_EXT_PARTITION_TYPES
}
static INLINE int is_chroma_reference(int mi_row, int mi_col, BLOCK_SIZE bsize,
@@ -1013,7 +1002,6 @@
out[0] = CDF_PROB_TOP;
out[0] -= cdf_element_prob(in, PARTITION_HORZ);
out[0] -= cdf_element_prob(in, PARTITION_SPLIT);
-#if CONFIG_EXT_PARTITION_TYPES
out[0] -= cdf_element_prob(in, PARTITION_HORZ_A);
out[0] -= cdf_element_prob(in, PARTITION_HORZ_B);
out[0] -= cdf_element_prob(in, PARTITION_VERT_A);
@@ -1021,7 +1009,6 @@
if (bsize != BLOCK_128X128)
#endif // !ALLOW_128X32_BLOCKS
out[0] -= cdf_element_prob(in, PARTITION_HORZ_4);
-#endif // CONFIG_EXT_PARTITION_TYPES
out[0] = AOM_ICDF(out[0]);
out[1] = AOM_ICDF(CDF_PROB_TOP);
}
@@ -1033,7 +1020,6 @@
out[0] = CDF_PROB_TOP;
out[0] -= cdf_element_prob(in, PARTITION_VERT);
out[0] -= cdf_element_prob(in, PARTITION_SPLIT);
-#if CONFIG_EXT_PARTITION_TYPES
out[0] -= cdf_element_prob(in, PARTITION_HORZ_A);
out[0] -= cdf_element_prob(in, PARTITION_VERT_A);
out[0] -= cdf_element_prob(in, PARTITION_VERT_B);
@@ -1041,12 +1027,10 @@
if (bsize != BLOCK_128X128)
#endif // !ALLOW_128X32_BLOCKS
out[0] -= cdf_element_prob(in, PARTITION_VERT_4);
-#endif // CONFIG_EXT_PARTITION_TYPES
out[0] = AOM_ICDF(out[0]);
out[1] = AOM_ICDF(CDF_PROB_TOP);
}
-#if CONFIG_EXT_PARTITION_TYPES
static INLINE void update_ext_partition_context(MACROBLOCKD *xd, int mi_row,
int mi_col, BLOCK_SIZE subsize,
BLOCK_SIZE bsize,
@@ -1085,7 +1069,6 @@
}
}
}
-#endif // CONFIG_EXT_PARTITION_TYPES
static INLINE int partition_plane_context(const MACROBLOCKD *xd, int mi_row,
int mi_col, BLOCK_SIZE bsize) {
@@ -1105,7 +1088,6 @@
// Return the number of elements in the partition CDF when
// partitioning the (square) block with luma block size of bsize.
static INLINE int partition_cdf_length(BLOCK_SIZE bsize) {
-#if CONFIG_EXT_PARTITION_TYPES
if (bsize <= BLOCK_8X8) return PARTITION_TYPES;
#if !ALLOW_128X32_BLOCKS
else if (bsize == BLOCK_128X128)
@@ -1113,10 +1095,6 @@
#endif // !ALLOW_128X32_BLOCKS
else
return EXT_PARTITION_TYPES;
-#else
- (void)bsize;
- return PARTITION_TYPES;
-#endif
}
static INLINE int max_block_wide(const MACROBLOCKD *xd, BLOCK_SIZE bsize,
@@ -1332,7 +1310,6 @@
const int sshigh = mi_size_high[subsize];
const int sswide = mi_size_wide[subsize];
-#if CONFIG_EXT_PARTITION_TYPES
if (bsize > BLOCK_8X8 && mi_row + bwide / 2 < cm->mi_rows &&
mi_col + bhigh / 2 < cm->mi_cols) {
// In this case, the block might be using an extended partition
@@ -1378,7 +1355,6 @@
return PARTITION_SPLIT;
}
}
-#endif
const int vert_split = sswide < bwide;
const int horz_split = sshigh < bhigh;
const int split_idx = (vert_split << 1) | horz_split;
diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c
index 6c8100b..2732f2c 100644
--- a/av1/common/reconintra.c
+++ b/av1/common/reconintra.c
@@ -143,19 +143,14 @@
has_tr_32x64, has_tr_64x32, has_tr_64x64,
// 64x128, 128x64, 128x128
has_tr_64x128, has_tr_128x64, has_tr_128x128,
-#if CONFIG_EXT_PARTITION_TYPES
// 4x16, 16x4, 8x32
has_tr_4x16, has_tr_16x4, has_tr_8x32,
// 32x8, 16x64, 64x16
has_tr_32x8, has_tr_16x64, has_tr_64x16,
// 32x128, 128x32
has_tr_32x128, has_tr_128x32
-#else
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
-#endif
};
-#if CONFIG_EXT_PARTITION_TYPES
uint8_t has_tr_vert_8x8[32] = {
255, 255, 0, 0, 119, 119, 0, 0, 127, 127, 0, 0, 119, 119, 0, 0,
255, 127, 0, 0, 119, 119, 0, 0, 127, 127, 0, 0, 119, 119, 0, 0,
@@ -189,12 +184,10 @@
// 64x128, 128x64, 128x128
has_tr_64x128, NULL, has_tr_128x128
};
-#endif // CONFIG_EXT_PARTITION_TYPES
static const uint8_t *get_has_tr_table(PARTITION_TYPE partition,
BLOCK_SIZE bsize) {
const uint8_t *ret = NULL;
-#if CONFIG_EXT_PARTITION_TYPES
// If this is a mixed vertical partition, look up bsize in orders_vert.
if (partition == PARTITION_VERT_A || partition == PARTITION_VERT_B) {
assert(bsize < BLOCK_SIZES);
@@ -202,10 +195,6 @@
} else {
ret = has_tr_tables[bsize];
}
-#else
- (void)partition;
- ret = has_tr_tables[bsize];
-#endif // CONFIG_EXT_PARTITION_TYPES
assert(ret);
return ret;
}
@@ -343,19 +332,14 @@
has_bl_32x64, has_bl_64x32, has_bl_64x64,
// 64x128, 128x64, 128x128
has_bl_64x128, has_bl_128x64, has_bl_128x128,
-#if CONFIG_EXT_PARTITION_TYPES
// 4x16, 16x4, 8x32
has_bl_4x16, has_bl_16x4, has_bl_8x32,
// 32x8, 16x64, 64x16
has_bl_32x8, has_bl_16x64, has_bl_64x16,
// 32x128, 128x32
has_bl_32x128, has_bl_128x32
-#else
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
-#endif
};
-#if CONFIG_EXT_PARTITION_TYPES
uint8_t has_bl_vert_8x8[32] = {
254, 255, 16, 17, 254, 255, 0, 1, 254, 255, 16, 17, 254, 255, 0, 0,
254, 255, 16, 17, 254, 255, 0, 1, 254, 255, 16, 17, 254, 255, 0, 0,
@@ -389,12 +373,10 @@
// 64x128, 128x64, 128x128
has_bl_64x128, NULL, has_bl_128x128
};
-#endif // CONFIG_EXT_PARTITION_TYPES
static const uint8_t *get_has_bl_table(PARTITION_TYPE partition,
BLOCK_SIZE bsize) {
const uint8_t *ret = NULL;
-#if CONFIG_EXT_PARTITION_TYPES
// If this is a mixed vertical partition, look up bsize in orders_vert.
if (partition == PARTITION_VERT_A || partition == PARTITION_VERT_B) {
assert(bsize < BLOCK_SIZES);
@@ -402,10 +384,6 @@
} else {
ret = has_bl_tables[bsize];
}
-#else
- (void)partition;
- ret = has_bl_tables[bsize];
-#endif // CONFIG_EXT_PARTITION_TYPES
assert(ret);
return ret;
}
@@ -1875,11 +1853,7 @@
(MI_SIZE_LOG2 - tx_size_high_log2[0])) <
xd->tile.mi_row_end);
-#if CONFIG_EXT_PARTITION_TYPES
const PARTITION_TYPE partition = mbmi->partition;
-#else
- const PARTITION_TYPE partition = PARTITION_NONE;
-#endif
// force 4x4 chroma component block size.
bsize = scale_chroma_bsize(bsize, pd->subsampling_x, pd->subsampling_y);
diff --git a/av1/common/thread_common.c b/av1/common/thread_common.c
index 27eeb5d..3c2eb5d 100644
--- a/av1/common/thread_common.c
+++ b/av1/common/thread_common.c
@@ -84,71 +84,11 @@
#endif // CONFIG_MULTITHREAD
}
-#if !CONFIG_EXT_PARTITION_TYPES
-static INLINE enum lf_path get_loop_filter_path(
- int y_only, struct macroblockd_plane planes[MAX_MB_PLANE]) {
- if (y_only)
- return LF_PATH_444;
- else if (planes[1].subsampling_y == 1 && planes[1].subsampling_x == 1)
- return LF_PATH_420;
- else if (planes[1].subsampling_y == 0 && planes[1].subsampling_x == 0)
- return LF_PATH_444;
- else
- return LF_PATH_SLOW;
-}
-
-static INLINE void loop_filter_block_plane_ver(
- AV1_COMMON *cm, struct macroblockd_plane planes[MAX_MB_PLANE], int plane,
- MODE_INFO **mi, int mi_row, int mi_col, enum lf_path path,
- LOOP_FILTER_MASK *lfm) {
- if (plane == 0) {
- av1_filter_block_plane_ss00_ver(cm, &planes[0], mi_row, lfm);
- } else {
- switch (path) {
- case LF_PATH_420:
- av1_filter_block_plane_ss11_ver(cm, &planes[plane], mi_row, lfm);
- break;
- case LF_PATH_444:
- av1_filter_block_plane_ss00_ver(cm, &planes[plane], mi_row, lfm);
- break;
- case LF_PATH_SLOW:
- av1_filter_block_plane_non420_ver(cm, &planes[plane], mi, mi_row,
- mi_col, plane);
- break;
- }
- }
-}
-
-static INLINE void loop_filter_block_plane_hor(
- AV1_COMMON *cm, struct macroblockd_plane planes[MAX_MB_PLANE], int plane,
- MODE_INFO **mi, int mi_row, int mi_col, enum lf_path path,
- LOOP_FILTER_MASK *lfm) {
- if (plane == 0) {
- av1_filter_block_plane_ss00_hor(cm, &planes[0], mi_row, lfm);
- } else {
- switch (path) {
- case LF_PATH_420:
- av1_filter_block_plane_ss11_hor(cm, &planes[plane], mi_row, lfm);
- break;
- case LF_PATH_444:
- av1_filter_block_plane_ss00_hor(cm, &planes[plane], mi_row, lfm);
- break;
- case LF_PATH_SLOW:
- av1_filter_block_plane_non420_hor(cm, &planes[plane], mi, mi_row,
- mi_col, plane);
- break;
- }
- }
-}
-#endif
// Row-based multi-threaded loopfilter hook
static int loop_filter_ver_row_worker(AV1LfSync *const lf_sync,
LFWorkerData *const lf_data) {
const int num_planes = lf_data->y_only ? 1 : MAX_MB_PLANE;
int mi_row, mi_col;
-#if !CONFIG_EXT_PARTITION_TYPES
- enum lf_path path = get_loop_filter_path(lf_data->y_only, lf_data->planes);
-#endif
for (mi_row = lf_data->start; mi_row < lf_data->stop;
mi_row += lf_sync->num_workers * lf_data->cm->seq_params.mib_size) {
MODE_INFO **const mi =
@@ -165,16 +105,9 @@
av1_setup_mask(lf_data->cm, mi_row, mi_col, mi + mi_col,
lf_data->cm->mi_stride, &lfm);
-#if CONFIG_EXT_PARTITION_TYPES
for (plane = 0; plane < num_planes; ++plane)
av1_filter_block_plane_non420_ver(lf_data->cm, &lf_data->planes[plane],
mi + mi_col, mi_row, mi_col, plane);
-#else
-
- for (plane = 0; plane < num_planes; ++plane)
- loop_filter_block_plane_ver(lf_data->cm, lf_data->planes, plane,
- mi + mi_col, mi_row, mi_col, path, &lfm);
-#endif
}
}
return 1;
@@ -186,9 +119,6 @@
const int sb_cols = mi_cols_aligned_to_sb(lf_data->cm) >>
lf_data->cm->seq_params.mib_size_log2;
int mi_row, mi_col;
-#if !CONFIG_EXT_PARTITION_TYPES
- enum lf_path path = get_loop_filter_path(lf_data->y_only, lf_data->planes);
-#endif
for (mi_row = lf_data->start; mi_row < lf_data->stop;
mi_row += lf_sync->num_workers * lf_data->cm->seq_params.mib_size) {
@@ -211,15 +141,9 @@
av1_num_planes(lf_data->cm));
av1_setup_mask(lf_data->cm, mi_row, mi_col, mi + mi_col,
lf_data->cm->mi_stride, &lfm);
-#if CONFIG_EXT_PARTITION_TYPES
for (plane = 0; plane < num_planes; ++plane)
av1_filter_block_plane_non420_hor(lf_data->cm, &lf_data->planes[plane],
mi + mi_col, mi_row, mi_col, plane);
-#else
- for (plane = 0; plane < num_planes; ++plane)
- loop_filter_block_plane_hor(lf_data->cm, lf_data->planes, plane,
- mi + mi_col, mi_row, mi_col, path, &lfm);
-#endif
sync_write(lf_sync, r, c, sb_cols);
}
}
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 3409118..5bc561c 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -277,10 +277,7 @@
static void decode_mbmi_block(AV1Decoder *const pbi, MACROBLOCKD *const xd,
int mi_row, int mi_col, aom_reader *r,
-#if CONFIG_EXT_PARTITION_TYPES
- PARTITION_TYPE partition,
-#endif // CONFIG_EXT_PARTITION_TYPES
- BLOCK_SIZE bsize) {
+ PARTITION_TYPE partition, BLOCK_SIZE bsize) {
AV1_COMMON *const cm = &pbi->common;
const int bw = mi_size_wide[bsize];
const int bh = mi_size_high[bsize];
@@ -291,9 +288,7 @@
aom_accounting_set_context(&pbi->accounting, mi_col, mi_row);
#endif
set_offsets(cm, xd, bsize, mi_row, mi_col, bw, bh, x_mis, y_mis);
-#if CONFIG_EXT_PARTITION_TYPES
xd->mi[0]->mbmi.partition = partition;
-#endif
av1_read_mode_info(pbi, xd, mi_row, mi_col, r, x_mis, y_mis);
if (bsize >= BLOCK_8X8 && (cm->subsampling_x || cm->subsampling_y)) {
const BLOCK_SIZE uv_subsize =
@@ -636,15 +631,8 @@
static void decode_block(AV1Decoder *const pbi, MACROBLOCKD *const xd,
int mi_row, int mi_col, aom_reader *r,
-#if CONFIG_EXT_PARTITION_TYPES
- PARTITION_TYPE partition,
-#endif // CONFIG_EXT_PARTITION_TYPES
- BLOCK_SIZE bsize) {
- decode_mbmi_block(pbi, xd, mi_row, mi_col, r,
-#if CONFIG_EXT_PARTITION_TYPES
- partition,
-#endif
- bsize);
+ PARTITION_TYPE partition, BLOCK_SIZE bsize) {
+ decode_mbmi_block(pbi, xd, mi_row, mi_col, r, partition, bsize);
if (!is_inter_block(&xd->mi[0]->mbmi)) {
for (int plane = 0; plane < AOMMIN(2, av1_num_planes(&pbi->common));
@@ -721,10 +709,8 @@
const int hbs = num_8x8_wh >> 1;
PARTITION_TYPE partition;
BLOCK_SIZE subsize;
-#if CONFIG_EXT_PARTITION_TYPES
const int quarter_step = num_8x8_wh / 4;
BLOCK_SIZE bsize2 = get_subsize(bsize, PARTITION_SPLIT);
-#endif
const int has_rows = (mi_row + hbs) < cm->mi_rows;
const int has_cols = (mi_col + hbs) < cm->mi_cols;
@@ -761,11 +747,7 @@
}
#define DEC_BLOCK_STX_ARG
-#if CONFIG_EXT_PARTITION_TYPES
#define DEC_BLOCK_EPT_ARG partition,
-#else
-#define DEC_BLOCK_EPT_ARG
-#endif
#define DEC_BLOCK(db_r, db_c, db_subsize) \
decode_block(pbi, xd, DEC_BLOCK_STX_ARG(db_r), (db_c), r, \
DEC_BLOCK_EPT_ARG(db_subsize))
@@ -788,7 +770,6 @@
DEC_PARTITION(mi_row + hbs, mi_col, subsize);
DEC_PARTITION(mi_row + hbs, mi_col + hbs, subsize);
break;
-#if CONFIG_EXT_PARTITION_TYPES
case PARTITION_HORZ_A:
DEC_BLOCK(mi_row, mi_col, bsize2);
DEC_BLOCK(mi_row, mi_col + hbs, bsize2);
@@ -823,7 +804,6 @@
DEC_BLOCK(mi_row, this_mi_col, subsize);
}
break;
-#endif // CONFIG_EXT_PARTITION_TYPES
default: assert(0 && "Invalid partition type");
}
@@ -832,14 +812,7 @@
#undef DEC_BLOCK_EPT_ARG
#undef DEC_BLOCK_STX_ARG
-#if CONFIG_EXT_PARTITION_TYPES
update_ext_partition_context(xd, mi_row, mi_col, subsize, bsize, partition);
-#else
- // update partition context
- if (bsize >= BLOCK_8X8 &&
- (bsize == BLOCK_8X8 || partition != PARTITION_SPLIT))
- update_partition_context(xd, mi_row, mi_col, subsize, bsize);
-#endif // CONFIG_EXT_PARTITION_TYPES
}
static void setup_bool_decoder(const uint8_t *data, const uint8_t *data_end,
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index e5dafdb..10ce6b6 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1758,10 +1758,8 @@
const AV1_COMMON *const cm = &cpi->common;
MACROBLOCKD *const xd = &cpi->td.mb.e_mbd;
const int hbs = mi_size_wide[bsize] / 2;
-#if CONFIG_EXT_PARTITION_TYPES
const int quarter_step = mi_size_wide[bsize] / 4;
int i;
-#endif // CONFIG_EXT_PARTITION_TYPES
const PARTITION_TYPE partition = get_partition(cm, mi_row, mi_col, bsize);
const BLOCK_SIZE subsize = get_subsize(bsize, partition);
@@ -1807,7 +1805,6 @@
write_modes_sb(cpi, tile, w, tok, tok_end, mi_row + hbs, mi_col + hbs,
subsize);
break;
-#if CONFIG_EXT_PARTITION_TYPES
case PARTITION_HORZ_A:
write_modes_b(cpi, tile, w, tok, tok_end, mi_row, mi_col);
write_modes_b(cpi, tile, w, tok, tok_end, mi_row, mi_col + hbs);
@@ -1844,18 +1841,11 @@
write_modes_b(cpi, tile, w, tok, tok_end, mi_row, this_mi_col);
}
break;
-#endif // CONFIG_EXT_PARTITION_TYPES
default: assert(0);
}
-// update partition context
-#if CONFIG_EXT_PARTITION_TYPES
+ // update partition context
update_ext_partition_context(xd, mi_row, mi_col, subsize, bsize, partition);
-#else
- if (bsize >= BLOCK_8X8 &&
- (bsize == BLOCK_8X8 || partition != PARTITION_SPLIT))
- update_partition_context(xd, mi_row, mi_col, subsize, bsize);
-#endif // CONFIG_EXT_PARTITION_TYPES
}
static void write_modes(AV1_COMP *const cpi, const TileInfo *const tile,
diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index b766aac..e48fe2a 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -301,11 +301,7 @@
int filter_intra_cost[TX_SIZES_ALL][2];
int filter_intra_mode_cost[FILTER_INTRA_MODES];
int switchable_interp_costs[SWITCHABLE_FILTER_CONTEXTS][SWITCHABLE_FILTERS];
-#if CONFIG_EXT_PARTITION_TYPES
int partition_cost[PARTITION_CONTEXTS][EXT_PARTITION_TYPES];
-#else
- int partition_cost[PARTITION_CONTEXTS][PARTITION_TYPES];
-#endif // CONFIG_EXT_PARTITION_TYPES
int palette_y_size_cost[PALATTE_BSIZE_CTXS][PALETTE_SIZES];
int palette_uv_size_cost[PALATTE_BSIZE_CTXS][PALETTE_SIZES];
int palette_y_color_cost[PALETTE_SIZES][PALETTE_COLOR_INDEX_CONTEXTS]
diff --git a/av1/encoder/context_tree.c b/av1/encoder/context_tree.c
index ec97d87..756b37e 100644
--- a/av1/encoder/context_tree.c
+++ b/av1/encoder/context_tree.c
@@ -82,7 +82,6 @@
alloc_mode_context(cm, num_pix / 2, &tree->horizontal[1]);
alloc_mode_context(cm, num_pix / 2, &tree->vertical[1]);
-#if CONFIG_EXT_PARTITION_TYPES
alloc_mode_context(cm, num_pix / 4, &tree->horizontala[0]);
alloc_mode_context(cm, num_pix / 4, &tree->horizontala[1]);
alloc_mode_context(cm, num_pix / 2, &tree->horizontala[2]);
@@ -103,11 +102,9 @@
alloc_mode_context(cm, num_pix / 4, &tree->horizontal4[i]);
alloc_mode_context(cm, num_pix / 4, &tree->vertical4[i]);
}
-#endif // CONFIG_EXT_PARTITION_TYPES
}
static void free_tree_contexts(PC_TREE *tree, const int num_planes) {
-#if CONFIG_EXT_PARTITION_TYPES
int i;
for (i = 0; i < 3; i++) {
free_mode_context(&tree->horizontala[i], num_planes);
@@ -119,7 +116,6 @@
free_mode_context(&tree->horizontal4[i], num_planes);
free_mode_context(&tree->vertical4[i], num_planes);
}
-#endif // CONFIG_EXT_PARTITION_TYPES
free_mode_context(&tree->none, num_planes);
free_mode_context(&tree->horizontal[0], num_planes);
free_mode_context(&tree->horizontal[1], num_planes);
@@ -189,7 +185,6 @@
td->pc_tree = NULL;
}
-#if CONFIG_EXT_PARTITION_TYPES
void av1_copy_tree_context(PICK_MODE_CONTEXT *dst_ctx,
PICK_MODE_CONTEXT *src_ctx, int num_planes) {
dst_ctx->mic = src_ctx->mic;
@@ -219,4 +214,3 @@
dst_ctx->partition = src_ctx->partition;
}
-#endif // CONFIG_EXT_PARTITION_TYPES
diff --git a/av1/encoder/context_tree.h b/av1/encoder/context_tree.h
index 8c01175..e4471f5 100644
--- a/av1/encoder/context_tree.h
+++ b/av1/encoder/context_tree.h
@@ -69,9 +69,7 @@
// search loop
MV pred_mv[TOTAL_REFS_PER_FRAME];
InterpFilter pred_interp_filter;
-#if CONFIG_EXT_PARTITION_TYPES
PARTITION_TYPE partition;
-#endif
} PICK_MODE_CONTEXT;
typedef struct PC_TREE {
@@ -81,24 +79,20 @@
PICK_MODE_CONTEXT none;
PICK_MODE_CONTEXT horizontal[2];
PICK_MODE_CONTEXT vertical[2];
-#if CONFIG_EXT_PARTITION_TYPES
PICK_MODE_CONTEXT horizontala[3];
PICK_MODE_CONTEXT horizontalb[3];
PICK_MODE_CONTEXT verticala[3];
PICK_MODE_CONTEXT verticalb[3];
PICK_MODE_CONTEXT horizontal4[4];
PICK_MODE_CONTEXT vertical4[4];
-#endif
CB_TREE_SEARCH cb_search_range;
struct PC_TREE *split[4];
} PC_TREE;
void av1_setup_pc_tree(struct AV1Common *cm, struct ThreadData *td);
void av1_free_pc_tree(struct ThreadData *td, const int num_planes);
-#if CONFIG_EXT_PARTITION_TYPES
void av1_copy_tree_context(PICK_MODE_CONTEXT *dst_ctx,
PICK_MODE_CONTEXT *src_ctx, int num_planes);
-#endif // CONFIG_EXT_PARTITON_TYPES
#ifdef __cplusplus
} // extern "C"
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index e329506..2f874ef 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -586,10 +586,7 @@
static void rd_pick_sb_modes(const AV1_COMP *const cpi, TileDataEnc *tile_data,
MACROBLOCK *const x, int mi_row, int mi_col,
- RD_STATS *rd_cost,
-#if CONFIG_EXT_PARTITION_TYPES
- PARTITION_TYPE partition,
-#endif
+ RD_STATS *rd_cost, PARTITION_TYPE partition,
BLOCK_SIZE bsize, PICK_MODE_CONTEXT *ctx,
int64_t best_rd) {
const AV1_COMMON *const cm = &cpi->common;
@@ -611,18 +608,14 @@
if (ctx->rd_mode_is_ready) {
assert(ctx_mbmi->sb_type == bsize);
-#if CONFIG_EXT_PARTITION_TYPES
assert(ctx_mbmi->partition == partition);
-#endif // CONFIG_EXT_PARTITION_TYPES
*mbmi = *ctx_mbmi;
rd_cost->rate = ctx->rate;
rd_cost->dist = ctx->dist;
rd_cost->rdcost = ctx->rdcost;
} else {
mbmi->sb_type = bsize;
-#if CONFIG_EXT_PARTITION_TYPES
mbmi->partition = partition;
-#endif // CONFIG_EXT_PARTITION_TYPES
}
#if CONFIG_RD_DEBUG
@@ -1413,10 +1406,8 @@
static void encode_b(const AV1_COMP *const cpi, TileDataEnc *tile_data,
ThreadData *td, TOKENEXTRA **tp, int mi_row, int mi_col,
RUN_TYPE dry_run, BLOCK_SIZE bsize,
-#if CONFIG_EXT_PARTITION_TYPES
- PARTITION_TYPE partition,
-#endif
- PICK_MODE_CONTEXT *ctx, int *rate) {
+ PARTITION_TYPE partition, PICK_MODE_CONTEXT *ctx,
+ int *rate) {
TileInfo *const tile = &tile_data->tile_info;
MACROBLOCK *const x = &td->mb;
#if CONFIG_EXT_DELTA_Q
@@ -1425,9 +1416,7 @@
#endif
set_offsets(cpi, tile, x, mi_row, mi_col, bsize);
-#if CONFIG_EXT_PARTITION_TYPES
x->e_mbd.mi[0]->mbmi.partition = partition;
-#endif
update_state(cpi, tile_data, td, ctx, mi_row, mi_col, bsize, dry_run);
av1_set_coeff_buffer(cpi, x, mi_row, mi_col);
@@ -1478,11 +1467,9 @@
: -1;
const PARTITION_TYPE partition = pc_tree->partitioning;
const BLOCK_SIZE subsize = get_subsize(bsize, partition);
-#if CONFIG_EXT_PARTITION_TYPES
int quarter_step = mi_size_wide[bsize] / 4;
int i;
BLOCK_SIZE bsize2 = get_subsize(bsize, PARTITION_SPLIT);
-#endif // CONFIG_EXT_PARTITION_TYPES
if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols) return;
@@ -1491,37 +1478,22 @@
switch (partition) {
case PARTITION_NONE:
encode_b(cpi, tile_data, td, tp, mi_row, mi_col, dry_run, subsize,
-#if CONFIG_EXT_PARTITION_TYPES
- partition,
-#endif
- &pc_tree->none, rate);
+ partition, &pc_tree->none, rate);
break;
case PARTITION_VERT:
encode_b(cpi, tile_data, td, tp, mi_row, mi_col, dry_run, subsize,
-#if CONFIG_EXT_PARTITION_TYPES
- partition,
-#endif
- &pc_tree->vertical[0], rate);
+ partition, &pc_tree->vertical[0], rate);
if (mi_col + hbs < cm->mi_cols) {
encode_b(cpi, tile_data, td, tp, mi_row, mi_col + hbs, dry_run, subsize,
-#if CONFIG_EXT_PARTITION_TYPES
- partition,
-#endif
- &pc_tree->vertical[1], rate);
+ partition, &pc_tree->vertical[1], rate);
}
break;
case PARTITION_HORZ:
encode_b(cpi, tile_data, td, tp, mi_row, mi_col, dry_run, subsize,
-#if CONFIG_EXT_PARTITION_TYPES
- partition,
-#endif
- &pc_tree->horizontal[0], rate);
+ partition, &pc_tree->horizontal[0], rate);
if (mi_row + hbs < cm->mi_rows) {
encode_b(cpi, tile_data, td, tp, mi_row + hbs, mi_col, dry_run, subsize,
-#if CONFIG_EXT_PARTITION_TYPES
- partition,
-#endif
- &pc_tree->horizontal[1], rate);
+ partition, &pc_tree->horizontal[1], rate);
}
break;
case PARTITION_SPLIT:
@@ -1535,7 +1507,6 @@
subsize, pc_tree->split[3], rate);
break;
-#if CONFIG_EXT_PARTITION_TYPES
case PARTITION_HORZ_A:
encode_b(cpi, tile_data, td, tp, mi_row, mi_col, dry_run, bsize2,
partition, &pc_tree->horizontala[0], rate);
@@ -1587,16 +1558,10 @@
partition, &pc_tree->vertical4[i], rate);
}
break;
-#endif // CONFIG_EXT_PARTITION_TYPES
default: assert(0 && "Invalid partition type."); break;
}
-#if CONFIG_EXT_PARTITION_TYPES
update_ext_partition_context(xd, mi_row, mi_col, subsize, bsize, partition);
-#else
- if (partition != PARTITION_SPLIT || bsize == BLOCK_8X8)
- update_partition_context(xd, mi_row, mi_col, subsize, bsize);
-#endif // CONFIG_EXT_PARTITION_TYPES
}
// Check to see if the given partition size is allowed for a specified number
@@ -1744,10 +1709,7 @@
mi_row + hbs < cm->mi_rows && mi_col + hbs < cm->mi_cols) {
pc_tree->partitioning = PARTITION_NONE;
rd_pick_sb_modes(cpi, tile_data, x, mi_row, mi_col, &none_rdc,
-#if CONFIG_EXT_PARTITION_TYPES
- PARTITION_NONE,
-#endif
- bsize, ctx_none, INT64_MAX);
+ PARTITION_NONE, bsize, ctx_none, INT64_MAX);
if (none_rdc.rate < INT_MAX) {
none_rdc.rate += x->partition_cost[pl][PARTITION_NONE];
@@ -1763,17 +1725,12 @@
switch (partition) {
case PARTITION_NONE:
rd_pick_sb_modes(cpi, tile_data, x, mi_row, mi_col, &last_part_rdc,
-#if CONFIG_EXT_PARTITION_TYPES
- PARTITION_NONE,
-#endif
- bsize, ctx_none, INT64_MAX);
+ PARTITION_NONE, bsize, ctx_none, INT64_MAX);
break;
case PARTITION_HORZ:
rd_pick_sb_modes(cpi, tile_data, x, mi_row, mi_col, &last_part_rdc,
-#if CONFIG_EXT_PARTITION_TYPES
- PARTITION_HORZ,
-#endif
- subsize, &pc_tree->horizontal[0], INT64_MAX);
+ PARTITION_HORZ, subsize, &pc_tree->horizontal[0],
+ INT64_MAX);
if (last_part_rdc.rate != INT_MAX && bsize >= BLOCK_8X8 &&
mi_row + hbs < cm->mi_rows) {
RD_STATS tmp_rdc;
@@ -1783,10 +1740,8 @@
encode_superblock(cpi, tile_data, td, tp, DRY_RUN_NORMAL, mi_row,
mi_col, subsize, NULL);
rd_pick_sb_modes(cpi, tile_data, x, mi_row + hbs, mi_col, &tmp_rdc,
-#if CONFIG_EXT_PARTITION_TYPES
- PARTITION_HORZ,
-#endif
- subsize, &pc_tree->horizontal[1], INT64_MAX);
+ PARTITION_HORZ, subsize, &pc_tree->horizontal[1],
+ INT64_MAX);
if (tmp_rdc.rate == INT_MAX || tmp_rdc.dist == INT64_MAX) {
av1_invalid_rd_stats(&last_part_rdc);
break;
@@ -1798,10 +1753,8 @@
break;
case PARTITION_VERT:
rd_pick_sb_modes(cpi, tile_data, x, mi_row, mi_col, &last_part_rdc,
-#if CONFIG_EXT_PARTITION_TYPES
- PARTITION_VERT,
-#endif
- subsize, &pc_tree->vertical[0], INT64_MAX);
+ PARTITION_VERT, subsize, &pc_tree->vertical[0],
+ INT64_MAX);
if (last_part_rdc.rate != INT_MAX && bsize >= BLOCK_8X8 &&
mi_col + hbs < cm->mi_cols) {
RD_STATS tmp_rdc;
@@ -1811,11 +1764,8 @@
encode_superblock(cpi, tile_data, td, tp, DRY_RUN_NORMAL, mi_row,
mi_col, subsize, NULL);
rd_pick_sb_modes(cpi, tile_data, x, mi_row, mi_col + hbs, &tmp_rdc,
-#if CONFIG_EXT_PARTITION_TYPES
- PARTITION_VERT,
-#endif
- subsize, &pc_tree->vertical[bsize > BLOCK_8X8],
- INT64_MAX);
+ PARTITION_VERT, subsize,
+ &pc_tree->vertical[bsize > BLOCK_8X8], INT64_MAX);
if (tmp_rdc.rate == INT_MAX || tmp_rdc.dist == INT64_MAX) {
av1_invalid_rd_stats(&last_part_rdc);
break;
@@ -1850,14 +1800,12 @@
last_part_rdc.dist += tmp_rdc.dist;
}
break;
-#if CONFIG_EXT_PARTITION_TYPES
case PARTITION_VERT_A:
case PARTITION_VERT_B:
case PARTITION_HORZ_A:
case PARTITION_HORZ_B:
case PARTITION_HORZ_4:
case PARTITION_VERT_4: assert(0 && "Cannot handle extended partiton types");
-#endif // CONFIG_EXT_PARTITION_TYPES
default: assert(0); break;
}
@@ -1891,11 +1839,8 @@
save_context(x, &x_ctx, mi_row, mi_col, bsize, num_planes);
pc_tree->split[i]->partitioning = PARTITION_NONE;
rd_pick_sb_modes(cpi, tile_data, x, mi_row + y_idx, mi_col + x_idx,
- &tmp_rdc,
-#if CONFIG_EXT_PARTITION_TYPES
- PARTITION_SPLIT,
-#endif
- split_subsize, &pc_tree->split[i]->none, INT64_MAX);
+ &tmp_rdc, PARTITION_SPLIT, split_subsize,
+ &pc_tree->split[i]->none, INT64_MAX);
restore_context(x, &x_ctx, mi_row, mi_col, bsize, num_planes);
if (tmp_rdc.rate == INT_MAX || tmp_rdc.dist == INT64_MAX) {
@@ -2205,7 +2150,6 @@
}
#endif
-#if CONFIG_EXT_PARTITION_TYPES
// Try searching for an encoding for the given subblock. Returns zero if the
// rdcost is already too high (to tell the caller not to bother searching for
// encodings of further subblocks)
@@ -2313,7 +2257,6 @@
#undef RTP_STX_TRY_ARGS
}
-#endif // CONFIG_EXT_PARTITION_TYPES
#if CONFIG_DIST_8X8
static int64_t dist_8x8_yuv(const AV1_COMP *const cpi, MACROBLOCK *const x,
@@ -2458,10 +2401,7 @@
if (bsize_at_least_8x8) pc_tree->partitioning = PARTITION_NONE;
rd_pick_sb_modes(cpi, tile_data, x, mi_row, mi_col, &this_rdc,
-#if CONFIG_EXT_PARTITION_TYPES
- PARTITION_NONE,
-#endif
- bsize, ctx_none, best_rdc.rdcost);
+ PARTITION_NONE, bsize, ctx_none, best_rdc.rdcost);
if (none_rd) *none_rd = this_rdc.rdcost;
if (this_rdc.rate != INT_MAX) {
if (bsize_at_least_8x8) {
@@ -2536,11 +2476,7 @@
if (cpi->sf.adaptive_motion_search) load_pred_mv(x, ctx_none);
pc_tree->split[idx]->index = idx;
-#if CONFIG_EXT_PARTITION_TYPES
int64_t *p_split_rd = &split_rd[idx];
-#else
- int64_t *p_split_rd = NULL;
-#endif // CONFIG_EXT_PARTITION_TYPES
rd_pick_sqr_partition(cpi, td, tile_data, tp, mi_row + y_idx,
mi_col + x_idx, subsize, &this_rdc,
temp_best_rdcost - sum_rdc.rdcost,
@@ -2660,7 +2596,6 @@
pl >= 0 ? x->partition_cost[pl] : x->partition_cost[0];
int do_rectangular_split = 1;
-#if CONFIG_EXT_PARTITION_TYPES
int64_t split_rd[4] = { 0, 0, 0, 0 };
int64_t horz_rd[2] = { 0, 0 };
int64_t vert_rd[2] = { 0, 0 };
@@ -2668,10 +2603,7 @@
int split_ctx_is_ready[2] = { 0, 0 };
int horz_ctx_is_ready = 0;
int vert_ctx_is_ready = 0;
-#endif // CONFIG_EXT_PARTITION_TYPES
-#if CONFIG_EXT_PARTITION_TYPES
BLOCK_SIZE bsize2 = get_subsize(bsize, PARTITION_SPLIT);
-#endif
// Override skipping rectangular partition operations for edge blocks
const int has_rows = (mi_row + mi_step < cm->mi_rows);
@@ -2849,10 +2781,7 @@
// PARTITION_NONE
if (partition_none_allowed) {
rd_pick_sb_modes(cpi, tile_data, x, mi_row, mi_col, &this_rdc,
-#if CONFIG_EXT_PARTITION_TYPES
- PARTITION_NONE,
-#endif
- bsize, ctx_none, best_rdc.rdcost);
+ PARTITION_NONE, bsize, ctx_none, best_rdc.rdcost);
if (none_rd) *none_rd = this_rdc.rdcost;
if (this_rdc.rate != INT_MAX) {
if (bsize_at_least_8x8) {
@@ -2970,11 +2899,7 @@
if (cpi->sf.adaptive_motion_search) load_pred_mv(x, ctx_none);
pc_tree->split[idx]->index = idx;
-#if CONFIG_EXT_PARTITION_TYPES
int64_t *p_split_rd = &split_rd[idx];
-#else
- int64_t *p_split_rd = NULL;
-#endif // CONFIG_EXT_PARTITION_TYPES
rd_pick_partition(cpi, td, tile_data, tp, mi_row + y_idx, mi_col + x_idx,
subsize, &this_rdc, best_rdc.rdcost - sum_rdc.rdcost,
pc_tree->split[idx], p_split_rd);
@@ -2987,7 +2912,6 @@
sum_rdc.dist += this_rdc.dist;
sum_rdc.rdcost += this_rdc.rdcost;
-#if CONFIG_EXT_PARTITION_TYPES
if (idx <= 1 && (bsize <= BLOCK_8X8 ||
pc_tree->split[idx]->partitioning == PARTITION_NONE)) {
MB_MODE_INFO *const mbmi = &(pc_tree->split[idx]->none.mic.mbmi);
@@ -3000,7 +2924,6 @@
split_ctx_is_ready[idx] = 1;
}
}
-#endif // CONFIG_EXT_PARTITION_TYPES
}
}
reached_last_index = (idx == 4);
@@ -3049,17 +2972,12 @@
av1_extract_interp_filter(ctx_none->mic.mbmi.interp_filters, 0);
rd_pick_sb_modes(cpi, tile_data, x, mi_row, mi_col, &sum_rdc,
-#if CONFIG_EXT_PARTITION_TYPES
- PARTITION_HORZ,
-#endif
- subsize, &pc_tree->horizontal[0], best_rdc.rdcost);
-#if CONFIG_EXT_PARTITION_TYPES
+ PARTITION_HORZ, subsize, &pc_tree->horizontal[0],
+ best_rdc.rdcost);
horz_rd[0] = sum_rdc.rdcost;
-#endif // CONFIG_EXT_PARTITION_TYPES
if (sum_rdc.rdcost < best_rdc.rdcost && has_rows) {
PICK_MODE_CONTEXT *ctx_h = &pc_tree->horizontal[0];
-#if CONFIG_EXT_PARTITION_TYPES
MB_MODE_INFO *const mbmi = &(pc_tree->horizontal[0].mic.mbmi);
PALETTE_MODE_INFO *const pmi = &mbmi->palette_mode_info;
// Neither palette mode nor cfl predicted
@@ -3069,7 +2987,6 @@
#endif // CONFIG_CFL
horz_ctx_is_ready = 1;
}
-#endif // CONFIG_EXT_PARTITION_TYPES
update_state(cpi, tile_data, td, ctx_h, mi_row, mi_col, subsize, 1);
encode_superblock(cpi, tile_data, td, tp, DRY_RUN_NORMAL, mi_row, mi_col,
subsize, NULL);
@@ -3082,14 +2999,9 @@
av1_extract_interp_filter(ctx_h->mic.mbmi.interp_filters, 0);
rd_pick_sb_modes(cpi, tile_data, x, mi_row + mi_step, mi_col, &this_rdc,
-#if CONFIG_EXT_PARTITION_TYPES
- PARTITION_HORZ,
-#endif
- subsize, &pc_tree->horizontal[1],
+ PARTITION_HORZ, subsize, &pc_tree->horizontal[1],
best_rdc.rdcost - sum_rdc.rdcost);
-#if CONFIG_EXT_PARTITION_TYPES
horz_rd[1] = this_rdc.rdcost;
-#endif // CONFIG_EXT_PARTITION_TYPES
#if CONFIG_DIST_8X8
if (x->using_dist_8x8 && this_rdc.rate != INT_MAX && bsize == BLOCK_8X8) {
@@ -3149,16 +3061,11 @@
av1_extract_interp_filter(ctx_none->mic.mbmi.interp_filters, 0);
rd_pick_sb_modes(cpi, tile_data, x, mi_row, mi_col, &sum_rdc,
-#if CONFIG_EXT_PARTITION_TYPES
- PARTITION_VERT,
-#endif
- subsize, &pc_tree->vertical[0], best_rdc.rdcost);
-#if CONFIG_EXT_PARTITION_TYPES
+ PARTITION_VERT, subsize, &pc_tree->vertical[0],
+ best_rdc.rdcost);
vert_rd[0] = sum_rdc.rdcost;
-#endif // CONFIG_EXT_PARTITION_TYPES
const int64_t vert_max_rdcost = best_rdc.rdcost;
if (sum_rdc.rdcost < vert_max_rdcost && has_cols) {
-#if CONFIG_EXT_PARTITION_TYPES
MB_MODE_INFO *const mbmi = &(pc_tree->vertical[0].mic.mbmi);
PALETTE_MODE_INFO *const pmi = &mbmi->palette_mode_info;
// Neither palette mode nor cfl predicted
@@ -3168,7 +3075,6 @@
#endif // CONFIG_CFL
vert_ctx_is_ready = 1;
}
-#endif // CONFIG_EXT_PARTITION_TYPES
update_state(cpi, tile_data, td, &pc_tree->vertical[0], mi_row, mi_col,
subsize, 1);
encode_superblock(cpi, tile_data, td, tp, DRY_RUN_NORMAL, mi_row, mi_col,
@@ -3182,14 +3088,9 @@
av1_extract_interp_filter(ctx_none->mic.mbmi.interp_filters, 0);
rd_pick_sb_modes(cpi, tile_data, x, mi_row, mi_col + mi_step, &this_rdc,
-#if CONFIG_EXT_PARTITION_TYPES
- PARTITION_VERT,
-#endif
- subsize, &pc_tree->vertical[1],
+ PARTITION_VERT, subsize, &pc_tree->vertical[1],
best_rdc.rdcost - sum_rdc.rdcost);
-#if CONFIG_EXT_PARTITION_TYPES
vert_rd[1] = this_rdc.rdcost;
-#endif // CONFIG_EXT_PARTITION_TYPES
#if CONFIG_DIST_8X8
if (x->using_dist_8x8 && this_rdc.rate != INT_MAX && bsize == BLOCK_8X8) {
@@ -3235,7 +3136,6 @@
restore_context(x, &x_ctx, mi_row, mi_col, bsize, num_planes);
}
-#if CONFIG_EXT_PARTITION_TYPES
const int ext_partition_allowed =
do_rectangular_split && bsize > BLOCK_8X8 && partition_none_allowed;
@@ -3458,7 +3358,6 @@
}
restore_context(x, &x_ctx, mi_row, mi_col, bsize, num_planes);
}
-#endif // CONFIG_EXT_PARTITION_TYPES
// TODO(jbb): This code added so that we avoid static analysis
// warning related to the fact that best_rd isn't used after this
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 60fcd2a..b12e99b 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -1312,7 +1312,6 @@
MAKE_BFP_SAD8_WRAPPER(aom_highbd_sad4x4x8)
MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad4x4x4d)
-#if CONFIG_EXT_PARTITION_TYPES
MAKE_BFP_SAD_WRAPPER(aom_highbd_sad4x16)
MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad4x16_avg)
MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad4x16x4d)
@@ -1337,7 +1336,6 @@
MAKE_BFP_SAD_WRAPPER(aom_highbd_sad128x32)
MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad128x32_avg)
MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad128x32x4d)
-#endif // CONFIG_EXT_PARTITION_TYPES
#if CONFIG_JNT_COMP
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad128x128_avg)
@@ -1356,7 +1354,6 @@
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad8x4_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad4x8_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad4x4_avg)
-#if CONFIG_EXT_PARTITION_TYPES
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad4x16_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad16x4_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad8x32_avg)
@@ -1365,7 +1362,6 @@
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad64x16_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad32x128_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad128x32_avg)
-#endif // CONFIG_EXT_PARTITION_TYPES
#endif // CONFIG_JNT_COMP
#define HIGHBD_MBFP(BT, MCSDF, MCSVF) \
@@ -1413,8 +1409,6 @@
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad8x4)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad4x8)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad4x4)
-
-#if CONFIG_EXT_PARTITION_TYPES
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad4x16)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad16x4)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad8x32)
@@ -1423,7 +1417,6 @@
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad64x16)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad32x128)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad128x32)
-#endif // CONFIG_EXT_PARTITION_TYPES
#define HIGHBD_OBFP(BT, OSDF, OVF, OSVF) \
cpi->fn_ptr[BT].osdf = OSDF; \
@@ -1463,8 +1456,6 @@
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad8x4)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad4x8)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad4x4)
-
-#if CONFIG_EXT_PARTITION_TYPES
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad4x16)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad16x4)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad8x32)
@@ -1473,7 +1464,6 @@
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad64x16)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad32x128)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad128x32)
-#endif // CONFIG_EXT_PARTITION_TYPES
static void highbd_set_var_fns(AV1_COMP *const cpi) {
AV1_COMMON *const cm = &cpi->common;
@@ -1481,7 +1471,6 @@
switch (cm->bit_depth) {
case AOM_BITS_8:
#if CONFIG_JNT_COMP
-#if CONFIG_EXT_PARTITION_TYPES
HIGHBD_BFP(BLOCK_128X32, aom_highbd_sad128x32_bits8,
aom_highbd_sad128x32_avg_bits8, aom_highbd_8_variance128x32,
aom_highbd_8_sub_pixel_variance128x32,
@@ -1541,7 +1530,6 @@
aom_highbd_8_sub_pixel_avg_variance4x16, NULL, NULL,
aom_highbd_sad4x16x4d_bits8, aom_highbd_jnt_sad4x16_avg_bits8,
aom_highbd_8_jnt_sub_pixel_avg_variance4x16)
-#endif
HIGHBD_BFP(BLOCK_32X16, aom_highbd_sad32x16_bits8,
aom_highbd_sad32x16_avg_bits8, aom_highbd_8_variance32x16,
@@ -1674,8 +1662,7 @@
aom_highbd_sad64x128x4d_bits8,
aom_highbd_jnt_sad64x128_avg_bits8,
aom_highbd_8_jnt_sub_pixel_avg_variance64x128)
-#else // CONFIG_JNT_COMP
-#if CONFIG_EXT_PARTITION_TYPES
+#else // CONFIG_JNT_COMP
HIGHBD_BFP(BLOCK_128X32, aom_highbd_sad128x32_bits8,
aom_highbd_sad128x32_avg_bits8, aom_highbd_8_variance128x32,
aom_highbd_8_sub_pixel_variance128x32,
@@ -1723,7 +1710,6 @@
aom_highbd_8_sub_pixel_variance4x16,
aom_highbd_8_sub_pixel_avg_variance4x16, NULL, NULL,
aom_highbd_sad4x16x4d_bits8)
-#endif
HIGHBD_BFP(BLOCK_32X16, aom_highbd_sad32x16_bits8,
aom_highbd_sad32x16_avg_bits8, aom_highbd_8_variance32x16,
@@ -1859,31 +1845,22 @@
aom_highbd_8_masked_sub_pixel_variance8x4)
HIGHBD_MBFP(BLOCK_4X4, aom_highbd_masked_sad4x4_bits8,
aom_highbd_8_masked_sub_pixel_variance4x4)
-#if CONFIG_EXT_PARTITION_TYPES
HIGHBD_MBFP(BLOCK_128X32, aom_highbd_masked_sad128x32_bits8,
aom_highbd_8_masked_sub_pixel_variance128x32)
-
HIGHBD_MBFP(BLOCK_32X128, aom_highbd_masked_sad32x128_bits8,
aom_highbd_8_masked_sub_pixel_variance32x128)
-
HIGHBD_MBFP(BLOCK_64X16, aom_highbd_masked_sad64x16_bits8,
aom_highbd_8_masked_sub_pixel_variance64x16)
-
HIGHBD_MBFP(BLOCK_16X64, aom_highbd_masked_sad16x64_bits8,
aom_highbd_8_masked_sub_pixel_variance16x64)
-
HIGHBD_MBFP(BLOCK_32X8, aom_highbd_masked_sad32x8_bits8,
aom_highbd_8_masked_sub_pixel_variance32x8)
-
HIGHBD_MBFP(BLOCK_8X32, aom_highbd_masked_sad8x32_bits8,
aom_highbd_8_masked_sub_pixel_variance8x32)
-
HIGHBD_MBFP(BLOCK_16X4, aom_highbd_masked_sad16x4_bits8,
aom_highbd_8_masked_sub_pixel_variance16x4)
-
HIGHBD_MBFP(BLOCK_4X16, aom_highbd_masked_sad4x16_bits8,
aom_highbd_8_masked_sub_pixel_variance4x16)
-#endif
HIGHBD_OBFP(BLOCK_128X128, aom_highbd_obmc_sad128x128_bits8,
aom_highbd_obmc_variance128x128,
aom_highbd_obmc_sub_pixel_variance128x128)
@@ -1932,44 +1909,34 @@
HIGHBD_OBFP(BLOCK_4X4, aom_highbd_obmc_sad4x4_bits8,
aom_highbd_obmc_variance4x4,
aom_highbd_obmc_sub_pixel_variance4x4)
-#if CONFIG_EXT_PARTITION_TYPES
HIGHBD_OBFP(BLOCK_128X32, aom_highbd_obmc_sad128x32_bits8,
aom_highbd_obmc_variance128x32,
aom_highbd_obmc_sub_pixel_variance128x32)
-
HIGHBD_OBFP(BLOCK_32X128, aom_highbd_obmc_sad32x128_bits8,
aom_highbd_obmc_variance32x128,
aom_highbd_obmc_sub_pixel_variance32x128)
-
HIGHBD_OBFP(BLOCK_64X16, aom_highbd_obmc_sad64x16_bits8,
aom_highbd_obmc_variance64x16,
aom_highbd_obmc_sub_pixel_variance64x16)
-
HIGHBD_OBFP(BLOCK_16X64, aom_highbd_obmc_sad16x64_bits8,
aom_highbd_obmc_variance16x64,
aom_highbd_obmc_sub_pixel_variance16x64)
-
HIGHBD_OBFP(BLOCK_32X8, aom_highbd_obmc_sad32x8_bits8,
aom_highbd_obmc_variance32x8,
aom_highbd_obmc_sub_pixel_variance32x8)
-
HIGHBD_OBFP(BLOCK_8X32, aom_highbd_obmc_sad8x32_bits8,
aom_highbd_obmc_variance8x32,
aom_highbd_obmc_sub_pixel_variance8x32)
-
HIGHBD_OBFP(BLOCK_16X4, aom_highbd_obmc_sad16x4_bits8,
aom_highbd_obmc_variance16x4,
aom_highbd_obmc_sub_pixel_variance16x4)
-
HIGHBD_OBFP(BLOCK_4X16, aom_highbd_obmc_sad4x16_bits8,
aom_highbd_obmc_variance4x16,
aom_highbd_obmc_sub_pixel_variance4x16)
-#endif
break;
case AOM_BITS_10:
#if CONFIG_JNT_COMP
-#if CONFIG_EXT_PARTITION_TYPES
HIGHBD_BFP(
BLOCK_128X32, aom_highbd_sad128x32_bits10,
aom_highbd_sad128x32_avg_bits10, aom_highbd_10_variance128x32,
@@ -2033,7 +2000,6 @@
aom_highbd_sad4x16x4d_bits10,
aom_highbd_jnt_sad4x16_avg_bits10,
aom_highbd_10_jnt_sub_pixel_avg_variance4x16);
-#endif
HIGHBD_BFP(BLOCK_32X16, aom_highbd_sad32x16_bits10,
aom_highbd_sad32x16_avg_bits10, aom_highbd_10_variance32x16,
@@ -2169,8 +2135,7 @@
aom_highbd_10_sub_pixel_avg_variance64x128, NULL, NULL,
aom_highbd_sad64x128x4d_bits10, aom_highbd_jnt_sad64x128_avg_bits10,
aom_highbd_10_jnt_sub_pixel_avg_variance64x128);
-#else // CONFIG_JNT_COMP
-#if CONFIG_EXT_PARTITION_TYPES
+#else // CONFIG_JNT_COMP
HIGHBD_BFP(BLOCK_128X32, aom_highbd_sad128x32_bits10,
aom_highbd_sad128x32_avg_bits10,
aom_highbd_10_variance128x32,
@@ -2220,7 +2185,6 @@
aom_highbd_10_sub_pixel_variance4x16,
aom_highbd_10_sub_pixel_avg_variance4x16, NULL, NULL,
aom_highbd_sad4x16x4d_bits10)
-#endif
HIGHBD_BFP(BLOCK_32X16, aom_highbd_sad32x16_bits10,
aom_highbd_sad32x16_avg_bits10, aom_highbd_10_variance32x16,
@@ -2360,31 +2324,22 @@
aom_highbd_10_masked_sub_pixel_variance8x4)
HIGHBD_MBFP(BLOCK_4X4, aom_highbd_masked_sad4x4_bits10,
aom_highbd_10_masked_sub_pixel_variance4x4)
-#if CONFIG_EXT_PARTITION_TYPES
HIGHBD_MBFP(BLOCK_128X32, aom_highbd_masked_sad128x32_bits10,
aom_highbd_10_masked_sub_pixel_variance128x32)
-
HIGHBD_MBFP(BLOCK_32X128, aom_highbd_masked_sad32x128_bits10,
aom_highbd_10_masked_sub_pixel_variance32x128)
-
HIGHBD_MBFP(BLOCK_64X16, aom_highbd_masked_sad64x16_bits10,
aom_highbd_10_masked_sub_pixel_variance64x16)
-
HIGHBD_MBFP(BLOCK_16X64, aom_highbd_masked_sad16x64_bits10,
aom_highbd_10_masked_sub_pixel_variance16x64)
-
HIGHBD_MBFP(BLOCK_32X8, aom_highbd_masked_sad32x8_bits10,
aom_highbd_10_masked_sub_pixel_variance32x8)
-
HIGHBD_MBFP(BLOCK_8X32, aom_highbd_masked_sad8x32_bits10,
aom_highbd_10_masked_sub_pixel_variance8x32)
-
HIGHBD_MBFP(BLOCK_16X4, aom_highbd_masked_sad16x4_bits10,
aom_highbd_10_masked_sub_pixel_variance16x4)
-
HIGHBD_MBFP(BLOCK_4X16, aom_highbd_masked_sad4x16_bits10,
aom_highbd_10_masked_sub_pixel_variance4x16)
-#endif
HIGHBD_OBFP(BLOCK_128X128, aom_highbd_obmc_sad128x128_bits10,
aom_highbd_10_obmc_variance128x128,
aom_highbd_10_obmc_sub_pixel_variance128x128)
@@ -2433,7 +2388,6 @@
HIGHBD_OBFP(BLOCK_4X4, aom_highbd_obmc_sad4x4_bits10,
aom_highbd_10_obmc_variance4x4,
aom_highbd_10_obmc_sub_pixel_variance4x4)
-#if CONFIG_EXT_PARTITION_TYPES
HIGHBD_OBFP(BLOCK_128X32, aom_highbd_obmc_sad128x32_bits10,
aom_highbd_10_obmc_variance128x32,
aom_highbd_10_obmc_sub_pixel_variance128x32)
@@ -2465,12 +2419,10 @@
HIGHBD_OBFP(BLOCK_4X16, aom_highbd_obmc_sad4x16_bits10,
aom_highbd_10_obmc_variance4x16,
aom_highbd_10_obmc_sub_pixel_variance4x16)
-#endif
break;
case AOM_BITS_12:
#if CONFIG_JNT_COMP
-#if CONFIG_EXT_PARTITION_TYPES
HIGHBD_BFP(
BLOCK_128X32, aom_highbd_sad128x32_bits12,
aom_highbd_sad128x32_avg_bits12, aom_highbd_12_variance128x32,
@@ -2534,7 +2486,6 @@
aom_highbd_sad4x16x4d_bits12,
aom_highbd_jnt_sad4x16_avg_bits12,
aom_highbd_12_jnt_sub_pixel_avg_variance4x16);
-#endif
HIGHBD_BFP(BLOCK_32X16, aom_highbd_sad32x16_bits12,
aom_highbd_sad32x16_avg_bits12, aom_highbd_12_variance32x16,
@@ -2670,8 +2621,7 @@
aom_highbd_12_sub_pixel_avg_variance64x128, NULL, NULL,
aom_highbd_sad64x128x4d_bits12, aom_highbd_jnt_sad64x128_avg_bits12,
aom_highbd_12_jnt_sub_pixel_avg_variance64x128);
-#else // CONFIG_JNT_COMP
-#if CONFIG_EXT_PARTITION_TYPES
+#else // CONFIG_JNT_COMP
HIGHBD_BFP(BLOCK_128X32, aom_highbd_sad128x32_bits12,
aom_highbd_sad128x32_avg_bits12,
aom_highbd_12_variance128x32,
@@ -2721,7 +2671,6 @@
aom_highbd_12_sub_pixel_variance4x16,
aom_highbd_12_sub_pixel_avg_variance4x16, NULL, NULL,
aom_highbd_sad4x16x4d_bits12)
-#endif
HIGHBD_BFP(BLOCK_32X16, aom_highbd_sad32x16_bits12,
aom_highbd_sad32x16_avg_bits12, aom_highbd_12_variance32x16,
@@ -2861,32 +2810,22 @@
aom_highbd_12_masked_sub_pixel_variance8x4)
HIGHBD_MBFP(BLOCK_4X4, aom_highbd_masked_sad4x4_bits12,
aom_highbd_12_masked_sub_pixel_variance4x4)
-#if CONFIG_EXT_PARTITION_TYPES
HIGHBD_MBFP(BLOCK_128X32, aom_highbd_masked_sad128x32_bits12,
aom_highbd_12_masked_sub_pixel_variance128x32)
-
HIGHBD_MBFP(BLOCK_32X128, aom_highbd_masked_sad32x128_bits12,
aom_highbd_12_masked_sub_pixel_variance32x128)
-
HIGHBD_MBFP(BLOCK_64X16, aom_highbd_masked_sad64x16_bits12,
aom_highbd_12_masked_sub_pixel_variance64x16)
-
HIGHBD_MBFP(BLOCK_16X64, aom_highbd_masked_sad16x64_bits12,
aom_highbd_12_masked_sub_pixel_variance16x64)
-
HIGHBD_MBFP(BLOCK_32X8, aom_highbd_masked_sad32x8_bits12,
aom_highbd_12_masked_sub_pixel_variance32x8)
-
HIGHBD_MBFP(BLOCK_8X32, aom_highbd_masked_sad8x32_bits12,
aom_highbd_12_masked_sub_pixel_variance8x32)
-
HIGHBD_MBFP(BLOCK_16X4, aom_highbd_masked_sad16x4_bits12,
aom_highbd_12_masked_sub_pixel_variance16x4)
-
HIGHBD_MBFP(BLOCK_4X16, aom_highbd_masked_sad4x16_bits12,
aom_highbd_12_masked_sub_pixel_variance4x16)
-#endif
-
HIGHBD_OBFP(BLOCK_128X128, aom_highbd_obmc_sad128x128_bits12,
aom_highbd_12_obmc_variance128x128,
aom_highbd_12_obmc_sub_pixel_variance128x128)
@@ -2935,39 +2874,30 @@
HIGHBD_OBFP(BLOCK_4X4, aom_highbd_obmc_sad4x4_bits12,
aom_highbd_12_obmc_variance4x4,
aom_highbd_12_obmc_sub_pixel_variance4x4)
-#if CONFIG_EXT_PARTITION_TYPES
HIGHBD_OBFP(BLOCK_128X32, aom_highbd_obmc_sad128x32_bits12,
aom_highbd_12_obmc_variance128x32,
aom_highbd_12_obmc_sub_pixel_variance128x32)
-
HIGHBD_OBFP(BLOCK_32X128, aom_highbd_obmc_sad32x128_bits12,
aom_highbd_12_obmc_variance32x128,
aom_highbd_12_obmc_sub_pixel_variance32x128)
-
HIGHBD_OBFP(BLOCK_64X16, aom_highbd_obmc_sad64x16_bits12,
aom_highbd_12_obmc_variance64x16,
aom_highbd_12_obmc_sub_pixel_variance64x16)
-
HIGHBD_OBFP(BLOCK_16X64, aom_highbd_obmc_sad16x64_bits12,
aom_highbd_12_obmc_variance16x64,
aom_highbd_12_obmc_sub_pixel_variance16x64)
-
HIGHBD_OBFP(BLOCK_32X8, aom_highbd_obmc_sad32x8_bits12,
aom_highbd_12_obmc_variance32x8,
aom_highbd_12_obmc_sub_pixel_variance32x8)
-
HIGHBD_OBFP(BLOCK_8X32, aom_highbd_obmc_sad8x32_bits12,
aom_highbd_12_obmc_variance8x32,
aom_highbd_12_obmc_sub_pixel_variance8x32)
-
HIGHBD_OBFP(BLOCK_16X4, aom_highbd_obmc_sad16x4_bits12,
aom_highbd_12_obmc_variance16x4,
aom_highbd_12_obmc_sub_pixel_variance16x4)
-
HIGHBD_OBFP(BLOCK_4X16, aom_highbd_obmc_sad4x16_bits12,
aom_highbd_12_obmc_variance4x16,
aom_highbd_12_obmc_sub_pixel_variance4x16)
-#endif
break;
default:
@@ -3360,7 +3290,6 @@
#endif // CONFIG_JNT_COMP
#if CONFIG_JNT_COMP
-#if CONFIG_EXT_PARTITION_TYPES
BFP(BLOCK_4X16, aom_sad4x16, aom_sad4x16_avg, aom_variance4x16,
aom_sub_pixel_variance4x16, aom_sub_pixel_avg_variance4x16, NULL, NULL,
aom_sad4x16x4d, aom_jnt_sad4x16_avg, aom_jnt_sub_pixel_avg_variance4x16)
@@ -3396,7 +3325,6 @@
aom_sub_pixel_variance128x32, aom_sub_pixel_avg_variance128x32, NULL,
NULL, aom_sad128x32x4d, aom_jnt_sad128x32_avg,
aom_jnt_sub_pixel_avg_variance128x32)
-#endif // CONFIG_EXT_PARTITION_TYPES
BFP(BLOCK_128X128, aom_sad128x128, aom_sad128x128_avg, aom_variance128x128,
aom_sub_pixel_variance128x128, aom_sub_pixel_avg_variance128x128,
@@ -3479,7 +3407,6 @@
aom_jnt_sub_pixel_avg_variance4x4)
#else // CONFIG_JNT_COMP
-#if CONFIG_EXT_PARTITION_TYPES
BFP(BLOCK_4X16, aom_sad4x16, aom_sad4x16_avg, aom_variance4x16,
aom_sub_pixel_variance4x16, aom_sub_pixel_avg_variance4x16, NULL, NULL,
aom_sad4x16x4d)
@@ -3511,7 +3438,6 @@
BFP(BLOCK_128X32, aom_sad128x32, aom_sad128x32_avg, aom_variance128x32,
aom_sub_pixel_variance128x32, aom_sub_pixel_avg_variance128x32, NULL,
NULL, aom_sad128x32x4d)
-#endif // CONFIG_EXT_PARTITION_TYPES
BFP(BLOCK_128X128, aom_sad128x128, aom_sad128x128_avg, aom_variance128x128,
aom_sub_pixel_variance128x128, aom_sub_pixel_avg_variance128x128,
@@ -3616,32 +3542,22 @@
aom_obmc_sub_pixel_variance8x4)
OBFP(BLOCK_4X4, aom_obmc_sad4x4, aom_obmc_variance4x4,
aom_obmc_sub_pixel_variance4x4)
-
-#if CONFIG_EXT_PARTITION_TYPES
OBFP(BLOCK_4X16, aom_obmc_sad4x16, aom_obmc_variance4x16,
aom_obmc_sub_pixel_variance4x16)
-
OBFP(BLOCK_16X4, aom_obmc_sad16x4, aom_obmc_variance16x4,
aom_obmc_sub_pixel_variance16x4)
-
OBFP(BLOCK_8X32, aom_obmc_sad8x32, aom_obmc_variance8x32,
aom_obmc_sub_pixel_variance8x32)
-
OBFP(BLOCK_32X8, aom_obmc_sad32x8, aom_obmc_variance32x8,
aom_obmc_sub_pixel_variance32x8)
-
OBFP(BLOCK_16X64, aom_obmc_sad16x64, aom_obmc_variance16x64,
aom_obmc_sub_pixel_variance16x64)
-
OBFP(BLOCK_64X16, aom_obmc_sad64x16, aom_obmc_variance64x16,
aom_obmc_sub_pixel_variance64x16)
-
OBFP(BLOCK_32X128, aom_obmc_sad32x128, aom_obmc_variance32x128,
aom_obmc_sub_pixel_variance32x128)
-
OBFP(BLOCK_128X32, aom_obmc_sad128x32, aom_obmc_variance128x32,
aom_obmc_sub_pixel_variance128x32)
-#endif // CONFIG_EXT_PARTITION_TYPES
#define MBFP(BT, MCSDF, MCSVF) \
cpi->fn_ptr[BT].msdf = MCSDF; \
@@ -3665,7 +3581,6 @@
MBFP(BLOCK_8X4, aom_masked_sad8x4, aom_masked_sub_pixel_variance8x4)
MBFP(BLOCK_4X4, aom_masked_sad4x4, aom_masked_sub_pixel_variance4x4)
-#if CONFIG_EXT_PARTITION_TYPES
MBFP(BLOCK_4X16, aom_masked_sad4x16, aom_masked_sub_pixel_variance4x16)
MBFP(BLOCK_16X4, aom_masked_sad16x4, aom_masked_sub_pixel_variance16x4)
@@ -3681,7 +3596,6 @@
MBFP(BLOCK_32X128, aom_masked_sad32x128, aom_masked_sub_pixel_variance32x128)
MBFP(BLOCK_128X32, aom_masked_sad128x32, aom_masked_sub_pixel_variance128x32)
-#endif // CONFIG_EXT_PARTITION_TYPES
highbd_set_var_fns(cpi);
diff --git a/av1/encoder/segmentation.c b/av1/encoder/segmentation.c
index 67ca776..e90fb07 100644
--- a/av1/encoder/segmentation.c
+++ b/av1/encoder/segmentation.c
@@ -92,12 +92,8 @@
BLOCK_SIZE bsize) {
const int mis = cm->mi_stride;
const int bs = mi_size_wide[bsize], hbs = bs / 2;
-#if CONFIG_EXT_PARTITION_TYPES
PARTITION_TYPE partition;
const int qbs = bs / 4;
-#else
- int bw, bh;
-#endif // CONFIG_EXT_PARTITION_TYPES
if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols) return;
@@ -106,7 +102,6 @@
no_pred_segcounts, temporal_predictor_count, t_unpred_seg_counts, \
(cs_bw), (cs_bh), mi_row + (cs_rowoff), mi_col + (cs_coloff));
-#if CONFIG_EXT_PARTITION_TYPES
if (bsize == BLOCK_8X8)
partition = PARTITION_NONE;
else
@@ -173,34 +168,6 @@
} break;
default: assert(0);
}
-#else
- bw = mi_size_wide[mi[0]->mbmi.sb_type];
- bh = mi_size_high[mi[0]->mbmi.sb_type];
-
- if (bw == bs && bh == bs) {
- CSEGS(bs, bs, 0, 0);
- } else if (bw == bs && bh < bs) {
- CSEGS(bs, hbs, 0, 0);
- CSEGS(bs, hbs, hbs, 0);
- } else if (bw < bs && bh == bs) {
- CSEGS(hbs, bs, 0, 0);
- CSEGS(hbs, bs, 0, hbs);
- } else {
- const BLOCK_SIZE subsize = subsize_lookup[PARTITION_SPLIT][bsize];
- int n;
-
- assert(bw < bs && bh < bs);
-
- for (n = 0; n < 4; n++) {
- const int mi_dc = hbs * (n & 1);
- const int mi_dr = hbs * (n >> 1);
-
- count_segs_sb(cm, xd, tile, &mi[mi_dr * mis + mi_dc], no_pred_segcounts,
- temporal_predictor_count, t_unpred_seg_counts,
- mi_row + mi_dr, mi_col + mi_dc, subsize);
- }
- }
-#endif // CONFIG_EXT_PARTITION_TYPES
#undef CSEGS
}
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 883f4f9..7c3adb4 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -146,9 +146,7 @@
sf->tx_size_search_init_depth_rect = 1;
sf->tx_size_search_init_depth_sqr = 1;
sf->two_pass_partition_search = 1;
-#if CONFIG_EXT_PARTITION_TYPES
sf->prune_ext_partition_types_search = 1;
-#endif // CONFIG_EXT_PARTITION_TYPES
sf->use_fast_interpolation_filter_search = 1;
#if 0 // CONFIG_HASH_ME
// TODO(mfo): Activate feature once it gives positive results.
@@ -385,9 +383,7 @@
sf->use_square_partition_only = !frame_is_intra_only(cm);
}
sf->less_rectangular_check = 1;
-#if CONFIG_EXT_PARTITION_TYPES
sf->prune_ext_partition_types_search = 1;
-#endif // CONFIG_EXT_PARTITION_TYPES
}
if (speed & LOOP_FILTER_SF) {
@@ -501,9 +497,7 @@
sf->partition_search_breakout_dist_thr = 0;
sf->partition_search_breakout_rate_thr = 0;
sf->simple_model_rd_from_var = 0;
-#if CONFIG_EXT_PARTITION_TYPES
sf->prune_ext_partition_types_search = 0;
-#endif // CONFIG_EXT_PARTITION_TYPES
sf->fast_cdef_search = 0;
// Set this at the appropriate speed levels
diff --git a/av1/encoder/speed_features.h b/av1/encoder/speed_features.h
index 96eab8c..c0d0cb7 100644
--- a/av1/encoder/speed_features.h
+++ b/av1/encoder/speed_features.h
@@ -361,10 +361,8 @@
// aggressive than lower ones.
int selective_ref_frame;
-#if CONFIG_EXT_PARTITION_TYPES
// Conditionally prune extended partition types search
int prune_ext_partition_types_search;
-#endif // CONFIG_EXT_PARTITION_TYPES
int fast_cdef_search;
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index abece50..faeac5d 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -100,7 +100,6 @@
set(CONFIG_EXT_DELTA_Q 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_EXT_INTRA_MOD 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_EXT_INTRA_MOD2 1 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_EXT_PARTITION_TYPES 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_EXT_TILE 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_EXT_WARPED_MOTION 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_FAST_SGR 1 CACHE NUMBER "AV1 experiment flag.")
diff --git a/build/cmake/aom_experiment_deps.cmake b/build/cmake/aom_experiment_deps.cmake
index d331507..7476319 100644
--- a/build/cmake/aom_experiment_deps.cmake
+++ b/build/cmake/aom_experiment_deps.cmake
@@ -44,12 +44,6 @@
endif ()
endif ()
- if (CONFIG_EXT_PARTITION_TYPES)
- if (CONFIG_FP_MB_STATS)
- change_config_and_warn(CONFIG_FP_MB_STATS 0 CONFIG_EXT_PARTITION_TYPES)
- endif ()
- endif ()
-
if (CONFIG_LOOPFILTER_LEVEL)
if (NOT CONFIG_EXT_DELTA_Q)
change_config_and_warn(CONFIG_EXT_DELTA_Q 1 CONFIG_LOOPFILTER_LEVEL)
diff --git a/test/sad_test.cc b/test/sad_test.cc
index ae08ed0..3608dfc 100644
--- a/test/sad_test.cc
+++ b/test/sad_test.cc
@@ -1328,7 +1328,6 @@
make_tuple(128, 128, &aom_sad128xh_sse2, -1),
make_tuple(128, 64, &aom_sad128xh_sse2, -1),
make_tuple(64, 128, &aom_sad64xh_sse2, -1),
-#if CONFIG_EXT_PARTITION_TYPES
make_tuple(4, 16, &aom_sad4xh_sse2, -1),
make_tuple(16, 4, &aom_sad16xh_sse2, -1),
make_tuple(8, 32, &aom_sad8xh_sse2, -1),
@@ -1337,7 +1336,6 @@
make_tuple(64, 16, &aom_sad64xh_sse2, -1),
make_tuple(32, 128, &aom_sad32xh_sse2, -1),
make_tuple(128, 32, &aom_sad128xh_sse2, -1),
-#endif // CONFIG_EXT_PARTITION_TYPES
};
INSTANTIATE_TEST_CASE_P(SSE2, JntSADTest,
::testing::ValuesIn(jnt_sad_sse2_tests));
diff --git a/tools/aom_entropy_optimizer.c b/tools/aom_entropy_optimizer.c
index 9cbabe1..481f5bb 100644
--- a/tools/aom_entropy_optimizer.c
+++ b/tools/aom_entropy_optimizer.c
@@ -319,19 +319,11 @@
/* Partition */
cts_each_dim[0] = PARTITION_CONTEXTS;
-#if CONFIG_EXT_PARTITION_TYPES
cts_each_dim[1] = EXT_PARTITION_TYPES;
optimize_cdf_table(&fc.partition[0][0], probsfile, 2, cts_each_dim,
"static const aom_cdf_prob\n"
"default_partition_cdf[PARTITION_CONTEXTS][CDF_SIZE(EXT_"
"PARTITION_TYPES)]");
-#else
- cts_each_dim[1] = PARTITION_TYPES;
- optimize_cdf_table(
- &fc.partition[0][0], probsfile, 2, cts_each_dim,
- "static const aom_cdf_prob\n"
- "default_partition_cdf[PARTITION_CONTEXTS][CDF_SIZE(PARTITION_TYPES)]");
-#endif
/* Interpolation filter */
cts_each_dim[0] = SWITCHABLE_FILTER_CONTEXTS;
