Remove CONFIG_EXT_PARTITION config flag
This experiment is fully adopted.
Change-Id: I87faae61532a5caf34616ed693857eae5330a340
diff --git a/aom/src/aom_encoder.c b/aom/src/aom_encoder.c
index 5db23b1..bc94846 100644
--- a/aom/src/aom_encoder.c
+++ b/aom/src/aom_encoder.c
@@ -173,7 +173,7 @@
/* default values */
if (cfg) {
- cfg->cfg.ext_partition = CONFIG_EXT_PARTITION;
+ cfg->cfg.ext_partition = 1;
}
return res;
diff --git a/aom_dsp/aom_convolve.h b/aom_dsp/aom_convolve.h
index 0b4392d..36d1feb 100644
--- a/aom_dsp/aom_convolve.h
+++ b/aom_dsp/aom_convolve.h
@@ -30,11 +30,11 @@
// --Must round-up because block may be located at sub-pixel position.
// --Require an additional SUBPEL_TAPS rows for the 8-tap filter tails.
// --((64 - 1) * 32 + 15) >> 4 + 8 = 135.
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
#define MAX_EXT_SIZE 263
#else
#define MAX_EXT_SIZE 135
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
#if CONFIG_AV1
#define EXTRAPREC_BITS 2
diff --git a/aom_dsp/aom_dsp.cmake b/aom_dsp/aom_dsp.cmake
index 9a463eb..20f09e3 100644
--- a/aom_dsp/aom_dsp.cmake
+++ b/aom_dsp/aom_dsp.cmake
@@ -86,14 +86,6 @@
"${AOM_ROOT}/aom_dsp/x86/inv_txfm_common_avx2.h"
"${AOM_ROOT}/aom_dsp/x86/txfm_common_avx2.h")
-if (NOT CONFIG_EXT_PARTITION)
- set(AOM_DSP_COMMON_ASM_NEON
- "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_avg_neon_asm.asm"
- "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_neon_asm.asm"
- "${AOM_ROOT}/aom_dsp/arm/aom_convolve_avg_neon_asm.asm"
- "${AOM_ROOT}/aom_dsp/arm/aom_convolve_copy_neon_asm.asm")
-endif ()
-
set(AOM_DSP_COMMON_ASM_NEON
${AOM_DSP_COMMON_ASM_NEON}
"${AOM_ROOT}/aom_dsp/arm/idct16x16_1_add_neon.asm"
@@ -108,11 +100,6 @@
"${AOM_ROOT}/aom_dsp/arm/save_reg_neon.asm")
-if (NOT CONFIG_EXT_PARTITION)
- set(AOM_DSP_COMMON_INTRIN_NEON
- "${AOM_ROOT}/aom_dsp/arm/aom_convolve_neon.c")
-endif ()
-
set(AOM_DSP_COMMON_INTRIN_NEON
${AOM_DSP_COMMON_INTRIN_NEON}
"${AOM_ROOT}/aom_dsp/arm/avg_neon.c"
@@ -128,15 +115,6 @@
if ("${AOM_TARGET_CPU}" STREQUAL "arm64")
- if (NOT CONFIG_EXT_PARTITION)
- set(AOM_DSP_COMMON_INTRIN_NEON
- ${AOM_DSP_COMMON_INTRIN_NEON}
- "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_avg_neon.c"
- "${AOM_ROOT}/aom_dsp/arm/aom_convolve8_neon.c"
- "${AOM_ROOT}/aom_dsp/arm/aom_convolve_avg_neon.c"
- "${AOM_ROOT}/aom_dsp/arm/aom_convolve_copy_neon.c")
- endif ()
-
set(AOM_DSP_COMMON_INTRIN_NEON
${AOM_DSP_COMMON_INTRIN_NEON}
"${AOM_ROOT}/aom_dsp/arm/idct16x16_1_add_neon.c"
diff --git a/aom_dsp/aom_dsp_common.h b/aom_dsp/aom_dsp_common.h
index 9b20566..ba8e04d 100644
--- a/aom_dsp/aom_dsp_common.h
+++ b/aom_dsp/aom_dsp_common.h
@@ -21,11 +21,11 @@
#endif
#ifndef MAX_SB_SIZE
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
#define MAX_SB_SIZE 128
#else
#define MAX_SB_SIZE 64
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
#endif // ndef MAX_SB_SIZE
#define AOMMIN(x, y) (((x) < (y)) ? (x) : (y))
diff --git a/aom_dsp/aom_dsp_rtcd_defs.pl b/aom_dsp/aom_dsp_rtcd_defs.pl
index c7e10f4..4dbce62 100755
--- a/aom_dsp/aom_dsp_rtcd_defs.pl
+++ b/aom_dsp/aom_dsp_rtcd_defs.pl
@@ -39,11 +39,7 @@
$avx2_x86_64 = 'avx2';
}
-if (aom_config("CONFIG_EXT_PARTITION") eq "yes") {
- @block_widths = (4, 8, 16, 32, 64, 128)
-} else {
- @block_widths = (4, 8, 16, 32, 64)
-}
+@block_widths = (4, 8, 16, 32, 64, 128);
@block_sizes = ();
foreach $w (@block_widths) {
@@ -58,10 +54,8 @@
push @block_sizes, [32, 8];
push @block_sizes, [16, 64];
push @block_sizes, [64, 16];
- if (aom_config("CONFIG_EXT_PARTITION") eq "yes") {
- push @block_sizes, [32, 128];
- push @block_sizes, [128, 32];
- }
+ push @block_sizes, [32, 128];
+ push @block_sizes, [128, 32];
}
@tx_dims = (2, 4, 8, 16, 32, 64);
@@ -293,7 +287,7 @@
specialize qw/aom_convolve8_add_src_hip avx2/;
# TODO(any): These need to be extended to up to 128x128 block sizes
-if (!(aom_config("CONFIG_AV1") eq "yes" && aom_config("CONFIG_EXT_PARTITION") eq "yes")) {
+if (!(aom_config("CONFIG_AV1") eq "yes")) {
specialize qw/aom_convolve_copy neon dspr2 msa/;
specialize qw/aom_convolve_avg neon dspr2 msa/;
specialize qw/aom_convolve8 neon dspr2 msa/;
@@ -659,21 +653,19 @@
specialize qw/aom_sad4x8_avg msa sse2/;
specialize qw/aom_sad4x4_avg msa sse2/;
- if (aom_config("CONFIG_EXT_PARTITION_TYPES") eq "yes") {
- specialize qw/aom_sad4x16 sse2/;
- specialize qw/aom_sad16x4 sse2/;
- specialize qw/aom_sad8x32 sse2/;
- specialize qw/aom_sad32x8 sse2/;
- specialize qw/aom_sad16x64 sse2/;
- specialize qw/aom_sad64x16 sse2/;
+ specialize qw/aom_sad4x16 sse2/;
+ specialize qw/aom_sad16x4 sse2/;
+ specialize qw/aom_sad8x32 sse2/;
+ specialize qw/aom_sad32x8 sse2/;
+ specialize qw/aom_sad16x64 sse2/;
+ specialize qw/aom_sad64x16 sse2/;
- specialize qw/aom_sad4x16_avg sse2/;
- specialize qw/aom_sad16x4_avg sse2/;
- specialize qw/aom_sad8x32_avg sse2/;
- specialize qw/aom_sad32x8_avg sse2/;
- specialize qw/aom_sad16x64_avg sse2/;
- specialize qw/aom_sad64x16_avg sse2/;
- }
+ specialize qw/aom_sad4x16_avg sse2/;
+ specialize qw/aom_sad16x4_avg sse2/;
+ specialize qw/aom_sad8x32_avg sse2/;
+ specialize qw/aom_sad32x8_avg sse2/;
+ specialize qw/aom_sad16x64_avg sse2/;
+ specialize qw/aom_sad64x16_avg sse2/;
if (aom_config("CONFIG_JNT_COMP") eq "yes") {
specialize qw/aom_jnt_sad128x128_avg ssse3/;
@@ -1125,18 +1117,13 @@
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/;
-
- if (aom_config("CONFIG_EXT_PARTITION") eq "yes") {
- 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_variance128x32 ssse3/;
+ specialize qw/aom_jnt_sub_pixel_avg_variance32x128 ssse3/;
}
- if (aom_config("CONFIG_EXT_PARTITION") eq "yes") {
- specialize qw/aom_jnt_sub_pixel_avg_variance128x128 ssse3/;
- specialize qw/aom_jnt_sub_pixel_avg_variance128x64 ssse3/;
- specialize qw/aom_jnt_sub_pixel_avg_variance64x128 ssse3/;
- }
+ specialize qw/aom_jnt_sub_pixel_avg_variance128x128 ssse3/;
+ specialize qw/aom_jnt_sub_pixel_avg_variance128x64 ssse3/;
+ specialize qw/aom_jnt_sub_pixel_avg_variance64x128 ssse3/;
}
diff --git a/aom_dsp/sad.c b/aom_dsp/sad.c
index 91460c5..7237be5 100644
--- a/aom_dsp/sad.c
+++ b/aom_dsp/sad.c
@@ -100,7 +100,7 @@
}
/* clang-format off */
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
// 128x128
sadMxN(128, 128)
sadMxNxK(128, 128, 3)
@@ -114,7 +114,7 @@
// 64x128
sadMxN(64, 128)
sadMxNx4D(64, 128)
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
// 64x64
sadMxN(64, 64)
@@ -185,9 +185,7 @@
sadMxNx4D(4, 4)
#if CONFIG_JNT_COMP
-#if CONFIG_EXT_PARTITION
sadMxh(128);
-#endif
sadMxh(64);
sadMxh(32);
sadMxh(16);
@@ -307,7 +305,7 @@
}
/* clang-format off */
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
// 128x128
highbd_sadMxN(128, 128)
highbd_sadMxNxK(128, 128, 3)
@@ -321,7 +319,7 @@
// 64x128
highbd_sadMxN(64, 128)
highbd_sadMxNx4D(64, 128)
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
// 64x64
highbd_sadMxN(64, 64)
diff --git a/aom_dsp/sad_av1.c b/aom_dsp/sad_av1.c
index b7795de..bb7c946 100644
--- a/aom_dsp/sad_av1.c
+++ b/aom_dsp/sad_av1.c
@@ -54,11 +54,9 @@
}
/* clang-format off */
-#if CONFIG_EXT_PARTITION
MASKSADMxN(128, 128)
MASKSADMxN(128, 64)
MASKSADMxN(64, 128)
-#endif // CONFIG_EXT_PARTITION
MASKSADMxN(64, 64)
MASKSADMxN(64, 32)
MASKSADMxN(32, 64)
@@ -126,11 +124,9 @@
ref_stride, msk, msk_stride, m, n); \
}
-#if CONFIG_EXT_PARTITION
HIGHBD_MASKSADMXN(128, 128)
HIGHBD_MASKSADMXN(128, 64)
HIGHBD_MASKSADMXN(64, 128)
-#endif // CONFIG_EXT_PARTITION
HIGHBD_MASKSADMXN(64, 64)
HIGHBD_MASKSADMXN(64, 32)
HIGHBD_MASKSADMXN(32, 64)
@@ -185,11 +181,9 @@
}
/* clang-format off */
-#if CONFIG_EXT_PARTITION
OBMCSADMxN(128, 128)
OBMCSADMxN(128, 64)
OBMCSADMxN(64, 128)
-#endif // CONFIG_EXT_PARTITION
OBMCSADMxN(64, 64)
OBMCSADMxN(64, 32)
OBMCSADMxN(32, 64)
@@ -244,11 +238,9 @@
}
/* clang-format off */
-#if CONFIG_EXT_PARTITION
HIGHBD_OBMCSADMXN(128, 128)
HIGHBD_OBMCSADMXN(128, 64)
HIGHBD_OBMCSADMXN(64, 128)
-#endif // CONFIG_EXT_PARTITION
HIGHBD_OBMCSADMXN(64, 64)
HIGHBD_OBMCSADMXN(64, 32)
HIGHBD_OBMCSADMXN(32, 64)
diff --git a/aom_dsp/variance.c b/aom_dsp/variance.c
index 441c53f..ddbb248 100644
--- a/aom_dsp/variance.c
+++ b/aom_dsp/variance.c
@@ -267,11 +267,11 @@
SUBPIX_VAR(W, H) \
SUBPIX_AVG_VAR(W, H)
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
VARIANCES(128, 128)
VARIANCES(128, 64)
VARIANCES(64, 128)
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
VARIANCES(64, 64)
VARIANCES(64, 32)
VARIANCES(32, 64)
@@ -296,10 +296,8 @@
VARIANCES(32, 8)
VARIANCES(16, 64)
VARIANCES(64, 16)
-#if CONFIG_EXT_PARTITION
VARIANCES(32, 128)
VARIANCES(128, 32)
-#endif // CONFIG_EXT_PARTITION
#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION_TYPES
GET_VAR(16, 16)
@@ -844,11 +842,11 @@
HIGHBD_SUBPIX_VAR(W, H) \
HIGHBD_SUBPIX_AVG_VAR(W, H)
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
HIGHBD_VARIANCES(128, 128)
HIGHBD_VARIANCES(128, 64)
HIGHBD_VARIANCES(64, 128)
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
HIGHBD_VARIANCES(64, 64)
HIGHBD_VARIANCES(64, 32)
HIGHBD_VARIANCES(32, 64)
@@ -873,10 +871,8 @@
HIGHBD_VARIANCES(32, 8)
HIGHBD_VARIANCES(16, 64)
HIGHBD_VARIANCES(64, 16)
-#if CONFIG_EXT_PARTITION
HIGHBD_VARIANCES(32, 128)
HIGHBD_VARIANCES(128, 32)
-#endif // CONFIG_EXT_PARTITION
#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION_TYPES
HIGHBD_GET_VAR(8)
@@ -1092,11 +1088,9 @@
MASK_SUBPIX_VAR(32, 64)
MASK_SUBPIX_VAR(64, 32)
MASK_SUBPIX_VAR(64, 64)
-#if CONFIG_EXT_PARTITION
MASK_SUBPIX_VAR(64, 128)
MASK_SUBPIX_VAR(128, 64)
MASK_SUBPIX_VAR(128, 128)
-#endif // CONFIG_EXT_PARTITION
#if CONFIG_EXT_PARTITION_TYPES
MASK_SUBPIX_VAR(4, 16)
@@ -1105,10 +1099,8 @@
MASK_SUBPIX_VAR(32, 8)
MASK_SUBPIX_VAR(16, 64)
MASK_SUBPIX_VAR(64, 16)
-#if CONFIG_EXT_PARTITION
MASK_SUBPIX_VAR(32, 128)
MASK_SUBPIX_VAR(128, 32)
-#endif // CONFIG_EXT_PARTITION
#endif // CONFIG_EXT_PARTITION_TYPES
void aom_highbd_comp_mask_pred_c(uint16_t *comp_pred, const uint8_t *pred8,
@@ -1234,11 +1226,9 @@
HIGHBD_MASK_SUBPIX_VAR(32, 64)
HIGHBD_MASK_SUBPIX_VAR(64, 32)
HIGHBD_MASK_SUBPIX_VAR(64, 64)
-#if CONFIG_EXT_PARTITION
HIGHBD_MASK_SUBPIX_VAR(64, 128)
HIGHBD_MASK_SUBPIX_VAR(128, 64)
HIGHBD_MASK_SUBPIX_VAR(128, 128)
-#endif // CONFIG_EXT_PARTITION
#if CONFIG_EXT_PARTITION_TYPES
HIGHBD_MASK_SUBPIX_VAR(4, 16)
@@ -1247,10 +1237,8 @@
HIGHBD_MASK_SUBPIX_VAR(32, 8)
HIGHBD_MASK_SUBPIX_VAR(16, 64)
HIGHBD_MASK_SUBPIX_VAR(64, 16)
-#if CONFIG_EXT_PARTITION
HIGHBD_MASK_SUBPIX_VAR(32, 128)
HIGHBD_MASK_SUBPIX_VAR(128, 32)
-#endif // CONFIG_EXT_PARTITION
#endif // CONFIG_EXT_PARTITION_TYPES
#endif // CONFIG_AV1
@@ -1339,7 +1327,6 @@
OBMC_VAR(64, 64)
OBMC_SUBPIX_VAR(64, 64)
-#if CONFIG_EXT_PARTITION
OBMC_VAR(64, 128)
OBMC_SUBPIX_VAR(64, 128)
@@ -1348,7 +1335,6 @@
OBMC_VAR(128, 128)
OBMC_SUBPIX_VAR(128, 128)
-#endif // CONFIG_EXT_PARTITION
#if CONFIG_EXT_PARTITION_TYPES
OBMC_VAR(4, 16)
@@ -1363,12 +1349,10 @@
OBMC_SUBPIX_VAR(16, 64)
OBMC_VAR(64, 16)
OBMC_SUBPIX_VAR(64, 16)
-#if CONFIG_EXT_PARTITION
OBMC_VAR(32, 128)
OBMC_SUBPIX_VAR(32, 128)
OBMC_VAR(128, 32)
OBMC_SUBPIX_VAR(128, 32)
-#endif // CONFIG_EXT_PARTITION
#endif // CONFIG_EXT_PARTITION_TYPES
static INLINE void highbd_obmc_variance64(const uint8_t *pre8, int pre_stride,
@@ -1541,7 +1525,6 @@
HIGHBD_OBMC_VAR(64, 64)
HIGHBD_OBMC_SUBPIX_VAR(64, 64)
-#if CONFIG_EXT_PARTITION
HIGHBD_OBMC_VAR(64, 128)
HIGHBD_OBMC_SUBPIX_VAR(64, 128)
@@ -1550,7 +1533,6 @@
HIGHBD_OBMC_VAR(128, 128)
HIGHBD_OBMC_SUBPIX_VAR(128, 128)
-#endif // CONFIG_EXT_PARTITION
#if CONFIG_EXT_PARTITION_TYPES
HIGHBD_OBMC_VAR(4, 16)
@@ -1565,11 +1547,9 @@
HIGHBD_OBMC_SUBPIX_VAR(16, 64)
HIGHBD_OBMC_VAR(64, 16)
HIGHBD_OBMC_SUBPIX_VAR(64, 16)
-#if CONFIG_EXT_PARTITION
HIGHBD_OBMC_VAR(32, 128)
HIGHBD_OBMC_SUBPIX_VAR(32, 128)
HIGHBD_OBMC_VAR(128, 32)
HIGHBD_OBMC_SUBPIX_VAR(128, 32)
-#endif // CONFIG_EXT_PARTITION
#endif // CONFIG_EXT_PARTITION_TYPES
#endif // CONFIG_AV1
diff --git a/aom_dsp/x86/aom_convolve_copy_sse2.asm b/aom_dsp/x86/aom_convolve_copy_sse2.asm
index 9d4251f..c734266 100644
--- a/aom_dsp/x86/aom_convolve_copy_sse2.asm
+++ b/aom_dsp/x86/aom_convolve_copy_sse2.asm
@@ -50,7 +50,7 @@
cmp r4d, 32
je .w32
-%if CONFIG_AV1 && CONFIG_EXT_PARTITION
+%if CONFIG_AV1
cmp r4d, 64
je .w64
%ifidn %2, highbd
@@ -160,7 +160,7 @@
jnz .loop128
RET
-%else ; CONFIG_AV1 && CONFIG_EXT_PARTITION
+%else ; CONFIG_AV1
%ifidn %2, highbd
cmp r4d, 64
@@ -202,7 +202,7 @@
jnz .loop128
RET
%endif
-%endif ; CONFIG_AV1 && CONFIG_EXT_PARTITION
+%endif ; CONFIG_AV1
.w64:
mov r4d, dword hm
diff --git a/aom_dsp/x86/highbd_subtract_sse2.c b/aom_dsp/x86/highbd_subtract_sse2.c
index befd812..f373862 100644
--- a/aom_dsp/x86/highbd_subtract_sse2.c
+++ b/aom_dsp/x86/highbd_subtract_sse2.c
@@ -204,21 +204,17 @@
SUBTRACT_FUN(32x64) { STACK_V(32, subtract_32x32); }
SUBTRACT_FUN(64x32) { STACK_H(32, subtract_32x32); }
SUBTRACT_FUN(64x64) { STACK_V(32, subtract_64x32); }
-#if CONFIG_EXT_PARTITION
SUBTRACT_FUN(64x128) { STACK_V(64, subtract_64x64); }
SUBTRACT_FUN(128x64) { STACK_H(64, subtract_64x64); }
SUBTRACT_FUN(128x128) { STACK_V(64, subtract_128x64); }
-#endif
SUBTRACT_FUN(4x16) { STACK_V(8, subtract_4x8); }
SUBTRACT_FUN(16x4) { STACK_H(8, subtract_8x4); }
SUBTRACT_FUN(8x32) { STACK_V(16, subtract_8x16); }
SUBTRACT_FUN(32x8) { STACK_H(16, subtract_16x8); }
SUBTRACT_FUN(16x64) { STACK_V(32, subtract_16x32); }
SUBTRACT_FUN(64x16) { STACK_H(32, subtract_32x16); }
-#if CONFIG_EXT_PARTITION
SUBTRACT_FUN(32x128) { STACK_V(64, subtract_32x64); }
SUBTRACT_FUN(128x32) { STACK_H(64, subtract_64x32); }
-#endif
static SubtractWxHFuncType getSubtractFunc(int rows, int cols) {
if (rows == 4) {
@@ -244,25 +240,19 @@
if (cols == 16) return subtract_16x32;
if (cols == 32) return subtract_32x32;
if (cols == 64) return subtract_64x32;
-#if CONFIG_EXT_PARTITION
if (cols == 128) return subtract_128x32;
-#endif // CONFIG_EXT_PARTITION
}
if (rows == 64) {
if (cols == 16) return subtract_16x64;
if (cols == 32) return subtract_32x64;
if (cols == 64) return subtract_64x64;
-#if CONFIG_EXT_PARTITION
if (cols == 128) return subtract_128x64;
-#endif // CONFIG_EXT_PARTITION
}
-#if CONFIG_EXT_PARTITION
if (rows == 128) {
if (cols == 32) return subtract_32x128;
if (cols == 64) return subtract_64x128;
if (cols == 128) return subtract_128x128;
}
-#endif // CONFIG_EXT_PARTITION
assert(0);
return NULL;
}
diff --git a/aom_dsp/x86/jnt_sad_ssse3.c b/aom_dsp/x86/jnt_sad_ssse3.c
index 58b87bd..9c01c65 100644
--- a/aom_dsp/x86/jnt_sad_ssse3.c
+++ b/aom_dsp/x86/jnt_sad_ssse3.c
@@ -216,11 +216,11 @@
#endif // CONFIG_JNT_COMP
/* clang-format off */
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
jnt_sadMxN_sse2(128, 128)
jnt_sadMxN_sse2(128, 64)
jnt_sadMxN_sse2(64, 128)
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
jnt_sadMxN_sse2(64, 64)
jnt_sadMxN_sse2(64, 32)
diff --git a/aom_dsp/x86/jnt_variance_ssse3.c b/aom_dsp/x86/jnt_variance_ssse3.c
index b1f5bad..e4201a8 100644
--- a/aom_dsp/x86/jnt_variance_ssse3.c
+++ b/aom_dsp/x86/jnt_variance_ssse3.c
@@ -273,11 +273,11 @@
return aom_variance##W##x##H(temp3, W, b, b_stride, sse); \
}
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
JNT_SUBPIX_AVG_VAR(128, 128)
JNT_SUBPIX_AVG_VAR(128, 64)
JNT_SUBPIX_AVG_VAR(64, 128)
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
JNT_SUBPIX_AVG_VAR(64, 64)
JNT_SUBPIX_AVG_VAR(64, 32)
JNT_SUBPIX_AVG_VAR(32, 64)
@@ -299,10 +299,8 @@
JNT_SUBPIX_AVG_VAR(32, 8)
JNT_SUBPIX_AVG_VAR(16, 64)
JNT_SUBPIX_AVG_VAR(64, 16)
-#if CONFIG_EXT_PARTITION
JNT_SUBPIX_AVG_VAR(32, 128)
JNT_SUBPIX_AVG_VAR(128, 32)
-#endif // CONFIG_EXT_PARTITION
#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION_TYPES
#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 1438948..bab9d85 100644
--- a/aom_dsp/x86/masked_sad_intrin_ssse3.c
+++ b/aom_dsp/x86/masked_sad_intrin_ssse3.c
@@ -75,11 +75,9 @@
ref_stride, msk, msk_stride, n); \
}
-#if CONFIG_EXT_PARTITION
MASKSADMXN_SSSE3(128, 128)
MASKSADMXN_SSSE3(128, 64)
MASKSADMXN_SSSE3(64, 128)
-#endif // CONFIG_EXT_PARTITION
MASKSADMXN_SSSE3(64, 64)
MASKSADMXN_SSSE3(64, 32)
MASKSADMXN_SSSE3(32, 64)
@@ -100,10 +98,8 @@
MASKSADMXN_SSSE3(32, 8)
MASKSADMXN_SSSE3(16, 64)
MASKSADMXN_SSSE3(64, 16)
-#if CONFIG_EXT_PARTITION
MASKSADMXN_SSSE3(32, 128)
MASKSADMXN_SSSE3(128, 32)
-#endif // CONFIG_EXT_PARTITION
#endif // CONFIG_EXT_PARTITION_TYPES
static INLINE unsigned int masked_sad_ssse3(const uint8_t *src_ptr,
@@ -276,11 +272,9 @@
ref8, ref_stride, msk, msk_stride, n); \
}
-#if CONFIG_EXT_PARTITION
HIGHBD_MASKSADMXN_SSSE3(128, 128)
HIGHBD_MASKSADMXN_SSSE3(128, 64)
HIGHBD_MASKSADMXN_SSSE3(64, 128)
-#endif // CONFIG_EXT_PARTITION
HIGHBD_MASKSADMXN_SSSE3(64, 64)
HIGHBD_MASKSADMXN_SSSE3(64, 32)
HIGHBD_MASKSADMXN_SSSE3(32, 64)
@@ -301,10 +295,8 @@
HIGHBD_MASKSADMXN_SSSE3(32, 8)
HIGHBD_MASKSADMXN_SSSE3(16, 64)
HIGHBD_MASKSADMXN_SSSE3(64, 16)
-#if CONFIG_EXT_PARTITION
HIGHBD_MASKSADMXN_SSSE3(32, 128)
HIGHBD_MASKSADMXN_SSSE3(128, 32)
-#endif // CONFIG_EXT_PARTITION
#endif // CONFIG_EXT_PARTITION_TYPES
static INLINE unsigned int highbd_masked_sad_ssse3(
diff --git a/aom_dsp/x86/masked_variance_intrin_ssse3.c b/aom_dsp/x86/masked_variance_intrin_ssse3.c
index 9ae1de6..b38cc5a 100644
--- a/aom_dsp/x86/masked_variance_intrin_ssse3.c
+++ b/aom_dsp/x86/masked_variance_intrin_ssse3.c
@@ -109,11 +109,9 @@
return *sse - (uint32_t)(((int64_t)sum * sum) / (4 * H)); \
}
-#if CONFIG_EXT_PARTITION
MASK_SUBPIX_VAR_SSSE3(128, 128)
MASK_SUBPIX_VAR_SSSE3(128, 64)
MASK_SUBPIX_VAR_SSSE3(64, 128)
-#endif
MASK_SUBPIX_VAR_SSSE3(64, 64)
MASK_SUBPIX_VAR_SSSE3(64, 32)
MASK_SUBPIX_VAR_SSSE3(32, 64)
@@ -134,10 +132,8 @@
MASK_SUBPIX_VAR_SSSE3(32, 8)
MASK_SUBPIX_VAR_SSSE3(64, 16)
MASK_SUBPIX_VAR_SSSE3(16, 64)
-#if CONFIG_EXT_PARTITION
MASK_SUBPIX_VAR_SSSE3(128, 32)
MASK_SUBPIX_VAR_SSSE3(32, 128)
-#endif // CONFIG_EXT_PARTITION
#endif // CONFIG_EXT_PARTITION_TYPES
static INLINE __m128i filter_block(const __m128i a, const __m128i b,
@@ -695,11 +691,9 @@
return (var >= 0) ? (uint32_t)var : 0; \
}
-#if CONFIG_EXT_PARTITION
HIGHBD_MASK_SUBPIX_VAR_SSSE3(128, 128)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(128, 64)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(64, 128)
-#endif
HIGHBD_MASK_SUBPIX_VAR_SSSE3(64, 64)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(64, 32)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(32, 64)
@@ -720,11 +714,9 @@
HIGHBD_MASK_SUBPIX_VAR_SSSE3(32, 8)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(16, 64)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(64, 16)
-#if CONFIG_EXT_PARTITION
HIGHBD_MASK_SUBPIX_VAR_SSSE3(32, 128)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(128, 32)
#endif
-#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 c14351b..622ab46 100644
--- a/aom_dsp/x86/obmc_sad_sse4.c
+++ b/aom_dsp/x86/obmc_sad_sse4.c
@@ -119,11 +119,9 @@
} \
}
-#if CONFIG_EXT_PARTITION
OBMCSADWXH(128, 128)
OBMCSADWXH(128, 64)
OBMCSADWXH(64, 128)
-#endif // CONFIG_EXT_PARTITION
OBMCSADWXH(64, 64)
OBMCSADWXH(64, 32)
OBMCSADWXH(32, 64)
@@ -249,11 +247,9 @@
} \
}
-#if CONFIG_EXT_PARTITION
HBD_OBMCSADWXH(128, 128)
HBD_OBMCSADWXH(128, 64)
HBD_OBMCSADWXH(64, 128)
-#endif // CONFIG_EXT_PARTITION
HBD_OBMCSADWXH(64, 64)
HBD_OBMCSADWXH(64, 32)
HBD_OBMCSADWXH(32, 64)
diff --git a/aom_dsp/x86/obmc_variance_sse4.c b/aom_dsp/x86/obmc_variance_sse4.c
index 18f1203..84b9657 100644
--- a/aom_dsp/x86/obmc_variance_sse4.c
+++ b/aom_dsp/x86/obmc_variance_sse4.c
@@ -128,11 +128,9 @@
return *sse - (unsigned int)(((int64_t)sum * sum) / (W * H)); \
}
-#if CONFIG_EXT_PARTITION
OBMCVARWXH(128, 128)
OBMCVARWXH(128, 64)
OBMCVARWXH(64, 128)
-#endif // CONFIG_EXT_PARTITION
OBMCVARWXH(64, 64)
OBMCVARWXH(64, 32)
OBMCVARWXH(32, 64)
@@ -153,10 +151,8 @@
OBMCVARWXH(32, 8)
OBMCVARWXH(16, 64)
OBMCVARWXH(64, 16)
-#if CONFIG_EXT_PARTITION
OBMCVARWXH(32, 128)
OBMCVARWXH(128, 32)
-#endif // CONFIG_EXT_PARTITION
#endif // CONFIG_EXT_PARTITION_TYPES
////////////////////////////////////////////////////////////////////////////////
@@ -346,11 +342,9 @@
return (var >= 0) ? (uint32_t)var : 0; \
}
-#if CONFIG_EXT_PARTITION
HBD_OBMCVARWXH(128, 128)
HBD_OBMCVARWXH(128, 64)
HBD_OBMCVARWXH(64, 128)
-#endif // CONFIG_EXT_PARTITION
HBD_OBMCVARWXH(64, 64)
HBD_OBMCVARWXH(64, 32)
HBD_OBMCVARWXH(32, 64)
@@ -371,8 +365,6 @@
HBD_OBMCVARWXH(32, 8)
HBD_OBMCVARWXH(16, 64)
HBD_OBMCVARWXH(64, 16)
-#if CONFIG_EXT_PARTITION
HBD_OBMCVARWXH(32, 128)
HBD_OBMCVARWXH(128, 32)
-#endif // CONFIG_EXT_PARTITION
#endif // CONFIG_EXT_PARTITION_TYPES
diff --git a/aom_dsp/x86/sad4d_sse2.asm b/aom_dsp/x86/sad4d_sse2.asm
index 2c67f45..cd9d8d9 100644
--- a/aom_dsp/x86/sad4d_sse2.asm
+++ b/aom_dsp/x86/sad4d_sse2.asm
@@ -233,11 +233,9 @@
%endmacro
INIT_XMM sse2
-%if CONFIG_EXT_PARTITION
SADNXN4D 128, 128
SADNXN4D 128, 64
SADNXN4D 64, 128
-%endif
SADNXN4D 64, 64
SADNXN4D 64, 32
SADNXN4D 32, 64
diff --git a/aom_dsp/x86/sad_highbd_avx2.c b/aom_dsp/x86/sad_highbd_avx2.c
index e8dd87a..99a3a11 100644
--- a/aom_dsp/x86/sad_highbd_avx2.c
+++ b/aom_dsp/x86/sad_highbd_avx2.c
@@ -360,7 +360,6 @@
return sum;
}
-#if CONFIG_EXT_PARTITION
static void sad128x1(const uint16_t *src_ptr, const uint16_t *ref_ptr,
const uint16_t *sec_ptr, __m256i *sad_acc) {
__m256i s[8], r[8];
@@ -471,7 +470,6 @@
sum += aom_highbd_sad128x64_avx2(src, src_stride, ref, ref_stride);
return sum;
}
-#endif // CONFIG_EXT_PARTITION
// If sec_ptr = 0, calculate regular SAD. Otherwise, calculate average SAD.
static INLINE void sad16x4(const uint16_t *src_ptr, int src_stride,
@@ -649,7 +647,6 @@
return sum;
}
-#if CONFIG_EXT_PARTITION
unsigned int aom_highbd_sad64x128_avg_avx2(const uint8_t *src, int src_stride,
const uint8_t *ref, int ref_stride,
const uint8_t *second_pred) {
@@ -697,7 +694,6 @@
second_pred);
return sum;
}
-#endif // CONFIG_EXT_PARTITION
// SAD 4D
// Combine 4 __m256i vectors to uint32_t result[4]
@@ -967,7 +963,6 @@
sad_array[3] = first_half[3] + second_half[3];
}
-#if CONFIG_EXT_PARTITION
void aom_highbd_sad64x128x4d_avx2(const uint8_t *src, int src_stride,
const uint8_t *const ref_array[],
int ref_stride, uint32_t *sad_array) {
@@ -1045,4 +1040,3 @@
sad_array[2] = first_half[2] + second_half[2];
sad_array[3] = first_half[3] + second_half[3];
}
-#endif // CONFIG_EXT_PARTITION
diff --git a/aom_dsp/x86/sad_sse2.asm b/aom_dsp/x86/sad_sse2.asm
index b4cc6ab..285a56d 100644
--- a/aom_dsp/x86/sad_sse2.asm
+++ b/aom_dsp/x86/sad_sse2.asm
@@ -47,7 +47,6 @@
%endif ; %3 == 7
%endmacro
-%if CONFIG_EXT_PARTITION
; unsigned int aom_sad128x128_sse2(uint8_t *src, int src_stride,
; uint8_t *ref, int ref_stride);
%macro SAD128XN 1-2 0
@@ -114,7 +113,6 @@
SAD128XN 128, 1 ; sad128x128_avg_sse2
SAD128XN 64 ; sad128x64_sse2
SAD128XN 64, 1 ; sad128x64_avg_sse2
-%endif
; unsigned int aom_sad64x64_sse2(uint8_t *src, int src_stride,
@@ -155,10 +153,8 @@
%endmacro
INIT_XMM sse2
-%if CONFIG_EXT_PARTITION
SAD64XN 128 ; sad64x128_sse2
SAD64XN 128, 1 ; sad64x128_avg_sse2
-%endif
SAD64XN 64 ; sad64x64_sse2
SAD64XN 32 ; sad64x32_sse2
SAD64XN 64, 1 ; sad64x64_avg_sse2
diff --git a/aom_dsp/x86/subtract_sse2.asm b/aom_dsp/x86/subtract_sse2.asm
index 7bd5b23..1a75a23 100644
--- a/aom_dsp/x86/subtract_sse2.asm
+++ b/aom_dsp/x86/subtract_sse2.asm
@@ -34,10 +34,8 @@
je .case_16
cmp colsd, 32
je .case_32
-%if CONFIG_EXT_PARTITION
cmp colsd, 64
je .case_64
-%endif
%macro loop16 6
mova m0, [srcq+%1]
@@ -62,7 +60,6 @@
mova [diffq+mmsize*1+%6], m1
%endmacro
-%if CONFIG_EXT_PARTITION
mov pred_str, pred_stridemp
.loop_128:
loop16 0*mmsize, 1*mmsize, 0*mmsize, 1*mmsize, 0*mmsize, 2*mmsize
@@ -77,7 +74,6 @@
RET
.case_64:
-%endif
mov pred_str, pred_stridemp
.loop_64:
loop16 0*mmsize, 1*mmsize, 0*mmsize, 1*mmsize, 0*mmsize, 2*mmsize
diff --git a/aom_scale/yv12config.h b/aom_scale/yv12config.h
index 81ddb7a..13f84f0 100644
--- a/aom_scale/yv12config.h
+++ b/aom_scale/yv12config.h
@@ -21,21 +21,13 @@
#include "aom/aom_frame_buffer.h"
#include "aom/aom_integer.h"
-#if CONFIG_EXT_PARTITION
#define AOMINNERBORDERINPIXELS 160
-#else
-#define AOMINNERBORDERINPIXELS 96
-#endif // CONFIG_EXT_PARTITION
#define AOM_INTERP_EXTEND 4
// TODO(jingning): Use unified inter predictor for encoder and
// decoder during the development process. Revisit the frame border
// to improve the decoder performance.
-#if CONFIG_EXT_PARTITION
#define AOM_BORDER_IN_PIXELS 288
-#else
-#define AOM_BORDER_IN_PIXELS 160
-#endif // CONFIG_EXT_PARTITION
typedef struct yv12_buffer_config {
union {
diff --git a/aomdec.c b/aomdec.c
index 2f5b2d4..0d993a9 100644
--- a/aomdec.c
+++ b/aomdec.c
@@ -513,9 +513,7 @@
int opt_yv12 = 0;
int opt_i420 = 0;
int opt_raw = 0;
- aom_codec_dec_cfg_t cfg = {
- 0, 0, 0, CONFIG_LOWBITDEPTH, { CONFIG_EXT_PARTITION }
- };
+ aom_codec_dec_cfg_t cfg = { 0, 0, 0, CONFIG_LOWBITDEPTH, { 1 } };
unsigned int output_bit_depth = 0;
#if CONFIG_EXT_TILE
unsigned int tile_mode = 0;
diff --git a/aomenc.c b/aomenc.c
index c7301f7..2b1cdda 100644
--- a/aomenc.c
+++ b/aomenc.c
@@ -168,7 +168,7 @@
#if CONFIG_FILEOPTIONS
static const arg_def_t use_cfg = ARG_DEF("c", "cfg", 1, "Config file to use");
static const arg_def_t ext_partition =
- ARG_DEF(NULL, "ext-partition", 1, "corresponds to CONFIG_EXT_PARTITION");
+ ARG_DEF(NULL, "ext-partition", 1, "corresponds to exended partitions");
#endif
static const struct arg_enum_list test_decode_enum[] = {
@@ -625,7 +625,6 @@
"2: selectively update CDF on some frames");
#endif // CONFIG_CDF_UPDATE_MODE
-#if CONFIG_EXT_PARTITION
static const struct arg_enum_list superblock_size_enum[] = {
{ "dynamic", AOM_SUPERBLOCK_SIZE_DYNAMIC },
{ "64", AOM_SUPERBLOCK_SIZE_64X64 },
@@ -634,7 +633,6 @@
};
static const arg_def_t superblock_size = ARG_DEF_ENUM(
NULL, "sb-size", 1, "Superblock size to use", superblock_size_enum);
-#endif // CONFIG_EXT_PARTITION
static const arg_def_t *av1_args[] = { &cpu_used_av1,
&dev_sf_av1,
@@ -690,9 +688,7 @@
&input_chroma_sample_position,
&min_gf_interval,
&max_gf_interval,
-#if CONFIG_EXT_PARTITION
&superblock_size,
-#endif // CONFIG_EXT_PARTITION
&num_tg,
&mtu_size,
#if CONFIG_TIMING_INFO_IN_SEQ_HEADERS
@@ -759,9 +755,7 @@
AV1E_SET_CHROMA_SAMPLE_POSITION,
AV1E_SET_MIN_GF_INTERVAL,
AV1E_SET_MAX_GF_INTERVAL,
-#if CONFIG_EXT_PARTITION
AV1E_SET_SUPERBLOCK_SIZE,
-#endif // CONFIG_EXT_PARTITION
AV1E_SET_NUM_TG,
AV1E_SET_MTU,
#if CONFIG_TIMING_INFO_IN_SEQ_HEADERS
@@ -1613,9 +1607,7 @@
#if CONFIG_AV1_DECODER
if (global->test_decode != TEST_DECODE_OFF) {
const AvxInterface *decoder = get_aom_decoder_by_name(global->codec->name);
- aom_codec_dec_cfg_t cfg = {
- 0, 0, 0, CONFIG_LOWBITDEPTH, { CONFIG_EXT_PARTITION }
- };
+ aom_codec_dec_cfg_t cfg = { 0, 0, 0, CONFIG_LOWBITDEPTH, { 1 } };
aom_codec_dec_init(&stream->decoder, decoder->codec_interface(), &cfg, 0);
#if CONFIG_EXT_TILE
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index 9fa9ecc..620b3f7 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -329,10 +329,9 @@
RANGE_CHECK_HI(extra_cfg, single_tile_decoding, 1);
if (cfg->large_scale_tile) {
-// TODO(any): Warning. If CONFIG_EXT_TILE is true, tile_columns really
-// means tile_width, and tile_rows really means tile_hight. The interface
-// should be sanitized.
-#if CONFIG_EXT_PARTITION
+ // TODO(any): Warning. If CONFIG_EXT_TILE is true, tile_columns really
+ // means tile_width, and tile_rows really means tile_hight. The interface
+ // should be sanitized.
// While cfg->large_scale_tile = 1, only allow AOM_SUPERBLOCK_SIZE_64X64 and
// AOM_SUPERBLOCK_SIZE_128X128 for superblock_size. If superblock_size =
// AOM_SUPERBLOCK_SIZE_DYNAMIC(default), hard set it to
@@ -343,13 +342,10 @@
RANGE_CHECK(extra_cfg, tile_columns, 1, 32);
if (extra_cfg->tile_rows != 0) RANGE_CHECK(extra_cfg, tile_rows, 1, 32);
} else {
-#endif // CONFIG_EXT_PARTITION
if (extra_cfg->tile_columns != 0)
RANGE_CHECK(extra_cfg, tile_columns, 1, 64);
if (extra_cfg->tile_rows != 0) RANGE_CHECK(extra_cfg, tile_rows, 1, 64);
-#if CONFIG_EXT_PARTITION
}
-#endif // CONFIG_EXT_PARTITION
} else {
#endif // CONFIG_EXT_TILE
#if CONFIG_MAX_TILE
@@ -669,9 +665,7 @@
oxcf->cdf_update_mode = (uint8_t)extra_cfg->cdf_update_mode;
#endif // CONFIG_CDF_UPDATE_MODE
-#if CONFIG_EXT_PARTITION
oxcf->superblock_size = extra_cfg->superblock_size;
-#endif // CONFIG_EXT_PARTITION
#if CONFIG_FILM_GRAIN
oxcf->film_grain_test_vector = extra_cfg->film_grain_test_vector;
@@ -681,7 +675,6 @@
oxcf->single_tile_decoding =
(oxcf->large_scale_tile) ? extra_cfg->single_tile_decoding : 0;
if (oxcf->large_scale_tile) {
-#if CONFIG_EXT_PARTITION
// superblock_size can only be AOM_SUPERBLOCK_SIZE_64X64 or
// AOM_SUPERBLOCK_SIZE_128X128 while oxcf->large_scale_tile = 1;
if (extra_cfg->superblock_size != AOM_SUPERBLOCK_SIZE_64X64 &&
@@ -689,9 +682,6 @@
oxcf->superblock_size = AOM_SUPERBLOCK_SIZE_64X64;
const unsigned int max =
oxcf->superblock_size == AOM_SUPERBLOCK_SIZE_64X64 ? 64 : 32;
-#else
- const unsigned int max = 64;
-#endif // CONFIG_EXT_PARTITION
// If tile size is not set, set it to the default value.
const unsigned int tc =
(!extra_cfg->tile_columns) ? UINT_MAX : extra_cfg->tile_columns;
@@ -1821,16 +1811,16 @@
2000, // rc_two_pass_vbrmax_section
// keyframing settings (kf)
- AOM_KF_AUTO, // g_kfmode
- 0, // kf_min_dist
- 9999, // kf_max_dist
- 0, // large_scale_tile
- 0, // monochrome
- 0, // tile_width_count
- 0, // tile_height_count
- { 0 }, // tile_widths
- { 0 }, // tile_heights
- { CONFIG_EXT_PARTITION }, // config file
+ AOM_KF_AUTO, // g_kfmode
+ 0, // kf_min_dist
+ 9999, // kf_max_dist
+ 0, // large_scale_tile
+ 0, // monochrome
+ 0, // tile_width_count
+ 0, // tile_height_count
+ { 0 }, // tile_widths
+ { 0 }, // tile_heights
+ { 1 }, // config file
} },
};
diff --git a/av1/av1_dx_iface.c b/av1/av1_dx_iface.c
index d44e741..f113de7 100644
--- a/av1/av1_dx_iface.c
+++ b/av1/av1_dx_iface.c
@@ -118,7 +118,7 @@
priv->cfg = *ctx->config.dec;
ctx->config.dec = &priv->cfg;
// default values
- priv->cfg.cfg.ext_partition = CONFIG_EXT_PARTITION;
+ priv->cfg.cfg.ext_partition = 1;
}
#if CONFIG_FILM_GRAIN
priv->image_with_grain = NULL;
diff --git a/av1/common/av1_loopfilter.c b/av1/common/av1_loopfilter.c
index f4868fe..8aef897 100644
--- a/av1/common/av1_loopfilter.c
+++ b/av1/common/av1_loopfilter.c
@@ -965,9 +965,7 @@
void av1_setup_mask(AV1_COMMON *const cm, int mi_row, int mi_col,
MODE_INFO **mi, int mode_info_stride,
LOOP_FILTER_MASK *lfm) {
-#if CONFIG_EXT_PARTITION
assert(0 && "Not yet updated");
-#endif // CONFIG_EXT_PARTITION
int idx_32, idx_16, idx_8;
const loop_filter_info_n *const lfi_n = &cm->lf_info;
MODE_INFO **mip = mi;
@@ -1782,65 +1780,57 @@
static const uint32_t av1_prediction_masks[NUM_EDGE_DIRS][BLOCK_SIZES_ALL] = {
// mask for vertical edges filtering
{
- 4 - 1, // BLOCK_4X4
- 4 - 1, // BLOCK_4X8
- 8 - 1, // BLOCK_8X4
- 8 - 1, // BLOCK_8X8
- 8 - 1, // BLOCK_8X16
- 16 - 1, // BLOCK_16X8
- 16 - 1, // BLOCK_16X16
- 16 - 1, // BLOCK_16X32
- 32 - 1, // BLOCK_32X16
- 32 - 1, // BLOCK_32X32
- 32 - 1, // BLOCK_32X64
- 64 - 1, // BLOCK_64X32
- 64 - 1, // BLOCK_64X64
-#if CONFIG_EXT_PARTITION
+ 4 - 1, // BLOCK_4X4
+ 4 - 1, // BLOCK_4X8
+ 8 - 1, // BLOCK_8X4
+ 8 - 1, // BLOCK_8X8
+ 8 - 1, // BLOCK_8X16
+ 16 - 1, // BLOCK_16X8
+ 16 - 1, // BLOCK_16X16
+ 16 - 1, // BLOCK_16X32
+ 32 - 1, // BLOCK_32X16
+ 32 - 1, // BLOCK_32X32
+ 32 - 1, // BLOCK_32X64
+ 64 - 1, // BLOCK_64X32
+ 64 - 1, // BLOCK_64X64
64 - 1, // BLOCK_64X128
128 - 1, // BLOCK_128X64
128 - 1, // BLOCK_128X128
-#endif // CONFIG_EXT_PARTITION
4 - 1, // BLOCK_4X16,
16 - 1, // BLOCK_16X4,
8 - 1, // BLOCK_8X32,
32 - 1, // BLOCK_32X8,
16 - 1, // BLOCK_16X64,
64 - 1, // BLOCK_64X16
-#if CONFIG_EXT_PARTITION
32 - 1, // BLOCK_32X128
128 - 1, // BLOCK_128X32
-#endif // CONFIG_EXT_PARTITION
},
// mask for horizontal edges filtering
{
- 4 - 1, // BLOCK_4X4
- 8 - 1, // BLOCK_4X8
- 4 - 1, // BLOCK_8X4
- 8 - 1, // BLOCK_8X8
- 16 - 1, // BLOCK_8X16
- 8 - 1, // BLOCK_16X8
- 16 - 1, // BLOCK_16X16
- 32 - 1, // BLOCK_16X32
- 16 - 1, // BLOCK_32X16
- 32 - 1, // BLOCK_32X32
- 64 - 1, // BLOCK_32X64
- 32 - 1, // BLOCK_64X32
- 64 - 1, // BLOCK_64X64
-#if CONFIG_EXT_PARTITION
+ 4 - 1, // BLOCK_4X4
+ 8 - 1, // BLOCK_4X8
+ 4 - 1, // BLOCK_8X4
+ 8 - 1, // BLOCK_8X8
+ 16 - 1, // BLOCK_8X16
+ 8 - 1, // BLOCK_16X8
+ 16 - 1, // BLOCK_16X16
+ 32 - 1, // BLOCK_16X32
+ 16 - 1, // BLOCK_32X16
+ 32 - 1, // BLOCK_32X32
+ 64 - 1, // BLOCK_32X64
+ 32 - 1, // BLOCK_64X32
+ 64 - 1, // BLOCK_64X64
128 - 1, // BLOCK_64X128
64 - 1, // BLOCK_128X64
128 - 1, // BLOCK_128X128
-#endif // CONFIG_EXT_PARTITION
16 - 1, // BLOCK_4X16,
4 - 1, // BLOCK_16X4,
32 - 1, // BLOCK_8X32,
8 - 1, // BLOCK_32X8,
64 - 1, // BLOCK_16X64,
16 - 1, // BLOCK_64X16
-#if CONFIG_EXT_PARTITION
128 - 1, // BLOCK_32X128
32 - 1, // BLOCK_128X32
-#endif // CONFIG_EXT_PARTITION
},
};
diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index a0aff41..1331b5f 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -1027,7 +1027,6 @@
? TX_4X4
: get_max_rect_tx_size(bsize);
-#if CONFIG_EXT_PARTITION
// The decoder is designed so that it can process 64x64 luma pixels at a
// time. If this is a chroma plane with subsampling and bsize corresponds to
// a subsampled BLOCK_128X128 then the lookup above will give TX_64X64. That
@@ -1041,10 +1040,6 @@
else
max_txsize = TX_32X32;
}
-#else
- (void)subsampled;
-#endif
-
return max_txsize;
}
diff --git a/av1/common/cdef.c b/av1/common/cdef.c
index c448c91..9ff36a1 100644
--- a/av1/common/cdef.c
+++ b/av1/common/cdef.c
@@ -49,19 +49,12 @@
return is_skip;
}
-#if CONFIG_EXT_PARTITION
int sb_compute_cdef_list(const AV1_COMMON *const cm, int mi_row, int mi_col,
- cdef_list *dlist, BLOCK_SIZE bs)
-#else
-int sb_compute_cdef_list(const AV1_COMMON *const cm, int mi_row, int mi_col,
- cdef_list *dlist)
-#endif
-{
+ cdef_list *dlist, BLOCK_SIZE bs) {
MODE_INFO **grid = cm->mi_grid_visible;
int maxc = cm->mi_cols - mi_col;
int maxr = cm->mi_rows - mi_row;
-#if CONFIG_EXT_PARTITION
if (bs == BLOCK_128X128 || bs == BLOCK_128X64 || bs == BLOCK_128X32)
maxc = AOMMIN(maxc, MI_SIZE_128X128);
else
@@ -70,10 +63,6 @@
maxr = AOMMIN(maxr, MI_SIZE_128X128);
else
maxr = AOMMIN(maxr, MI_SIZE_64X64);
-#else
- maxr = AOMMIN(maxr, MI_SIZE_64X64);
- maxc = AOMMIN(maxc, MI_SIZE_64X64);
-#endif
const int r_step = mi_size_high[BLOCK_8X8];
const int c_step = mi_size_wide[BLOCK_8X8];
@@ -263,15 +252,9 @@
uv_sec_strength += uv_sec_strength == 3;
if ((level == 0 && sec_strength == 0 && uv_level == 0 &&
uv_sec_strength == 0) ||
-#if CONFIG_EXT_PARTITION
(cdef_count = sb_compute_cdef_list(cm, fbr * MI_SIZE_64X64,
fbc * MI_SIZE_64X64, dlist,
- BLOCK_64X64)) == 0)
-#else
- (cdef_count = sb_compute_cdef_list(cm, fbr * MI_SIZE_64X64,
- fbc * MI_SIZE_64X64, dlist)) == 0)
-#endif
- {
+ BLOCK_64X64)) == 0) {
cdef_left = 0;
continue;
}
diff --git a/av1/common/cdef.h b/av1/common/cdef.h
index d95b103..c739b21 100644
--- a/av1/common/cdef.h
+++ b/av1/common/cdef.h
@@ -37,13 +37,8 @@
#endif
int sb_all_skip(const AV1_COMMON *const cm, int mi_row, int mi_col);
-#if CONFIG_EXT_PARTITION
int sb_compute_cdef_list(const AV1_COMMON *const cm, int mi_row, int mi_col,
cdef_list *dlist, BLOCK_SIZE bsize);
-#else
-int sb_compute_cdef_list(const AV1_COMMON *const cm, int mi_row, int mi_col,
- cdef_list *dlist);
-#endif
void av1_cdef_frame(YV12_BUFFER_CONFIG *frame, AV1_COMMON *cm, MACROBLOCKD *xd);
void av1_cdef_search(YV12_BUFFER_CONFIG *frame, const YV12_BUFFER_CONFIG *ref,
diff --git a/av1/common/common_data.h b/av1/common/common_data.h
index dae8e2c..750ac81 100644
--- a/av1/common/common_data.h
+++ b/av1/common/common_data.h
@@ -20,11 +20,7 @@
extern "C" {
#endif
-#if CONFIG_EXT_PARTITION
#define IF_EXT_PARTITION(...) __VA_ARGS__,
-#else
-#define IF_EXT_PARTITION(...)
-#endif
// Log 2 conversion lookup tables for block width and height
static const uint8_t b_width_log2_lookup[BLOCK_SIZES_ALL] = {
@@ -209,18 +205,14 @@
BLOCK_16X32, BLOCK_32X16, BLOCK_32X32,
// 32X64, 64X32, 64X64
BLOCK_32X64, BLOCK_64X32, BLOCK_64X64,
-#if CONFIG_EXT_PARTITION
// 64x128, 128x64, 128x128
BLOCK_64X128, BLOCK_128X64, BLOCK_128X128,
-#endif // CONFIG_EXT_PARTITION
// 4X16, 16X4, 8X32
BLOCK_4X16, BLOCK_16X4, BLOCK_8X32,
// 32X8, 16X64, 64X16
BLOCK_32X8, BLOCK_16X64, BLOCK_64X16,
-#if CONFIG_EXT_PARTITION
// 32x128, 128x32
BLOCK_32X128, BLOCK_128X32
-#endif // CONFIG_EXT_PARTITION
}, { // PARTITION_HORZ
// 4X4
BLOCK_INVALID,
@@ -232,18 +224,14 @@
BLOCK_INVALID, BLOCK_INVALID, BLOCK_32X16,
// 32X64, 64X32, 64X64
BLOCK_INVALID, BLOCK_INVALID, BLOCK_64X32,
-#if CONFIG_EXT_PARTITION
// 64x128, 128x64, 128x128
BLOCK_INVALID, BLOCK_INVALID, BLOCK_128X64,
-#endif // CONFIG_EXT_PARTITION
// 4X16, 16X4, 8X32
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 32X8, 16X64, 64X16
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
-#if CONFIG_EXT_PARTITION
// 32x128, 128x32
BLOCK_INVALID, BLOCK_INVALID
-#endif // CONFIG_EXT_PARTITION
}, { // PARTITION_VERT
// 4X4
BLOCK_INVALID,
@@ -255,18 +243,14 @@
BLOCK_INVALID, BLOCK_INVALID, BLOCK_16X32,
// 32X64, 64X32, 64X64
BLOCK_INVALID, BLOCK_INVALID, BLOCK_32X64,
-#if CONFIG_EXT_PARTITION
// 64x128, 128x64, 128x128
BLOCK_INVALID, BLOCK_INVALID, BLOCK_64X128,
-#endif // CONFIG_EXT_PARTITION
// 4X16, 16X4, 8X32
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 32X8, 16X64, 64X16
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
-#if CONFIG_EXT_PARTITION
// 32x128, 128x32
BLOCK_INVALID, BLOCK_INVALID
-#endif // CONFIG_EXT_PARTITION
}, { // PARTITION_SPLIT
// 4X4
BLOCK_INVALID,
@@ -278,18 +262,14 @@
BLOCK_INVALID, BLOCK_INVALID, BLOCK_16X16,
// 32X64, 64X32, 64X64
BLOCK_INVALID, BLOCK_INVALID, BLOCK_32X32,
-#if CONFIG_EXT_PARTITION
// 64x128, 128x64, 128x128
BLOCK_INVALID, BLOCK_INVALID, BLOCK_64X64,
-#endif // CONFIG_EXT_PARTITION
// 4X16, 16X4, 8X32
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 32X8, 16X64, 64X16
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
-#if CONFIG_EXT_PARTITION
// 32x128, 128x32
BLOCK_INVALID, BLOCK_INVALID
-#endif // CONFIG_EXT_PARTITION
#if CONFIG_EXT_PARTITION_TYPES
}, { // PARTITION_HORZ_A
// 4X4
@@ -302,18 +282,14 @@
BLOCK_INVALID, BLOCK_INVALID, BLOCK_32X16,
// 32X64, 64X32, 64X64
BLOCK_INVALID, BLOCK_INVALID, BLOCK_64X32,
-#if CONFIG_EXT_PARTITION
// 64x128, 128x64, 128x128
BLOCK_INVALID, BLOCK_INVALID, BLOCK_128X64,
-#endif // CONFIG_EXT_PARTITION
// 4X16, 16X4, 8X32
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 32X8, 16X64, 64X16
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
-#if CONFIG_EXT_PARTITION
// 32x128, 128x32
BLOCK_INVALID, BLOCK_INVALID
-#endif // CONFIG_EXT_PARTITION
}, { // PARTITION_HORZ_B
// 4X4
BLOCK_INVALID,
@@ -325,18 +301,14 @@
BLOCK_INVALID, BLOCK_INVALID, BLOCK_32X16,
// 32X64, 64X32, 64X64
BLOCK_INVALID, BLOCK_INVALID, BLOCK_64X32,
-#if CONFIG_EXT_PARTITION
// 64x128, 128x64, 128x128
BLOCK_INVALID, BLOCK_INVALID, BLOCK_128X64,
-#endif // CONFIG_EXT_PARTITION
// 4X16, 16X4, 8X32
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 32X8, 16X64, 64X16
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
-#if CONFIG_EXT_PARTITION
// 32x128, 128x32
BLOCK_INVALID, BLOCK_INVALID
-#endif // CONFIG_EXT_PARTITION
}, { // PARTITION_VERT_A
// 4X4
BLOCK_INVALID,
@@ -348,18 +320,14 @@
BLOCK_INVALID, BLOCK_INVALID, BLOCK_16X32,
// 32X64, 64X32, 64X64
BLOCK_INVALID, BLOCK_INVALID, BLOCK_32X64,
-#if CONFIG_EXT_PARTITION
// 64x128, 128x64, 128x128
BLOCK_INVALID, BLOCK_INVALID, BLOCK_64X128,
-#endif // CONFIG_EXT_PARTITION
// 4X16, 16X4, 8X32
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 32X8, 16X64, 64X16
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
-#if CONFIG_EXT_PARTITION
// 32x128, 128x32
BLOCK_INVALID, BLOCK_INVALID
-#endif // CONFIG_EXT_PARTITION
}, { // PARTITION_VERT_B
// 4X4
BLOCK_INVALID,
@@ -371,18 +339,14 @@
BLOCK_INVALID, BLOCK_INVALID, BLOCK_16X32,
// 32X64, 64X32, 64X64
BLOCK_INVALID, BLOCK_INVALID, BLOCK_32X64,
-#if CONFIG_EXT_PARTITION
// 64x128, 128x64, 128x128
BLOCK_INVALID, BLOCK_INVALID, BLOCK_64X128,
-#endif // CONFIG_EXT_PARTITION
// 4X16, 16X4, 8X32
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 32X8, 16X64, 64X16
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
-#if CONFIG_EXT_PARTITION
// 32x128, 128x32
BLOCK_INVALID, BLOCK_INVALID
-#endif // CONFIG_EXT_PARTITION
}, { // PARTITION_HORZ_4
// 4X4
BLOCK_INVALID,
@@ -394,18 +358,14 @@
BLOCK_INVALID, BLOCK_INVALID, BLOCK_32X8,
// 32X64, 64X32, 64X64
BLOCK_INVALID, BLOCK_INVALID, BLOCK_64X16,
-#if CONFIG_EXT_PARTITION
// 64x128, 128x64, 128x128
BLOCK_INVALID, BLOCK_INVALID, BLOCK_128X32,
-#endif // CONFIG_EXT_PARTITION
// 4X16, 16X4, 8X32
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 32X8, 16X64, 64X16
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
-#if CONFIG_EXT_PARTITION
// 32x128, 128x32
BLOCK_INVALID, BLOCK_INVALID
-#endif // CONFIG_EXT_PARTITION
}, { // PARTITION_VERT_4
// 4X4
BLOCK_INVALID,
@@ -417,18 +377,14 @@
BLOCK_INVALID, BLOCK_INVALID, BLOCK_8X32,
// 32X64, 64X32, 64X64
BLOCK_INVALID, BLOCK_INVALID, BLOCK_16X64,
-#if CONFIG_EXT_PARTITION
// 64x128, 128x64, 128x128
BLOCK_INVALID, BLOCK_INVALID, BLOCK_32X128,
-#endif // CONFIG_EXT_PARTITION
// 4X16, 16X4, 8X32
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 32X8, 16X64, 64X16
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
-#if CONFIG_EXT_PARTITION
// 32x128, 128x32
BLOCK_INVALID, BLOCK_INVALID
-#endif // CONFIG_EXT_PARTITION
#endif // CONFIG_EXT_PARTITION_TYPES
}
};
@@ -446,18 +402,14 @@
TX_32X32, TX_32X32,
// 64X64
TX_64X64,
-#if CONFIG_EXT_PARTITION
// 64x128, 128x64, 128x128
TX_64X64, TX_64X64, TX_64X64,
-#endif // CONFIG_EXT_PARTITION
// 4x16, 16x4, 8x32
TX_4X4, TX_4X4, TX_8X8,
// 32x8, 16x64 64x16
TX_8X8, TX_16X16, TX_16X16,
-#if CONFIG_EXT_PARTITION
// 32x128 128x32
TX_32X32, TX_32X32
-#endif // CONFIG_EXT_PARTITION
};
static const TX_SIZE max_txsize_rect_lookup[BLOCK_SIZES_ALL] = {
@@ -473,10 +425,8 @@
TX_32X64, TX_64X32,
// 64X64
TX_64X64,
-#if CONFIG_EXT_PARTITION
// 64x128, 128x64, 128x128
TX_64X64, TX_64X64, TX_64X64,
-#endif // CONFIG_EXT_PARTITION
#if CONFIG_EXT_PARTITION_TYPES
// 4x16, 16x4,
TX_4X16, TX_16X4,
@@ -492,10 +442,8 @@
// 16x64, 64x16
TX_16X32, TX_32X16,
#endif // CONFIG_EXT_PARTITION_TYPES
-#if CONFIG_EXT_PARTITION
// 32x128 128x32
TX_32X64, TX_64X32
-#endif // CONFIG_EXT_PARTITION
};
static const TX_TYPE_1D vtx_tab[TX_TYPES] = {
@@ -777,21 +725,17 @@
{ { BLOCK_32X64, BLOCK_32X32 }, { BLOCK_16X64, BLOCK_16X32 } },
{ { BLOCK_64X32, BLOCK_64X16 }, { BLOCK_32X32, BLOCK_32X16 } },
{ { BLOCK_64X64, BLOCK_64X32 }, { BLOCK_32X64, BLOCK_32X32 } },
-#if CONFIG_EXT_PARTITION
{ { BLOCK_64X128, BLOCK_64X64 }, { BLOCK_32X128, BLOCK_32X64 } },
{ { BLOCK_128X64, BLOCK_128X32 }, { BLOCK_64X64, BLOCK_64X32 } },
{ { BLOCK_128X128, BLOCK_128X64 }, { BLOCK_64X128, BLOCK_64X64 } },
-#endif // CONFIG_EXT_PARTITION
{ { BLOCK_4X16, BLOCK_4X8 }, { BLOCK_4X16, BLOCK_4X8 } },
{ { BLOCK_16X4, BLOCK_16X4 }, { BLOCK_8X4, BLOCK_8X4 } },
{ { BLOCK_8X32, BLOCK_8X16 }, { BLOCK_INVALID, BLOCK_4X16 } },
{ { BLOCK_32X8, BLOCK_INVALID }, { BLOCK_16X8, BLOCK_16X4 } },
{ { BLOCK_16X64, BLOCK_16X32 }, { BLOCK_INVALID, BLOCK_8X32 } },
{ { BLOCK_64X16, BLOCK_INVALID }, { BLOCK_32X16, BLOCK_32X8 } },
-#if CONFIG_EXT_PARTITION
{ { BLOCK_32X128, BLOCK_32X64 }, { BLOCK_INVALID, BLOCK_16X64 } },
{ { BLOCK_128X32, BLOCK_INVALID }, { BLOCK_64X32, BLOCK_64X16 } },
-#endif // CONFIG_EXT_PARTITION
};
// Generates 5 bit field in which each bit set to 1 represents
@@ -802,7 +746,6 @@
PARTITION_CONTEXT above;
PARTITION_CONTEXT left;
} partition_context_lookup[BLOCK_SIZES_ALL] = {
-#if CONFIG_EXT_PARTITION
{ 31, 31 }, // 4X4 - {0b11111, 0b11111}
{ 31, 30 }, // 4X8 - {0b11111, 0b11110}
{ 30, 31 }, // 8X4 - {0b11110, 0b11111}
@@ -827,27 +770,6 @@
{ 16, 28 }, // 64X16 - {0b10000, 0b11100}
{ 24, 0 }, // 32X128- {0b11000, 0b00000}
{ 0, 24 }, // 128X32- {0b00000, 0b11000}
-#else
- { 15, 15 }, // 4X4 - {0b1111, 0b1111}
- { 15, 14 }, // 4X8 - {0b1111, 0b1110}
- { 14, 15 }, // 8X4 - {0b1110, 0b1111}
- { 14, 14 }, // 8X8 - {0b1110, 0b1110}
- { 14, 12 }, // 8X16 - {0b1110, 0b1100}
- { 12, 14 }, // 16X8 - {0b1100, 0b1110}
- { 12, 12 }, // 16X16 - {0b1100, 0b1100}
- { 12, 8 }, // 16X32 - {0b1100, 0b1000}
- { 8, 12 }, // 32X16 - {0b1000, 0b1100}
- { 8, 8 }, // 32X32 - {0b1000, 0b1000}
- { 8, 0 }, // 32X64 - {0b1000, 0b0000}
- { 0, 8 }, // 64X32 - {0b0000, 0b1000}
- { 0, 0 }, // 64X64 - {0b0000, 0b0000}
- { 15, 12 }, // 4X16 - {0b1111, 0b1100}
- { 12, 15 }, // 16X4 - {0b1100, 0b1111}
- { 14, 8 }, // 8X32 - {0b1110, 0b1000}
- { 8, 14 }, // 32X8 - {0b1000, 0b1110}
- { 12, 0 }, // 16X64- {0b1100, 0b0000}
- { 0, 12 }, // 64X16- {0b0000, 0b1100}
-#endif // CONFIG_EXT_PARTITION
};
/* clang-format on */
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 1d1812a..37914e9 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -76,17 +76,11 @@
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- { AOM_CDF2(16384) },
-#if CONFIG_EXT_PARTITION
- { AOM_CDF2(16384) }, // 255, 1
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_EXT_PARTITION
+ { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, // 255, 1
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, // 208, 1
- { AOM_CDF2(16384) },
-#if CONFIG_EXT_PARTITION
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif
+ { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
+ { AOM_CDF2(16384) }, // 208, 1
+ { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
};
#else
static const aom_cdf_prob
@@ -97,18 +91,13 @@
{ AOM_CDF3(9088, 10753) }, { AOM_CDF3(10368, 12906) },
{ AOM_CDF3(10368, 12643) }, { AOM_CDF3(8832, 10609) },
{ AOM_CDF3(13312, 13388) }, { AOM_CDF3(12672, 12751) },
- { AOM_CDF3(9600, 9691) },
-#if CONFIG_EXT_PARTITION
- { AOM_CDF3(32640, 32641) }, // 255, 1
+ { AOM_CDF3(9600, 9691) }, { AOM_CDF3(32640, 32641) }, // 255, 1
{ AOM_CDF3(32640, 32641) }, { AOM_CDF3(32640, 32641) },
-#endif // CONFIG_EXT_PARTITION
{ AOM_CDF3(16384, 24576) }, { AOM_CDF3(16384, 24576) },
{ AOM_CDF3(16384, 24576) }, { AOM_CDF3(16384, 24576) },
{ AOM_CDF3(26624, 26648) }, // 208, 1
- { AOM_CDF3(26624, 26648) },
-#if CONFIG_EXT_PARTITION
{ AOM_CDF3(26624, 26648) }, { AOM_CDF3(26624, 26648) },
-#endif
+ { AOM_CDF3(26624, 26648) },
};
#endif // CONFIG_JNT_COMP
@@ -131,15 +120,10 @@
{ AOM_CDF2(194 * 128) }, { AOM_CDF2(213 * 128) }, { AOM_CDF2(217 * 128) },
{ AOM_CDF2(222 * 128) }, { AOM_CDF2(224 * 128) }, { AOM_CDF2(226 * 128) },
{ AOM_CDF2(220 * 128) }, { AOM_CDF2(128 * 128) }, { AOM_CDF2(128 * 128) },
- { AOM_CDF2(128 * 128) },
-#if CONFIG_EXT_PARTITION
+ { AOM_CDF2(128 * 128) }, { AOM_CDF2(255 * 128) }, { AOM_CDF2(255 * 128) },
+ { AOM_CDF2(255 * 128) }, { AOM_CDF2(208 * 128) }, { AOM_CDF2(208 * 128) },
+ { AOM_CDF2(208 * 128) }, { AOM_CDF2(208 * 128) }, { AOM_CDF2(255 * 128) },
{ AOM_CDF2(255 * 128) }, { AOM_CDF2(255 * 128) }, { AOM_CDF2(255 * 128) },
-#endif // CONFIG_EXT_PARTITION
- { AOM_CDF2(208 * 128) }, { AOM_CDF2(208 * 128) }, { AOM_CDF2(208 * 128) },
- { AOM_CDF2(208 * 128) }, { AOM_CDF2(255 * 128) }, { AOM_CDF2(255 * 128) },
-#if CONFIG_EXT_PARTITION
- { AOM_CDF2(255 * 128) }, { AOM_CDF2(255 * 128) },
-#endif // CONFIG_EXT_PARTITION
};
static const aom_cdf_prob
@@ -150,17 +134,12 @@
{ AOM_CDF3(15104, 21590) }, { AOM_CDF3(9855, 21043) },
{ AOM_CDF3(12800, 22238) }, { AOM_CDF3(24320, 26498) },
{ AOM_CDF3(26496, 28995) }, { AOM_CDF3(25216, 28166) },
- { AOM_CDF3(30592, 31238) },
-#if CONFIG_EXT_PARTITION
+ { AOM_CDF3(30592, 31238) }, { AOM_CDF3(32256, 32656) },
{ AOM_CDF3(32256, 32656) }, { AOM_CDF3(32256, 32656) },
- { AOM_CDF3(32256, 32656) },
-#endif
{ AOM_CDF3(32640, 32740) }, { AOM_CDF3(32640, 32740) },
{ AOM_CDF3(32640, 32740) }, { AOM_CDF3(32640, 32740) },
{ AOM_CDF3(32640, 32740) }, { AOM_CDF3(32640, 32740) },
-#if CONFIG_EXT_PARTITION
{ AOM_CDF3(32256, 32656) }, { AOM_CDF3(32256, 32656) },
-#endif
};
static const aom_cdf_prob default_obmc_cdf[BLOCK_SIZES_ALL][CDF_SIZE(2)] = {
@@ -168,15 +147,10 @@
{ AOM_CDF2(45 * 128) }, { AOM_CDF2(79 * 128) }, { AOM_CDF2(75 * 128) },
{ AOM_CDF2(130 * 128) }, { AOM_CDF2(141 * 128) }, { AOM_CDF2(144 * 128) },
{ AOM_CDF2(208 * 128) }, { AOM_CDF2(201 * 128) }, { AOM_CDF2(186 * 128) },
- { AOM_CDF2(231 * 128) },
-#if CONFIG_EXT_PARTITION
- { AOM_CDF2(252 * 128) }, { AOM_CDF2(252 * 128) }, { AOM_CDF2(252 * 128) },
-#endif // CONFIG_EXT_PARTITION
+ { AOM_CDF2(231 * 128) }, { AOM_CDF2(252 * 128) }, { AOM_CDF2(252 * 128) },
+ { AOM_CDF2(252 * 128) }, { AOM_CDF2(208 * 128) }, { AOM_CDF2(208 * 128) },
{ AOM_CDF2(208 * 128) }, { AOM_CDF2(208 * 128) }, { AOM_CDF2(208 * 128) },
- { AOM_CDF2(208 * 128) }, { AOM_CDF2(208 * 128) }, { AOM_CDF2(208 * 128) },
-#if CONFIG_EXT_PARTITION
- { AOM_CDF2(252 * 128) }, { AOM_CDF2(252 * 128) },
-#endif // CONFIG_EXT_PARTITION
+ { AOM_CDF2(208 * 128) }, { AOM_CDF2(252 * 128) }, { AOM_CDF2(252 * 128) },
};
static const aom_cdf_prob default_delta_q_cdf[CDF_SIZE(DELTA_Q_PROBS + 1)] = {
@@ -782,7 +756,6 @@
{ AOM_CDF10(9216, 9952, 11849, 30134, 30379, 30624, 31256, 31888, 32134) },
{ AOM_CDF10(7424, 9008, 9528, 30664, 31192, 31720, 31893, 32066, 32594) },
{ AOM_CDF10(1280, 1710, 2069, 31978, 32121, 32264, 32383, 32502, 32647) },
-#if CONFIG_EXT_PARTITION
#if ALLOW_128X32_BLOCKS
{ AOM_CDF10(28416, 28705, 28926, 32258, 32354, 32450, 32523, 32596, 32693) },
{ AOM_CDF10(9216, 9952, 11849, 30134, 30379, 30624, 31256, 31888, 32134) },
@@ -795,7 +768,6 @@
{ AOM_CDF8(7424, 9008, 9528, 30664, 31456, 32248, 32249) },
{ AOM_CDF8(1280, 1710, 2069, 31978, 32193, 32409, 32410) },
#endif // ALLOW_128X32_BLOCKS
-#endif // CONFIG_EXT_PARTITION
};
#else
static const aom_cdf_prob
@@ -808,10 +780,8 @@
{ 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) },
-#if CONFIG_EXT_PARTITION
{ AOM_CDF4(28416, 28994, 29436) }, { AOM_CDF4(9216, 10688, 14483) },
{ AOM_CDF4(7424, 10592, 11632) }, { AOM_CDF4(1280, 2141, 2859) },
-#endif
};
#endif
diff --git a/av1/common/enums.h b/av1/common/enums.h
index daa5e64..393e829 100644
--- a/av1/common/enums.h
+++ b/av1/common/enums.h
@@ -23,11 +23,7 @@
#undef MAX_SB_SIZE
// Max superblock size
-#if CONFIG_EXT_PARTITION
#define MAX_SB_SIZE_LOG2 7
-#else
-#define MAX_SB_SIZE_LOG2 6
-#endif // CONFIG_EXT_PARTITION
#define MAX_SB_SIZE (1 << MAX_SB_SIZE_LOG2)
#define MAX_SB_SQUARE (MAX_SB_SIZE * MAX_SB_SIZE)
@@ -65,9 +61,7 @@
#define MAX_VARTX_DEPTH 2
#define MI_SIZE_64X64 (64 >> MI_SIZE_LOG2)
-#if CONFIG_EXT_PARTITION
#define MI_SIZE_128X128 (128 >> MI_SIZE_LOG2)
-#endif
#define MAX_PALETTE_SQUARE (64 * 64)
// Maximum number of colors in a palette.
@@ -131,21 +125,17 @@
BLOCK_32X64,
BLOCK_64X32,
BLOCK_64X64,
-#if CONFIG_EXT_PARTITION
BLOCK_64X128,
BLOCK_128X64,
BLOCK_128X128,
-#endif // CONFIG_EXT_PARTITION
BLOCK_4X16,
BLOCK_16X4,
BLOCK_8X32,
BLOCK_32X8,
BLOCK_16X64,
BLOCK_64X16,
-#if CONFIG_EXT_PARTITION
BLOCK_32X128,
BLOCK_128X32,
-#endif // CONFIG_EXT_PARTITION
BLOCK_SIZES_ALL,
BLOCK_SIZES = BLOCK_4X16,
BLOCK_INVALID = 255,
@@ -172,7 +162,7 @@
typedef char PARTITION_CONTEXT;
#define PARTITION_PLOFFSET 4 // number of probability models per block size
-#define PARTITION_BLOCK_SIZES (4 + CONFIG_EXT_PARTITION)
+#define PARTITION_BLOCK_SIZES 5
#define PARTITION_CONTEXTS_PRIMARY (PARTITION_BLOCK_SIZES * PARTITION_PLOFFSET)
#define PARTITION_CONTEXTS PARTITION_CONTEXTS_PRIMARY
@@ -569,11 +559,7 @@
#define MAX_MV_REF_CANDIDATES 2
#define MAX_REF_MV_STACK_SIZE 8
-#if CONFIG_EXT_PARTITION
#define REF_CAT_LEVEL 640
-#else
-#define REF_CAT_LEVEL 255
-#endif // CONFIG_EXT_PARTITION
#define INTRA_INTER_CONTEXTS 4
#define COMP_INTER_CONTEXTS 5
diff --git a/av1/common/mvref_common.h b/av1/common/mvref_common.h
index 6efcbb6..fa6a93a 100644
--- a/av1/common/mvref_common.h
+++ b/av1/common/mvref_common.h
@@ -111,11 +111,7 @@
};
// clamp_mv_ref
-#if CONFIG_EXT_PARTITION
#define MV_BORDER (16 << 3) // Allow 16 pels in 1/8th pel units
-#else
-#define MV_BORDER (8 << 3) // Allow 8 pels in 1/8th pel units
-#endif // CONFIG_EXT_PARTITION
// Get the number of frames between the current frame and a reference frame
static INLINE int get_ref_frame_dist(const AV1_COMMON *cm,
diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index 3873b31..158af24 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -555,11 +555,7 @@
int cdef_strengths[CDEF_MAX_STRENGTHS];
int cdef_uv_strengths[CDEF_MAX_STRENGTHS];
int cdef_bits;
-#if CONFIG_EXT_PARTITION
int cdef_preset[4];
-#else
- int cdef_preset;
-#endif
int delta_q_present_flag;
// Resolution of delta quant
@@ -1016,9 +1012,9 @@
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);
-#if CONFIG_EXT_PARTITION && !ALLOW_128X32_BLOCKS
+#if !ALLOW_128X32_BLOCKS
if (bsize != BLOCK_128X128)
-#endif // CONFIG_EXT_PARTITION && !ALLOW_128X32_BLOCKS
+#endif // !ALLOW_128X32_BLOCKS
out[0] -= cdf_element_prob(in, PARTITION_HORZ_4);
#endif // CONFIG_EXT_PARTITION_TYPES
out[0] = AOM_ICDF(out[0]);
@@ -1036,9 +1032,9 @@
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);
-#if CONFIG_EXT_PARTITION && !ALLOW_128X32_BLOCKS
+#if !ALLOW_128X32_BLOCKS
if (bsize != BLOCK_128X128)
-#endif // CONFIG_EXT_PARTITION && !ALLOW_128X32_BLOCKS
+#endif // !ALLOW_128X32_BLOCKS
out[0] -= cdf_element_prob(in, PARTITION_VERT_4);
#endif // CONFIG_EXT_PARTITION_TYPES
out[0] = AOM_ICDF(out[0]);
@@ -1106,10 +1102,10 @@
static INLINE int partition_cdf_length(BLOCK_SIZE bsize) {
#if CONFIG_EXT_PARTITION_TYPES
if (bsize <= BLOCK_8X8) return PARTITION_TYPES;
-#if CONFIG_EXT_PARTITION && !ALLOW_128X32_BLOCKS
+#if !ALLOW_128X32_BLOCKS
else if (bsize == BLOCK_128X128)
return EXT_PARTITION_TYPES - 2;
-#endif // CONFIG_EXT_PARTITION && !ALLOW_128X32_BLOCKS
+#endif // !ALLOW_128X32_BLOCKS
else
return EXT_PARTITION_TYPES;
#else
@@ -1241,9 +1237,7 @@
static INLINE TX_SIZE get_sqr_tx_size(int tx_dim) {
switch (tx_dim) {
-#if CONFIG_EXT_PARTITION
case 128:
-#endif // CONFIG_EXT_PARTITION
case 64: return TX_64X64; break;
case 32: return TX_32X32; break;
case 16: return TX_16X16; break;
diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index fb6b571..53dbac2 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -258,11 +258,9 @@
{ 0, NULL, NULL, 0, NULL },
{ 0, NULL, NULL, 0, NULL },
{ 0, NULL, NULL, 0, NULL },
-#if CONFIG_EXT_PARTITION
{ 0, NULL, NULL, 0, NULL },
{ 0, NULL, NULL, 0, NULL },
{ 0, NULL, NULL, 0, NULL },
-#endif // CONFIG_EXT_PARTITION
{ 0, wedge_codebook_16_hgtw, wedge_signflip_lookup[BLOCK_4X16], 0,
wedge_masks[BLOCK_4X16] },
{ 0, wedge_codebook_16_hltw, wedge_signflip_lookup[BLOCK_16X4], 0,
@@ -273,10 +271,8 @@
wedge_masks[BLOCK_32X8] },
{ 0, NULL, NULL, 0, NULL },
{ 0, NULL, NULL, 0, NULL },
-#if CONFIG_EXT_PARTITION
{ 0, NULL, NULL, 0, NULL },
{ 0, NULL, NULL, 0, NULL },
-#endif // CONFIG_EXT_PARTITION
};
static const uint8_t *get_wedge_mask_inplace(int wedge_index, int neg,
@@ -1357,14 +1353,12 @@
56, 57, 58, 59, 60, 60, 61, 62,
64, 64, 64, 64, 64, 64, 64, 64 };
-#if CONFIG_EXT_PARTITION
static const uint8_t obmc_mask_64[64] = {
33, 34, 35, 35, 36, 37, 38, 39, 40, 40, 41, 42, 43, 44, 44, 44,
45, 46, 47, 47, 48, 49, 50, 51, 51, 51, 52, 52, 53, 54, 55, 56,
56, 56, 57, 57, 58, 58, 59, 60, 60, 60, 60, 60, 61, 62, 62, 62,
62, 62, 63, 63, 63, 63, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
};
-#endif // CONFIG_EXT_PARTITION
const uint8_t *av1_get_obmc_mask(int length) {
switch (length) {
@@ -1374,9 +1368,7 @@
case 8: return obmc_mask_8;
case 16: return obmc_mask_16;
case 32: return obmc_mask_32;
-#if CONFIG_EXT_PARTITION
case 64: return obmc_mask_64;
-#endif // CONFIG_EXT_PARTITION
default: assert(0); return NULL;
}
}
@@ -1394,9 +1386,7 @@
case 8: mask1d = obmc_mask_8; break;
case 16: mask1d = obmc_mask_16; break;
case 32: mask1d = obmc_mask_32; break;
-#if CONFIG_EXT_PARTITION
case 64: mask1d = obmc_mask_64; break;
-#endif // CONFIG_EXT_PARTITION
default: assert(0); return;
}
@@ -2163,7 +2153,6 @@
#endif
/* clang-format off */
-#if CONFIG_EXT_PARTITION
static const uint8_t ii_weights1d[MAX_SB_SIZE] = {
60, 58, 56, 54, 52, 50, 48, 47, 45, 44, 42, 41, 39, 38, 37, 35, 34, 33, 32,
31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 22, 21, 20, 19, 19, 18, 18, 17, 16,
@@ -2178,20 +2167,7 @@
4, 4, 2, 2, 2, 1, 1, 1,
16, 16, 8, 8, 4, 4, 2, 2
};
-#else
-static const uint8_t ii_weights1d[MAX_SB_SIZE] = {
- 60, 56, 52, 48, 45, 42, 39, 37, 34, 32, 30, 28, 26, 24, 22, 21,
- 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 10, 9, 8, 8, 7, 7,
- 6, 6, 6, 5, 5, 4, 4, 4, 4, 3, 3, 3, 3, 3, 2, 2,
- 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
-};
-static uint8_t ii_size_scales[BLOCK_SIZES_ALL] = {
- 16, 8, 8, 8, 4, 4, 4,
- 2, 2, 2, 1, 1, 1,
- 8, 8, 4, 4, 2, 2,
-};
/* clang-format on */
-#endif // CONFIG_EXT_PARTITION
static void build_smooth_interintra_mask(uint8_t *mask, int stride,
BLOCK_SIZE plane_bsize,
diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c
index 5deea2f..6c8100b 100644
--- a/av1/common/reconintra.c
+++ b/av1/common/reconintra.c
@@ -130,7 +130,6 @@
uint8_t has_tr_32x128[1] = { 15 };
uint8_t has_tr_128x32[1] = { 1 };
-#if CONFIG_EXT_PARTITION
static const uint8_t *const has_tr_tables[BLOCK_SIZES_ALL] = {
// 4X4
has_tr_4x4,
@@ -155,29 +154,6 @@
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
#endif
};
-#else
-static const uint8_t *const has_tr_tables[BLOCK_SIZES_ALL] = {
- // 4X4
- has_tr_8x8,
- // 4X8, 8X4, 8X8
- has_tr_8x16, has_tr_16x8, has_tr_16x16,
- // 8X16, 16X8, 16X16
- has_tr_16x32, has_tr_32x16, has_tr_32x32,
- // 16X32, 32X16, 32X32
- has_tr_32x64, has_tr_64x32, has_tr_64x64,
- // 32X64, 64X32, 64X64
- has_tr_64x128, has_tr_128x64, has_tr_128x128,
-
-#if CONFIG_EXT_PARTITION_TYPES
- // 4x16, 16x4, 8x32
- has_tr_8x32, has_tr_32x8, has_tr_16x64,
- // 32x8, 16x64, 64x16
- has_tr_64x16, has_tr_32x128, has_tr_128x32
-#else
- NULL, NULL, NULL, NULL, NULL, NULL
-#endif
-};
-#endif // CONFIG_EXT_PARTITION
#if CONFIG_EXT_PARTITION_TYPES
uint8_t has_tr_vert_8x8[32] = {
@@ -199,7 +175,6 @@
//
// There are tables for each of the square sizes. Vertical rectangles (like
// BLOCK_16X32) use their respective "non-vert" table
-#if CONFIG_EXT_PARTITION
static const uint8_t *const has_tr_vert_tables[BLOCK_SIZES] = {
// 4X4
NULL,
@@ -214,20 +189,6 @@
// 64x128, 128x64, 128x128
has_tr_64x128, NULL, has_tr_128x128
};
-#else
-static const uint8_t *const has_tr_vert_tables[BLOCK_SIZES] = {
- // 4X4
- NULL,
- // 4X8, 8X4, 8X8
- has_tr_8x16, NULL, has_tr_vert_16x16,
- // 8X16, 16X8, 16X16
- has_tr_16x32, NULL, has_tr_vert_32x32,
- // 16X32, 32X16, 32X32
- has_tr_32x64, NULL, has_tr_vert_64x64,
- // 32X64, 64X32, 64X64
- has_tr_64x128, NULL, has_tr_128x128
-};
-#endif
#endif // CONFIG_EXT_PARTITION_TYPES
static const uint8_t *get_has_tr_table(PARTITION_TYPE partition,
@@ -260,7 +221,6 @@
const int top_right_count_unit = tx_size_wide_unit[txsz];
if (row_off > 0) { // Just need to check if enough pixels on the right.
-#if CONFIG_EXT_PARTITION
if (block_size_wide[bsize] > block_size_wide[BLOCK_64X64]) {
// Special case: For 128x128 blocks, the transform unit whose
// top-right corner is at the center of the block does in fact have
@@ -273,9 +233,6 @@
const int col_off_64 = col_off % plane_bw_unit_64;
return col_off_64 + top_right_count_unit < plane_bw_unit_64;
}
-#else
- (void)ss_y;
-#endif
return col_off + top_right_count_unit < plane_bw_unit;
} else {
// All top-right pixels are in the block above, which is already available.
@@ -373,7 +330,6 @@
uint8_t has_bl_32x128[1] = { 0 };
uint8_t has_bl_128x32[1] = { 0 };
-#if CONFIG_EXT_PARTITION
static const uint8_t *const has_bl_tables[BLOCK_SIZES_ALL] = {
// 4X4
has_bl_4x4,
@@ -398,29 +354,6 @@
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
#endif
};
-#else
-static const uint8_t *const has_bl_tables[BLOCK_SIZES_ALL] = {
- // 4X4
- has_bl_8x8,
- // 4X8, 8X4, 8X8
- has_bl_8x16, has_bl_16x8, has_bl_16x16,
- // 8X16, 16X8, 16X16
- has_bl_16x32, has_bl_32x16, has_bl_32x32,
- // 16X32, 32X16, 32X32
- has_bl_32x64, has_bl_64x32, has_bl_64x64,
- // 32X64, 64X32, 64X64
- has_bl_64x128, has_bl_128x64, has_bl_128x128,
-
-#if CONFIG_EXT_PARTITION_TYPES
- // 4x16, 16x4, 8x32
- has_bl_8x32, has_bl_32x8, has_bl_16x64,
- // 32x8, 16x64, 64x16
- has_bl_64x16, has_bl_32x128, has_bl_128x32
-#else
- NULL, NULL, NULL, NULL, NULL, NULL
-#endif
-};
-#endif // CONFIG_EXT_PARTITION
#if CONFIG_EXT_PARTITION_TYPES
uint8_t has_bl_vert_8x8[32] = {
@@ -442,7 +375,6 @@
//
// There are tables for each of the square sizes. Vertical rectangles (like
// BLOCK_16X32) use their respective "non-vert" table
-#if CONFIG_EXT_PARTITION
static const uint8_t *const has_bl_vert_tables[BLOCK_SIZES] = {
// 4X4
NULL,
@@ -457,20 +389,6 @@
// 64x128, 128x64, 128x128
has_bl_64x128, NULL, has_bl_128x128
};
-#else
-static const uint8_t *const has_bl_vert_tables[BLOCK_SIZES] = {
- // 4X4
- NULL,
- // 4X8, 8X4, 8X8
- has_bl_8x16, NULL, has_bl_vert_16x16,
- // 8X16, 16X8, 16X16
- has_bl_16x32, NULL, has_bl_vert_32x32,
- // 16X32, 32X16, 32X32
- has_bl_32x64, NULL, has_bl_vert_64x64,
- // 32X64, 64X32, 64X64
- has_bl_64x128, NULL, has_bl_128x128
-};
-#endif
#endif // CONFIG_EXT_PARTITION_TYPES
static const uint8_t *get_has_bl_table(PARTITION_TYPE partition,
@@ -498,7 +416,6 @@
int col_off, int ss_x, int ss_y) {
if (!bottom_available || !left_available) return 0;
-#if CONFIG_EXT_PARTITION
// Special case for 128x* blocks, when col_off is half the block width.
// This is needed because 128x* superblocks are divided into 64x* blocks in
// raster order
@@ -516,9 +433,6 @@
return row_off_64 + tx_size_high_unit[txsz] < plane_bh_unit;
}
}
-#else
- (void)ss_x;
-#endif // CONFIG_EXT_PARTITION
if (col_off > 0) {
// Bottom-left pixels are in the bottom-left block, which is not available.
diff --git a/av1/common/thread_common.c b/av1/common/thread_common.c
index 9daf11f..27eeb5d 100644
--- a/av1/common/thread_common.c
+++ b/av1/common/thread_common.c
@@ -230,12 +230,10 @@
struct macroblockd_plane *planes, int start,
int stop, int y_only, AVxWorker *workers,
int nworkers, AV1LfSync *lf_sync) {
-#if CONFIG_EXT_PARTITION
printf(
"STOPPING: This code has not been modified to work with the "
"extended coding unit size experiment");
exit(EXIT_FAILURE);
-#endif // CONFIG_EXT_PARTITION
const AVxWorkerInterface *const winterface = aom_get_worker_interface();
// Number of superblock rows and cols
diff --git a/av1/common/tile_common.c b/av1/common/tile_common.c
index 9868bcc..75ee555 100644
--- a/av1/common/tile_common.c
+++ b/av1/common/tile_common.c
@@ -168,13 +168,8 @@
tile->mi_col_end = AOMMIN(tile->mi_col_start + cm->tile_width, cm->mi_cols);
}
-#if CONFIG_EXT_PARTITION
#define MIN_TILE_WIDTH_MAX_SB 2
#define MAX_TILE_WIDTH_MAX_SB 32
-#else
-#define MIN_TILE_WIDTH_MAX_SB 4
-#define MAX_TILE_WIDTH_MAX_SB 64
-#endif // CONFIG_EXT_PARTITION
static int get_min_log2_tile_cols(int max_sb_cols) {
int min_log2 = 0;
diff --git a/av1/common/x86/convolve_2d_sse2.c b/av1/common/x86/convolve_2d_sse2.c
index 941d195..5e0502d 100644
--- a/av1/common/x86/convolve_2d_sse2.c
+++ b/av1/common/x86/convolve_2d_sse2.c
@@ -538,7 +538,6 @@
}
}
-#if CONFIG_EXT_PARTITION
static INLINE void copy_128(const uint8_t *src, uint8_t *dst) {
__m128i s[8];
s[0] = _mm_loadu_si128((__m128i *)(src + 0 * 16));
@@ -558,7 +557,6 @@
_mm_store_si128((__m128i *)(dst + 6 * 16), s[6]);
_mm_store_si128((__m128i *)(dst + 7 * 16), s[7]);
}
-#endif
void av1_convolve_2d_copy_sr_sse2(const uint8_t *src, int src_stride,
uint8_t *dst, int dst_stride, int w, int h,
@@ -665,7 +663,6 @@
dst += dst_stride;
h -= 2;
} while (h);
-#if CONFIG_EXT_PARTITION
} else {
do {
copy_128(src, dst);
@@ -676,7 +673,6 @@
dst += dst_stride;
h -= 2;
} while (h);
-#endif // CONFIG_EXT_PARTITION
}
}
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 95b6fe9..da2cccb 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -956,14 +956,9 @@
}
}
if (!all_none) {
-#if CONFIG_EXT_PARTITION
assert(cm->seq_params.sb_size == BLOCK_64X64 ||
cm->seq_params.sb_size == BLOCK_128X128);
const int sb_size = cm->seq_params.sb_size == BLOCK_128X128 ? 128 : 64;
-#else
- assert(cm->seq_params.sb_size == BLOCK_64X64);
- const int sb_size = 64;
-#endif
for (int p = 0; p < num_planes; ++p)
cm->rst_info[p].restoration_unit_size = sb_size;
@@ -1426,11 +1421,7 @@
static void setup_sb_size(SequenceHeader *seq_params,
struct aom_read_bit_buffer *rb) {
(void)rb;
-#if CONFIG_EXT_PARTITION
set_sb_size(seq_params, aom_rb_read_bit(rb) ? BLOCK_128X128 : BLOCK_64X64);
-#else
- set_sb_size(seq_params, BLOCK_64X64);
-#endif // CONFIG_EXT_PARTITION
}
static INLINE int valid_ref_frame_img_fmt(aom_bit_depth_t ref_bit_depth,
@@ -1619,18 +1610,14 @@
cm->rst_info[1].frame_restoration_type == RESTORE_NONE &&
cm->rst_info[2].frame_restoration_type == RESTORE_NONE;
cm->single_tile_decoding = no_loopfilter && no_cdef && no_restoration;
-// Read the tile width/height
-#if CONFIG_EXT_PARTITION
+ // Read the tile width/height
if (cm->seq_params.sb_size == BLOCK_128X128) {
cm->tile_width = aom_rb_read_literal(rb, 5) + 1;
cm->tile_height = aom_rb_read_literal(rb, 5) + 1;
} else {
-#endif // CONFIG_EXT_PARTITION
cm->tile_width = aom_rb_read_literal(rb, 6) + 1;
cm->tile_height = aom_rb_read_literal(rb, 6) + 1;
-#if CONFIG_EXT_PARTITION
}
-#endif // CONFIG_EXT_PARTITION
cm->tile_width <<= cm->seq_params.mib_size_log2;
cm->tile_height <<= cm->seq_params.mib_size_log2;
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index af71795..c182140 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -50,15 +50,10 @@
const int m = ~((1 << (6 - MI_SIZE_LOG2)) - 1);
if (!(mi_col & (cm->seq_params.mib_size - 1)) &&
!(mi_row & (cm->seq_params.mib_size - 1))) { // Top left?
-#if CONFIG_EXT_PARTITION
cm->cdef_preset[0] = cm->cdef_preset[1] = cm->cdef_preset[2] =
cm->cdef_preset[3] = -1;
-#else
- cm->cdef_preset = -1;
-#endif
}
-// Read CDEF param at first a non-skip coding block
-#if CONFIG_EXT_PARTITION
+ // Read CDEF param at first a non-skip coding block
const int mask = 1 << (6 - MI_SIZE_LOG2);
const int index = cm->seq_params.sb_size == BLOCK_128X128
? !!(mi_col & mask) + 2 * !!(mi_row & mask)
@@ -68,13 +63,6 @@
cm->cdef_preset[index] == -1 && !mbmi->skip
? aom_read_literal(r, cm->cdef_bits, ACCT_STR)
: cm->cdef_preset[index];
-#else
- cm->mi_grid_visible[(mi_row & m) * cm->mi_stride + (mi_col & m)]
- ->mbmi.cdef_strength = cm->cdef_preset =
- cm->cdef_preset == -1 && !mbmi->skip
- ? aom_read_literal(r, cm->cdef_bits, ACCT_STR)
- : cm->cdef_preset;
-#endif
}
static int read_delta_qindex(AV1_COMMON *cm, MACROBLOCKD *xd, aom_reader *r,
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index ec8a7b7..64acf61 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -940,16 +940,11 @@
// Initialise when at top left part of the superblock
if (!(mi_row & (cm->seq_params.mib_size - 1)) &&
!(mi_col & (cm->seq_params.mib_size - 1))) { // Top left?
-#if CONFIG_EXT_PARTITION
cm->cdef_preset[0] = cm->cdef_preset[1] = cm->cdef_preset[2] =
cm->cdef_preset[3] = -1;
-#else
- cm->cdef_preset = -1;
-#endif
}
-// Emit CDEF param at first non-skip coding block
-#if CONFIG_EXT_PARTITION
+ // Emit CDEF param at first non-skip coding block
const int mask = 1 << (6 - MI_SIZE_LOG2);
const int index = cm->seq_params.sb_size == BLOCK_128X128
? !!(mi_col & mask) + 2 * !!(mi_row & mask)
@@ -958,12 +953,6 @@
aom_write_literal(w, mbmi->cdef_strength, cm->cdef_bits);
cm->cdef_preset[index] = mbmi->cdef_strength;
}
-#else
- if (cm->cdef_preset == -1 && !skip) {
- aom_write_literal(w, mbmi->cdef_strength, cm->cdef_bits);
- cm->cdef_preset = mbmi->cdef_strength;
- }
-#endif
}
static void write_inter_segment_id(AV1_COMP *cpi, aom_writer *w,
@@ -1944,14 +1933,9 @@
}
}
if (!all_none) {
-#if CONFIG_EXT_PARTITION
assert(cm->seq_params.sb_size == BLOCK_64X64 ||
cm->seq_params.sb_size == BLOCK_128X128);
const int sb_size = cm->seq_params.sb_size == BLOCK_128X128 ? 128 : 64;
-#else
- assert(cm->seq_params.sb_size == BLOCK_64X64);
- const int sb_size = 64;
-#endif
RestorationInfo *rsi = &cm->rst_info[0];
@@ -2398,22 +2382,18 @@
assert(tile_width > 0);
assert(tile_height > 0);
-// Write the tile sizes
-#if CONFIG_EXT_PARTITION
+ // Write the tile sizes
if (cm->seq_params.sb_size == BLOCK_128X128) {
assert(tile_width <= 32);
assert(tile_height <= 32);
aom_wb_write_literal(wb, tile_width - 1, 5);
aom_wb_write_literal(wb, tile_height - 1, 5);
} else {
-#endif // CONFIG_EXT_PARTITION
assert(tile_width <= 64);
assert(tile_height <= 64);
aom_wb_write_literal(wb, tile_width - 1, 6);
aom_wb_write_literal(wb, tile_height - 1, 6);
-#if CONFIG_EXT_PARTITION
}
-#endif // CONFIG_EXT_PARTITION
} else {
#endif // CONFIG_EXT_TILE
@@ -2844,13 +2824,9 @@
(void)wb;
assert(seq_params->mib_size == mi_size_wide[seq_params->sb_size]);
assert(seq_params->mib_size == 1 << seq_params->mib_size_log2);
-#if CONFIG_EXT_PARTITION
assert(seq_params->sb_size == BLOCK_128X128 ||
seq_params->sb_size == BLOCK_64X64);
aom_wb_write_bit(wb, seq_params->sb_size == BLOCK_128X128 ? 1 : 0);
-#else
- assert(seq_params->sb_size == BLOCK_64X64);
-#endif // CONFIG_EXT_PARTITION
}
void write_sequence_header(AV1_COMP *cpi, struct aom_write_bit_buffer *wb) {
diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index 62faef7..6ae1c69 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -373,21 +373,17 @@
1, // BLOCK_32X64
1, // BLOCK_64X32
0, // BLOCK_64X64
-#if CONFIG_EXT_PARTITION
0, // BLOCK_64X128
0, // BLOCK_128X64
0, // BLOCK_128X128
-#endif // CONFIG_EXT_PARTITION
1, // BLOCK_4X16
1, // BLOCK_16X4
1, // BLOCK_8X32
1, // BLOCK_32X8
1, // BLOCK_16X64
1, // BLOCK_64X16
-#if CONFIG_EXT_PARTITION
1, // BLOCK_32X128
1, // BLOCK_128X32
-#endif // CONFIG_EXT_PARTITION
};
return LUT[bsize];
diff --git a/av1/encoder/context_tree.c b/av1/encoder/context_tree.c
index 32231d4..ec97d87 100644
--- a/av1/encoder/context_tree.c
+++ b/av1/encoder/context_tree.c
@@ -13,10 +13,7 @@
#include "av1/encoder/encoder.h"
static const BLOCK_SIZE square[MAX_SB_SIZE_LOG2 - 1] = {
- BLOCK_4X4, BLOCK_8X8, BLOCK_16X16, BLOCK_32X32, BLOCK_64X64,
-#if CONFIG_EXT_PARTITION
- BLOCK_128X128,
-#endif // CONFIG_EXT_PARTITION
+ BLOCK_4X4, BLOCK_8X8, BLOCK_16X16, BLOCK_32X32, BLOCK_64X64, BLOCK_128X128,
};
static void alloc_mode_context(AV1_COMMON *cm, int num_pix,
@@ -136,19 +133,10 @@
// represents the state of our search.
void av1_setup_pc_tree(AV1_COMMON *cm, ThreadData *td) {
int i, j;
-#if CONFIG_EXT_PARTITION
const int tree_nodes_inc = 1024;
-#else
- const int tree_nodes_inc = 256;
-#endif // CONFIG_EXT_PARTITION
const int leaf_factor = 4;
-#if CONFIG_EXT_PARTITION
const int leaf_nodes = 256 * leaf_factor;
const int tree_nodes = tree_nodes_inc + 256 + 64 + 16 + 4 + 1;
-#else
- const int leaf_nodes = 64 * leaf_factor;
- const int tree_nodes = tree_nodes_inc + 64 + 16 + 4 + 1;
-#endif // CONFIG_EXT_PARTITION
int pc_tree_index = 0;
PC_TREE *this_pc;
int square_index = 1;
@@ -191,17 +179,9 @@
}
void av1_free_pc_tree(ThreadData *td, const int num_planes) {
-#if CONFIG_EXT_PARTITION
const int tree_nodes_inc = 1024;
-#else
- const int tree_nodes_inc = 256;
-#endif // CONFIG_EXT_PARTITION
-#if CONFIG_EXT_PARTITION
const int tree_nodes = tree_nodes_inc + 256 + 64 + 16 + 4 + 1;
-#else
- const int tree_nodes = tree_nodes_inc + 64 + 16 + 4 + 1;
-#endif // CONFIG_EXT_PARTITION
int i;
for (i = 0; i < tree_nodes; ++i)
free_tree_contexts(&td->pc_tree[i], num_planes);
@@ -237,8 +217,6 @@
memcpy(dst_ctx->pred_mv, src_ctx->pred_mv, sizeof(MV) * TOTAL_REFS_PER_FRAME);
dst_ctx->pred_interp_filter = src_ctx->pred_interp_filter;
-#if CONFIG_EXT_PARTITION
dst_ctx->partition = src_ctx->partition;
-#endif // CONFIG_EXT_PARTITION
}
#endif // CONFIG_EXT_PARTITION_TYPES
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 4c22337..1e78ee5 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -69,33 +69,27 @@
// Eventually this should be replaced by custom no-reference routines,
// which will be faster.
static const uint8_t AV1_VAR_OFFS[MAX_SB_SIZE] = {
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
-#if CONFIG_EXT_PARTITION
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128
-#endif // CONFIG_EXT_PARTITION
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128
};
static const uint16_t AV1_HIGH_VAR_OFFS_8[MAX_SB_SIZE] = {
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
-#if CONFIG_EXT_PARTITION
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128
-#endif // CONFIG_EXT_PARTITION
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128
};
static const uint16_t AV1_HIGH_VAR_OFFS_10[MAX_SB_SIZE] = {
@@ -107,7 +101,6 @@
128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4,
128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4,
128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4,
-#if CONFIG_EXT_PARTITION
128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4,
128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4,
128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4,
@@ -116,7 +109,6 @@
128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4,
128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4,
128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4, 128 * 4
-#endif // CONFIG_EXT_PARTITION
};
static const uint16_t AV1_HIGH_VAR_OFFS_12[MAX_SB_SIZE] = {
@@ -129,8 +121,6 @@
128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16,
128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16,
128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16,
- 128 * 16,
-#if CONFIG_EXT_PARTITION
128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16,
128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16,
128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16,
@@ -140,8 +130,7 @@
128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16,
128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16,
128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16, 128 * 16,
- 128 * 16
-#endif // CONFIG_EXT_PARTITION
+ 128 * 16, 128 * 16
};
#if CONFIG_FP_MB_STATS
@@ -1973,14 +1962,10 @@
BLOCK_4X4, BLOCK_4X4, BLOCK_8X8, // 8x16, 16x8, 16x16
BLOCK_8X8, BLOCK_8X8, BLOCK_16X16, // 16x32, 32x16, 32x32
BLOCK_16X16, BLOCK_16X16, BLOCK_16X16, // 32x64, 64x32, 64x64
-#if CONFIG_EXT_PARTITION
BLOCK_16X16, BLOCK_16X16, BLOCK_16X16, // 64x128, 128x64, 128x128
-#endif // CONFIG_EXT_PARTITION
BLOCK_4X4, BLOCK_4X4, BLOCK_8X8, // 4x16, 16x4, 8x32
BLOCK_8X8, BLOCK_16X16, BLOCK_16X16, // 32x8, 16x64, 64x16
-#if CONFIG_EXT_PARTITION
BLOCK_16X16, BLOCK_16X16 // 32x128, 128x32
-#endif // CONFIG_EXT_PARTITION
};
static const BLOCK_SIZE max_partition_size[BLOCK_SIZES_ALL] = {
@@ -1989,14 +1974,10 @@
BLOCK_32X32, BLOCK_32X32, BLOCK_32X32, // 8x16, 16x8, 16x16
BLOCK_64X64, BLOCK_64X64, BLOCK_64X64, // 16x32, 32x16, 32x32
BLOCK_LARGEST, BLOCK_LARGEST, BLOCK_LARGEST, // 32x64, 64x32, 64x64
-#if CONFIG_EXT_PARTITION
BLOCK_LARGEST, BLOCK_LARGEST, BLOCK_LARGEST, // 64x128, 128x64, 128x128
-#endif // CONFIG_EXT_PARTITION
BLOCK_16X16, BLOCK_16X16, BLOCK_32X32, // 4x16, 16x4, 8x32
BLOCK_32X32, BLOCK_LARGEST, BLOCK_LARGEST, // 32x8, 16x64, 64x16
-#if CONFIG_EXT_PARTITION
BLOCK_LARGEST, BLOCK_LARGEST // 32x128, 128x32
-#endif // CONFIG_EXT_PARTITION
};
// Next square block size less or equal than current block size.
@@ -2006,14 +1987,10 @@
BLOCK_8X8, BLOCK_8X8, BLOCK_16X16, // 8x16, 16x8, 16x16
BLOCK_16X16, BLOCK_16X16, BLOCK_32X32, // 16x32, 32x16, 32x32
BLOCK_32X32, BLOCK_32X32, BLOCK_64X64, // 32x64, 64x32, 64x64
-#if CONFIG_EXT_PARTITION
BLOCK_64X64, BLOCK_64X64, BLOCK_128X128, // 64x128, 128x64, 128x128
-#endif // CONFIG_EXT_PARTITION
BLOCK_4X4, BLOCK_4X4, BLOCK_8X8, // 4x16, 16x4, 8x32
BLOCK_8X8, BLOCK_16X16, BLOCK_16X16, // 32x8, 16x64, 64x16
-#if CONFIG_EXT_PARTITION
BLOCK_32X32, BLOCK_32X32 // 32x128, 128x32
-#endif // CONFIG_EXT_PARTITION
};
/* clang-format on */
@@ -2181,24 +2158,18 @@
#if CONFIG_FP_MB_STATS
const int qindex_skip_threshold_lookup[BLOCK_SIZES] = {
0, 10, 10, 30, 40, 40, 60, 80, 80, 90, 100, 100, 120,
-#if CONFIG_EXT_PARTITION
// TODO(debargha): What are the correct numbers here?
130, 130, 150
-#endif // CONFIG_EXT_PARTITION
};
const int qindex_split_threshold_lookup[BLOCK_SIZES] = {
0, 3, 3, 7, 15, 15, 30, 40, 40, 60, 80, 80, 120,
-#if CONFIG_EXT_PARTITION
// TODO(debargha): What are the correct numbers here?
160, 160, 240
-#endif // CONFIG_EXT_PARTITION
};
const int complexity_16x16_blocks_threshold[BLOCK_SIZES] = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 6,
-#if CONFIG_EXT_PARTITION
// TODO(debargha): What are the correct numbers here?
8, 8, 10
-#endif // CONFIG_EXT_PARTITION
};
typedef enum {
@@ -3272,7 +3243,7 @@
// for this block. This is almost the same as ext_partition_allowed, except
// that we don't allow 128x32 or 32x128 blocks if ALLOW_128X32_BLOCKS is false,
// so we require that bsize is not BLOCK_128X128.
-#if CONFIG_EXT_PARTITION && !ALLOW_128X32_BLOCKS
+#if !ALLOW_128X32_BLOCKS
const int partition4_allowed =
ext_partition_allowed && bsize != BLOCK_128X128;
#else
@@ -3535,11 +3506,7 @@
MACROBLOCKD *const xd = &x->e_mbd;
SPEED_FEATURES *const sf = &cpi->sf;
int mi_col;
-#if CONFIG_EXT_PARTITION
const int leaf_nodes = 256;
-#else
- const int leaf_nodes = 64;
-#endif // CONFIG_EXT_PARTITION
// Initialize the left context for the new SB row
av1_zero_left_context(xd);
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 0cdcbf5..4fbf0d4 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -266,7 +266,6 @@
}
static BLOCK_SIZE select_sb_size(const AV1_COMP *const cpi) {
-#if CONFIG_EXT_PARTITION
if (cpi->oxcf.superblock_size == AOM_SUPERBLOCK_SIZE_64X64)
return BLOCK_64X64;
#if CONFIG_FILEOPTIONS
@@ -292,10 +291,6 @@
return BLOCK_64X64;
#endif
return BLOCK_128X128;
-#else
- (void)cpi;
- return BLOCK_64X64;
-#endif // CONFIG_EXT_PARTITION
}
static void setup_frame(AV1_COMP *cpi) {
@@ -890,7 +885,6 @@
#endif
#if CONFIG_EXT_TILE
if (cpi->oxcf.large_scale_tile) {
-#if CONFIG_EXT_PARTITION
if (cpi->oxcf.superblock_size != AOM_SUPERBLOCK_SIZE_64X64) {
cm->tile_width = clamp(cpi->oxcf.tile_columns, 1, 32);
cm->tile_height = clamp(cpi->oxcf.tile_rows, 1, 32);
@@ -902,12 +896,6 @@
cm->tile_width <<= MAX_MIB_SIZE_LOG2 - 1;
cm->tile_height <<= MAX_MIB_SIZE_LOG2 - 1;
}
-#else
- cm->tile_width = clamp(cpi->oxcf.tile_columns, 1, 64);
- cm->tile_height = clamp(cpi->oxcf.tile_rows, 1, 64);
- cm->tile_width <<= MAX_MIB_SIZE_LOG2;
- cm->tile_height <<= MAX_MIB_SIZE_LOG2;
-#endif // CONFIG_EXT_PARTITION
cm->tile_width = AOMMIN(cm->tile_width, cm->mi_cols);
cm->tile_height = AOMMIN(cm->tile_height, cm->mi_rows);
@@ -1257,7 +1245,6 @@
}
#endif // CONFIG_JNT_COMP
-#if CONFIG_EXT_PARTITION
MAKE_BFP_SAD_WRAPPER(aom_highbd_sad128x128)
MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad128x128_avg)
MAKE_BFP_SAD3_WRAPPER(aom_highbd_sad128x128x3)
@@ -1269,7 +1256,6 @@
MAKE_BFP_SAD_WRAPPER(aom_highbd_sad64x128)
MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad64x128_avg)
MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad64x128x4d)
-#endif // CONFIG_EXT_PARTITION
MAKE_BFP_SAD_WRAPPER(aom_highbd_sad32x16)
MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad32x16_avg)
MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad32x16x4d)
@@ -1345,22 +1331,18 @@
MAKE_BFP_SAD_WRAPPER(aom_highbd_sad64x16)
MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad64x16_avg)
MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad64x16x4d)
-#if CONFIG_EXT_PARTITION
MAKE_BFP_SAD_WRAPPER(aom_highbd_sad32x128)
MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad32x128_avg)
MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad32x128x4d)
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
#endif // CONFIG_EXT_PARTITION_TYPES
#if CONFIG_JNT_COMP
-#if CONFIG_EXT_PARTITION
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad128x128_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad128x64_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad64x128_avg)
-#endif // CONFIG_EXT_PARTITION
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad32x16_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad16x32_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad64x32_avg)
@@ -1381,10 +1363,8 @@
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad32x8_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad16x64_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad64x16_avg)
-#if CONFIG_EXT_PARTITION
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad32x128_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad128x32_avg)
-#endif // CONFIG_EXT_PARTITION
#endif // CONFIG_EXT_PARTITION_TYPES
#endif // CONFIG_JNT_COMP
@@ -1417,11 +1397,9 @@
4; \
}
-#if CONFIG_EXT_PARTITION
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad128x128)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad128x64)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad64x128)
-#endif // CONFIG_EXT_PARTITION
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad64x64)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad64x32)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad32x64)
@@ -1443,10 +1421,8 @@
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad32x8)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad16x64)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad64x16)
-#if CONFIG_EXT_PARTITION
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad32x128)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad128x32)
-#endif // CONFIG_EXT_PARTITION
#endif // CONFIG_EXT_PARTITION_TYPES
#define HIGHBD_OBFP(BT, OSDF, OVF, OSVF) \
@@ -1471,11 +1447,9 @@
return fnname(ref, ref_stride, wsrc, msk) >> 4; \
}
-#if CONFIG_EXT_PARTITION
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad128x128)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad128x64)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad64x128)
-#endif // CONFIG_EXT_PARTITION
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad64x64)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad64x32)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad32x64)
@@ -1497,10 +1471,8 @@
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad32x8)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad16x64)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad64x16)
-#if CONFIG_EXT_PARTITION
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad32x128)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad128x32)
-#endif // CONFIG_EXT_PARTITION
#endif // CONFIG_EXT_PARTITION_TYPES
static void highbd_set_var_fns(AV1_COMP *const cpi) {
@@ -1510,7 +1482,6 @@
case AOM_BITS_8:
#if CONFIG_JNT_COMP
#if CONFIG_EXT_PARTITION_TYPES
-#if CONFIG_EXT_PARTITION
HIGHBD_BFP(BLOCK_128X32, aom_highbd_sad128x32_bits8,
aom_highbd_sad128x32_avg_bits8, aom_highbd_8_variance128x32,
aom_highbd_8_sub_pixel_variance128x32,
@@ -1526,7 +1497,6 @@
aom_highbd_sad32x128x4d_bits8,
aom_highbd_jnt_sad32x128_avg_bits8,
aom_highbd_8_jnt_sub_pixel_avg_variance32x128)
-#endif // CONFIG_EXT_PARTITION
HIGHBD_BFP(BLOCK_64X16, aom_highbd_sad64x16_bits8,
aom_highbd_sad64x16_avg_bits8, aom_highbd_8_variance64x16,
@@ -1680,7 +1650,6 @@
aom_highbd_sad4x4x4d_bits8, aom_highbd_jnt_sad4x4_avg_bits8,
aom_highbd_8_jnt_sub_pixel_avg_variance4x4)
-#if CONFIG_EXT_PARTITION
HIGHBD_BFP(
BLOCK_128X128, aom_highbd_sad128x128_bits8,
aom_highbd_sad128x128_avg_bits8, aom_highbd_8_variance128x128,
@@ -1705,10 +1674,8 @@
aom_highbd_sad64x128x4d_bits8,
aom_highbd_jnt_sad64x128_avg_bits8,
aom_highbd_8_jnt_sub_pixel_avg_variance64x128)
-#endif // CONFIG_EXT_PARTITION
-#else // CONFIG_JNT_COMP
+#else // CONFIG_JNT_COMP
#if CONFIG_EXT_PARTITION_TYPES
-#if CONFIG_EXT_PARTITION
HIGHBD_BFP(BLOCK_128X32, aom_highbd_sad128x32_bits8,
aom_highbd_sad128x32_avg_bits8, aom_highbd_8_variance128x32,
aom_highbd_8_sub_pixel_variance128x32,
@@ -1720,7 +1687,6 @@
aom_highbd_8_sub_pixel_variance32x128,
aom_highbd_8_sub_pixel_avg_variance32x128, NULL, NULL,
aom_highbd_sad32x128x4d_bits8)
-#endif // CONFIG_EXT_PARTITION
HIGHBD_BFP(BLOCK_64X16, aom_highbd_sad64x16_bits8,
aom_highbd_sad64x16_avg_bits8, aom_highbd_8_variance64x16,
@@ -1840,7 +1806,6 @@
aom_highbd_8_sub_pixel_avg_variance4x4, aom_highbd_sad4x4x3_bits8,
aom_highbd_sad4x4x8_bits8, aom_highbd_sad4x4x4d_bits8)
-#if CONFIG_EXT_PARTITION
HIGHBD_BFP(BLOCK_128X128, aom_highbd_sad128x128_bits8,
aom_highbd_sad128x128_avg_bits8,
aom_highbd_8_variance128x128,
@@ -1860,17 +1825,14 @@
aom_highbd_8_sub_pixel_variance64x128,
aom_highbd_8_sub_pixel_avg_variance64x128, NULL, NULL,
aom_highbd_sad64x128x4d_bits8)
-#endif // CONFIG_EXT_PARTITION
#endif // CONFIG_JNT_COMP
-#if CONFIG_EXT_PARTITION
HIGHBD_MBFP(BLOCK_128X128, aom_highbd_masked_sad128x128_bits8,
aom_highbd_8_masked_sub_pixel_variance128x128)
HIGHBD_MBFP(BLOCK_128X64, aom_highbd_masked_sad128x64_bits8,
aom_highbd_8_masked_sub_pixel_variance128x64)
HIGHBD_MBFP(BLOCK_64X128, aom_highbd_masked_sad64x128_bits8,
aom_highbd_8_masked_sub_pixel_variance64x128)
-#endif // CONFIG_EXT_PARTITION
HIGHBD_MBFP(BLOCK_64X64, aom_highbd_masked_sad64x64_bits8,
aom_highbd_8_masked_sub_pixel_variance64x64)
HIGHBD_MBFP(BLOCK_64X32, aom_highbd_masked_sad64x32_bits8,
@@ -1898,13 +1860,11 @@
HIGHBD_MBFP(BLOCK_4X4, aom_highbd_masked_sad4x4_bits8,
aom_highbd_8_masked_sub_pixel_variance4x4)
#if CONFIG_EXT_PARTITION_TYPES
-#if CONFIG_EXT_PARTITION
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)
-#endif // CONFIG_EXT_PARTITION
HIGHBD_MBFP(BLOCK_64X16, aom_highbd_masked_sad64x16_bits8,
aom_highbd_8_masked_sub_pixel_variance64x16)
@@ -1924,7 +1884,6 @@
HIGHBD_MBFP(BLOCK_4X16, aom_highbd_masked_sad4x16_bits8,
aom_highbd_8_masked_sub_pixel_variance4x16)
#endif
-#if CONFIG_EXT_PARTITION
HIGHBD_OBFP(BLOCK_128X128, aom_highbd_obmc_sad128x128_bits8,
aom_highbd_obmc_variance128x128,
aom_highbd_obmc_sub_pixel_variance128x128)
@@ -1934,7 +1893,6 @@
HIGHBD_OBFP(BLOCK_64X128, aom_highbd_obmc_sad64x128_bits8,
aom_highbd_obmc_variance64x128,
aom_highbd_obmc_sub_pixel_variance64x128)
-#endif // CONFIG_EXT_PARTITION
HIGHBD_OBFP(BLOCK_64X64, aom_highbd_obmc_sad64x64_bits8,
aom_highbd_obmc_variance64x64,
aom_highbd_obmc_sub_pixel_variance64x64)
@@ -1975,7 +1933,6 @@
aom_highbd_obmc_variance4x4,
aom_highbd_obmc_sub_pixel_variance4x4)
#if CONFIG_EXT_PARTITION_TYPES
-#if CONFIG_EXT_PARTITION
HIGHBD_OBFP(BLOCK_128X32, aom_highbd_obmc_sad128x32_bits8,
aom_highbd_obmc_variance128x32,
aom_highbd_obmc_sub_pixel_variance128x32)
@@ -1983,7 +1940,6 @@
HIGHBD_OBFP(BLOCK_32X128, aom_highbd_obmc_sad32x128_bits8,
aom_highbd_obmc_variance32x128,
aom_highbd_obmc_sub_pixel_variance32x128)
-#endif // CONFIG_EXT_PARTITION
HIGHBD_OBFP(BLOCK_64X16, aom_highbd_obmc_sad64x16_bits8,
aom_highbd_obmc_variance64x16,
@@ -2014,7 +1970,6 @@
case AOM_BITS_10:
#if CONFIG_JNT_COMP
#if CONFIG_EXT_PARTITION_TYPES
-#if CONFIG_EXT_PARTITION
HIGHBD_BFP(
BLOCK_128X32, aom_highbd_sad128x32_bits10,
aom_highbd_sad128x32_avg_bits10, aom_highbd_10_variance128x32,
@@ -2030,7 +1985,6 @@
aom_highbd_10_sub_pixel_avg_variance32x128, NULL, NULL,
aom_highbd_sad32x128x4d_bits10, aom_highbd_jnt_sad32x128_avg_bits10,
aom_highbd_10_jnt_sub_pixel_avg_variance32x128);
-#endif // CONFIG_EXT_PARTITION
HIGHBD_BFP(BLOCK_64X16, aom_highbd_sad64x16_bits10,
aom_highbd_sad64x16_avg_bits10, aom_highbd_10_variance64x16,
@@ -2190,7 +2144,6 @@
aom_highbd_jnt_sad4x4_avg_bits10,
aom_highbd_10_jnt_sub_pixel_avg_variance4x4);
-#if CONFIG_EXT_PARTITION
HIGHBD_BFP(
BLOCK_128X128, aom_highbd_sad128x128_bits10,
aom_highbd_sad128x128_avg_bits10, aom_highbd_10_variance128x128,
@@ -2216,10 +2169,8 @@
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);
-#endif // CONFIG_EXT_PARTITION
-#else // CONFIG_JNT_COMP
+#else // CONFIG_JNT_COMP
#if CONFIG_EXT_PARTITION_TYPES
-#if CONFIG_EXT_PARTITION
HIGHBD_BFP(BLOCK_128X32, aom_highbd_sad128x32_bits10,
aom_highbd_sad128x32_avg_bits10,
aom_highbd_10_variance128x32,
@@ -2233,7 +2184,6 @@
aom_highbd_10_sub_pixel_variance32x128,
aom_highbd_10_sub_pixel_avg_variance32x128, NULL, NULL,
aom_highbd_sad32x128x4d_bits10)
-#endif // CONFIG_EXT_PARTITION
HIGHBD_BFP(BLOCK_64X16, aom_highbd_sad64x16_bits10,
aom_highbd_sad64x16_avg_bits10, aom_highbd_10_variance64x16,
@@ -2355,7 +2305,6 @@
aom_highbd_10_sub_pixel_avg_variance4x4, aom_highbd_sad4x4x3_bits10,
aom_highbd_sad4x4x8_bits10, aom_highbd_sad4x4x4d_bits10)
-#if CONFIG_EXT_PARTITION
HIGHBD_BFP(
BLOCK_128X128, aom_highbd_sad128x128_bits10,
aom_highbd_sad128x128_avg_bits10, aom_highbd_10_variance128x128,
@@ -2377,17 +2326,14 @@
aom_highbd_10_sub_pixel_variance64x128,
aom_highbd_10_sub_pixel_avg_variance64x128, NULL, NULL,
aom_highbd_sad64x128x4d_bits10)
-#endif // CONFIG_EXT_PARTITION
#endif // CONFIG_JNT_COMP
-#if CONFIG_EXT_PARTITION
HIGHBD_MBFP(BLOCK_128X128, aom_highbd_masked_sad128x128_bits10,
aom_highbd_10_masked_sub_pixel_variance128x128)
HIGHBD_MBFP(BLOCK_128X64, aom_highbd_masked_sad128x64_bits10,
aom_highbd_10_masked_sub_pixel_variance128x64)
HIGHBD_MBFP(BLOCK_64X128, aom_highbd_masked_sad64x128_bits10,
aom_highbd_10_masked_sub_pixel_variance64x128)
-#endif // CONFIG_EXT_PARTITION
HIGHBD_MBFP(BLOCK_64X64, aom_highbd_masked_sad64x64_bits10,
aom_highbd_10_masked_sub_pixel_variance64x64)
HIGHBD_MBFP(BLOCK_64X32, aom_highbd_masked_sad64x32_bits10,
@@ -2415,13 +2361,11 @@
HIGHBD_MBFP(BLOCK_4X4, aom_highbd_masked_sad4x4_bits10,
aom_highbd_10_masked_sub_pixel_variance4x4)
#if CONFIG_EXT_PARTITION_TYPES
-#if CONFIG_EXT_PARTITION
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)
-#endif // CONFIG_EXT_PARTITION
HIGHBD_MBFP(BLOCK_64X16, aom_highbd_masked_sad64x16_bits10,
aom_highbd_10_masked_sub_pixel_variance64x16)
@@ -2441,7 +2385,6 @@
HIGHBD_MBFP(BLOCK_4X16, aom_highbd_masked_sad4x16_bits10,
aom_highbd_10_masked_sub_pixel_variance4x16)
#endif
-#if CONFIG_EXT_PARTITION
HIGHBD_OBFP(BLOCK_128X128, aom_highbd_obmc_sad128x128_bits10,
aom_highbd_10_obmc_variance128x128,
aom_highbd_10_obmc_sub_pixel_variance128x128)
@@ -2451,7 +2394,6 @@
HIGHBD_OBFP(BLOCK_64X128, aom_highbd_obmc_sad64x128_bits10,
aom_highbd_10_obmc_variance64x128,
aom_highbd_10_obmc_sub_pixel_variance64x128)
-#endif // CONFIG_EXT_PARTITION
HIGHBD_OBFP(BLOCK_64X64, aom_highbd_obmc_sad64x64_bits10,
aom_highbd_10_obmc_variance64x64,
aom_highbd_10_obmc_sub_pixel_variance64x64)
@@ -2492,7 +2434,6 @@
aom_highbd_10_obmc_variance4x4,
aom_highbd_10_obmc_sub_pixel_variance4x4)
#if CONFIG_EXT_PARTITION_TYPES
-#if CONFIG_EXT_PARTITION
HIGHBD_OBFP(BLOCK_128X32, aom_highbd_obmc_sad128x32_bits10,
aom_highbd_10_obmc_variance128x32,
aom_highbd_10_obmc_sub_pixel_variance128x32)
@@ -2500,7 +2441,6 @@
HIGHBD_OBFP(BLOCK_32X128, aom_highbd_obmc_sad32x128_bits10,
aom_highbd_10_obmc_variance32x128,
aom_highbd_10_obmc_sub_pixel_variance32x128)
-#endif // CONFIG_EXT_PARTITION
HIGHBD_OBFP(BLOCK_64X16, aom_highbd_obmc_sad64x16_bits10,
aom_highbd_10_obmc_variance64x16,
@@ -2531,7 +2471,6 @@
case AOM_BITS_12:
#if CONFIG_JNT_COMP
#if CONFIG_EXT_PARTITION_TYPES
-#if CONFIG_EXT_PARTITION
HIGHBD_BFP(
BLOCK_128X32, aom_highbd_sad128x32_bits12,
aom_highbd_sad128x32_avg_bits12, aom_highbd_12_variance128x32,
@@ -2547,7 +2486,6 @@
aom_highbd_12_sub_pixel_avg_variance32x128, NULL, NULL,
aom_highbd_sad32x128x4d_bits12, aom_highbd_jnt_sad32x128_avg_bits12,
aom_highbd_12_jnt_sub_pixel_avg_variance32x128);
-#endif // CONFIG_EXT_PARTITION
HIGHBD_BFP(BLOCK_64X16, aom_highbd_sad64x16_bits12,
aom_highbd_sad64x16_avg_bits12, aom_highbd_12_variance64x16,
@@ -2707,7 +2645,6 @@
aom_highbd_jnt_sad4x4_avg_bits12,
aom_highbd_12_jnt_sub_pixel_avg_variance4x4);
-#if CONFIG_EXT_PARTITION
HIGHBD_BFP(
BLOCK_128X128, aom_highbd_sad128x128_bits12,
aom_highbd_sad128x128_avg_bits12, aom_highbd_12_variance128x128,
@@ -2733,10 +2670,8 @@
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);
-#endif // CONFIG_EXT_PARTITION
-#else // CONFIG_JNT_COMP
+#else // CONFIG_JNT_COMP
#if CONFIG_EXT_PARTITION_TYPES
-#if CONFIG_EXT_PARTITION
HIGHBD_BFP(BLOCK_128X32, aom_highbd_sad128x32_bits12,
aom_highbd_sad128x32_avg_bits12,
aom_highbd_12_variance128x32,
@@ -2750,7 +2685,6 @@
aom_highbd_12_sub_pixel_variance32x128,
aom_highbd_12_sub_pixel_avg_variance32x128, NULL, NULL,
aom_highbd_sad32x128x4d_bits12)
-#endif // CONFIG_EXT_PARTITION
HIGHBD_BFP(BLOCK_64X16, aom_highbd_sad64x16_bits12,
aom_highbd_sad64x16_avg_bits12, aom_highbd_12_variance64x16,
@@ -2872,7 +2806,6 @@
aom_highbd_12_sub_pixel_avg_variance4x4, aom_highbd_sad4x4x3_bits12,
aom_highbd_sad4x4x8_bits12, aom_highbd_sad4x4x4d_bits12)
-#if CONFIG_EXT_PARTITION
HIGHBD_BFP(
BLOCK_128X128, aom_highbd_sad128x128_bits12,
aom_highbd_sad128x128_avg_bits12, aom_highbd_12_variance128x128,
@@ -2894,17 +2827,14 @@
aom_highbd_12_sub_pixel_variance64x128,
aom_highbd_12_sub_pixel_avg_variance64x128, NULL, NULL,
aom_highbd_sad64x128x4d_bits12)
-#endif // CONFIG_EXT_PARTITION
#endif // CONFIG_JNT_COMP
-#if CONFIG_EXT_PARTITION
HIGHBD_MBFP(BLOCK_128X128, aom_highbd_masked_sad128x128_bits12,
aom_highbd_12_masked_sub_pixel_variance128x128)
HIGHBD_MBFP(BLOCK_128X64, aom_highbd_masked_sad128x64_bits12,
aom_highbd_12_masked_sub_pixel_variance128x64)
HIGHBD_MBFP(BLOCK_64X128, aom_highbd_masked_sad64x128_bits12,
aom_highbd_12_masked_sub_pixel_variance64x128)
-#endif // CONFIG_EXT_PARTITION
HIGHBD_MBFP(BLOCK_64X64, aom_highbd_masked_sad64x64_bits12,
aom_highbd_12_masked_sub_pixel_variance64x64)
HIGHBD_MBFP(BLOCK_64X32, aom_highbd_masked_sad64x32_bits12,
@@ -2932,13 +2862,11 @@
HIGHBD_MBFP(BLOCK_4X4, aom_highbd_masked_sad4x4_bits12,
aom_highbd_12_masked_sub_pixel_variance4x4)
#if CONFIG_EXT_PARTITION_TYPES
-#if CONFIG_EXT_PARTITION
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)
-#endif // CONFIG_EXT_PARTITION
HIGHBD_MBFP(BLOCK_64X16, aom_highbd_masked_sad64x16_bits12,
aom_highbd_12_masked_sub_pixel_variance64x16)
@@ -2959,7 +2887,6 @@
aom_highbd_12_masked_sub_pixel_variance4x16)
#endif
-#if CONFIG_EXT_PARTITION
HIGHBD_OBFP(BLOCK_128X128, aom_highbd_obmc_sad128x128_bits12,
aom_highbd_12_obmc_variance128x128,
aom_highbd_12_obmc_sub_pixel_variance128x128)
@@ -2969,7 +2896,6 @@
HIGHBD_OBFP(BLOCK_64X128, aom_highbd_obmc_sad64x128_bits12,
aom_highbd_12_obmc_variance64x128,
aom_highbd_12_obmc_sub_pixel_variance64x128)
-#endif // CONFIG_EXT_PARTITION
HIGHBD_OBFP(BLOCK_64X64, aom_highbd_obmc_sad64x64_bits12,
aom_highbd_12_obmc_variance64x64,
aom_highbd_12_obmc_sub_pixel_variance64x64)
@@ -3010,7 +2936,6 @@
aom_highbd_12_obmc_variance4x4,
aom_highbd_12_obmc_sub_pixel_variance4x4)
#if CONFIG_EXT_PARTITION_TYPES
-#if CONFIG_EXT_PARTITION
HIGHBD_OBFP(BLOCK_128X32, aom_highbd_obmc_sad128x32_bits12,
aom_highbd_12_obmc_variance128x32,
aom_highbd_12_obmc_sub_pixel_variance128x32)
@@ -3018,7 +2943,6 @@
HIGHBD_OBFP(BLOCK_32X128, aom_highbd_obmc_sad32x128_bits12,
aom_highbd_12_obmc_variance32x128,
aom_highbd_12_obmc_sub_pixel_variance32x128)
-#endif // CONFIG_EXT_PARTITION
HIGHBD_OBFP(BLOCK_64X16, aom_highbd_obmc_sad64x16_bits12,
aom_highbd_12_obmc_variance64x16,
@@ -3463,7 +3387,6 @@
aom_sad64x16x4d, aom_jnt_sad64x16_avg,
aom_jnt_sub_pixel_avg_variance64x16)
-#if CONFIG_EXT_PARTITION
BFP(BLOCK_32X128, aom_sad32x128, aom_sad32x128_avg, aom_variance32x128,
aom_sub_pixel_variance32x128, aom_sub_pixel_avg_variance32x128, NULL,
NULL, aom_sad32x128x4d, aom_jnt_sad32x128_avg,
@@ -3473,10 +3396,8 @@
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
#endif // CONFIG_EXT_PARTITION_TYPES
-#if CONFIG_EXT_PARTITION
BFP(BLOCK_128X128, aom_sad128x128, aom_sad128x128_avg, aom_variance128x128,
aom_sub_pixel_variance128x128, aom_sub_pixel_avg_variance128x128,
aom_sad128x128x3, aom_sad128x128x8, aom_sad128x128x4d,
@@ -3491,7 +3412,6 @@
aom_sub_pixel_variance64x128, aom_sub_pixel_avg_variance64x128, NULL,
NULL, aom_sad64x128x4d, aom_jnt_sad64x128_avg,
aom_jnt_sub_pixel_avg_variance64x128)
-#endif // CONFIG_EXT_PARTITION
BFP(BLOCK_32X16, aom_sad32x16, aom_sad32x16_avg, aom_variance32x16,
aom_sub_pixel_variance32x16, aom_sub_pixel_avg_variance32x16, NULL, NULL,
@@ -3584,7 +3504,6 @@
aom_sub_pixel_variance64x16, aom_sub_pixel_avg_variance64x16, NULL, NULL,
aom_sad64x16x4d)
-#if CONFIG_EXT_PARTITION
BFP(BLOCK_32X128, aom_sad32x128, aom_sad32x128_avg, aom_variance32x128,
aom_sub_pixel_variance32x128, aom_sub_pixel_avg_variance32x128, NULL,
NULL, aom_sad32x128x4d)
@@ -3592,10 +3511,8 @@
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
#endif // CONFIG_EXT_PARTITION_TYPES
-#if CONFIG_EXT_PARTITION
BFP(BLOCK_128X128, aom_sad128x128, aom_sad128x128_avg, aom_variance128x128,
aom_sub_pixel_variance128x128, aom_sub_pixel_avg_variance128x128,
aom_sad128x128x3, aom_sad128x128x8, aom_sad128x128x4d)
@@ -3607,7 +3524,6 @@
BFP(BLOCK_64X128, aom_sad64x128, aom_sad64x128_avg, aom_variance64x128,
aom_sub_pixel_variance64x128, aom_sub_pixel_avg_variance64x128, NULL,
NULL, aom_sad64x128x4d)
-#endif // CONFIG_EXT_PARTITION
BFP(BLOCK_32X16, aom_sad32x16, aom_sad32x16_avg, aom_variance32x16,
aom_sub_pixel_variance32x16, aom_sub_pixel_avg_variance32x16, NULL, NULL,
@@ -3668,14 +3584,12 @@
cpi->fn_ptr[BT].ovf = OVF; \
cpi->fn_ptr[BT].osvf = OSVF;
-#if CONFIG_EXT_PARTITION
OBFP(BLOCK_128X128, aom_obmc_sad128x128, aom_obmc_variance128x128,
aom_obmc_sub_pixel_variance128x128)
OBFP(BLOCK_128X64, aom_obmc_sad128x64, aom_obmc_variance128x64,
aom_obmc_sub_pixel_variance128x64)
OBFP(BLOCK_64X128, aom_obmc_sad64x128, aom_obmc_variance64x128,
aom_obmc_sub_pixel_variance64x128)
-#endif // CONFIG_EXT_PARTITION
OBFP(BLOCK_64X64, aom_obmc_sad64x64, aom_obmc_variance64x64,
aom_obmc_sub_pixel_variance64x64)
OBFP(BLOCK_64X32, aom_obmc_sad64x32, aom_obmc_variance64x32,
@@ -3722,25 +3636,21 @@
OBFP(BLOCK_64X16, aom_obmc_sad64x16, aom_obmc_variance64x16,
aom_obmc_sub_pixel_variance64x16)
-#if CONFIG_EXT_PARTITION
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
#endif // CONFIG_EXT_PARTITION_TYPES
#define MBFP(BT, MCSDF, MCSVF) \
cpi->fn_ptr[BT].msdf = MCSDF; \
cpi->fn_ptr[BT].msvf = MCSVF;
-#if CONFIG_EXT_PARTITION
MBFP(BLOCK_128X128, aom_masked_sad128x128,
aom_masked_sub_pixel_variance128x128)
MBFP(BLOCK_128X64, aom_masked_sad128x64, aom_masked_sub_pixel_variance128x64)
MBFP(BLOCK_64X128, aom_masked_sad64x128, aom_masked_sub_pixel_variance64x128)
-#endif // CONFIG_EXT_PARTITION
MBFP(BLOCK_64X64, aom_masked_sad64x64, aom_masked_sub_pixel_variance64x64)
MBFP(BLOCK_64X32, aom_masked_sad64x32, aom_masked_sub_pixel_variance64x32)
MBFP(BLOCK_32X64, aom_masked_sad32x64, aom_masked_sub_pixel_variance32x64)
@@ -3768,11 +3678,9 @@
MBFP(BLOCK_64X16, aom_masked_sad64x16, aom_masked_sub_pixel_variance64x16)
-#if CONFIG_EXT_PARTITION
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
#endif // CONFIG_EXT_PARTITION_TYPES
highbd_set_var_fns(cpi);
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index 4c49fa2..91a30fb 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -304,9 +304,7 @@
#if CONFIG_CDF_UPDATE_MODE
uint8_t cdf_update_mode;
#endif // CONFIG_CDF_UPDATE_MODE
-#if CONFIG_EXT_PARTITION
aom_superblock_size_t superblock_size;
-#endif // CONFIG_EXT_PARTITION
#if CONFIG_EXT_TILE
unsigned int large_scale_tile;
unsigned int single_tile_decoding;
diff --git a/av1/encoder/pickcdef.c b/av1/encoder/pickcdef.c
index 6f8d78b..33f4fc7 100644
--- a/av1/encoder/pickcdef.c
+++ b/av1/encoder/pickcdef.c
@@ -284,11 +284,7 @@
int fbr, fbc;
uint16_t *src[3];
uint16_t *ref_coeff[3];
-#if CONFIG_EXT_PARTITION
static cdef_list dlist[MI_SIZE_128X128 * MI_SIZE_128X128];
-#else
- cdef_list dlist[MI_SIZE_64X64 * MI_SIZE_64X64];
-#endif
int dir[CDEF_NBLOCKS][CDEF_NBLOCKS] = { { 0 } };
int var[CDEF_NBLOCKS][CDEF_NBLOCKS] = { { 0 } };
int stride[3];
@@ -388,7 +384,6 @@
nvb = AOMMIN(MI_SIZE_64X64, cm->mi_rows - MI_SIZE_64X64 * fbr);
int hb_step = 1;
int vb_step = 1;
-#if CONFIG_EXT_PARTITION
BLOCK_SIZE bs = BLOCK_64X64;
MB_MODE_INFO *const mbmi =
&cm->mi_grid_visible[MI_SIZE_64X64 * fbr * cm->mi_stride +
@@ -413,16 +408,10 @@
nvb = AOMMIN(MI_SIZE_128X128, cm->mi_rows - MI_SIZE_64X64 * fbr);
vb_step = 2;
}
-#endif
// No filtering if the entire filter block is skipped
if (sb_all_skip(cm, fbr * MI_SIZE_64X64, fbc * MI_SIZE_64X64)) continue;
-#if CONFIG_EXT_PARTITION
cdef_count = sb_compute_cdef_list(cm, fbr * MI_SIZE_64X64,
fbc * MI_SIZE_64X64, dlist, bs);
-#else
- cdef_count = sb_compute_cdef_list(cm, fbr * MI_SIZE_64X64,
- fbc * MI_SIZE_64X64, dlist);
-#endif
for (pli = 0; pli < num_planes; pli++) {
for (i = 0; i < CDEF_INBUF_SIZE; i++) inbuf[i] = CDEF_VERY_LARGE;
for (gi = 0; gi < total_strengths; gi++) {
diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 28a4c59..df0900a 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -52,14 +52,8 @@
// This table is used to correct for block size.
// The factors here are << 2 (2 = x0.5, 32 = x8 etc).
static const uint8_t rd_thresh_block_size_factor[BLOCK_SIZES_ALL] = {
- 2, 3, 3, 4, 6, 6, 8, 12, 12, 16, 24, 24, 32,
-#if CONFIG_EXT_PARTITION
- 48, 48, 64,
-#endif // CONFIG_EXT_PARTITION
- 4, 4, 8, 8, 16, 16,
-#if CONFIG_EXT_PARTITION
- 32, 32
-#endif // CONFIG_EXT_PARTITION
+ 2, 3, 3, 4, 6, 6, 8, 12, 12, 16, 24, 24,
+ 32, 48, 48, 64, 4, 4, 8, 8, 16, 16, 32, 32
};
static const int use_intra_ext_tx_for_txsize[EXT_TX_SETS_INTRA][EXT_TX_SIZES] =
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 557b633..a8c2b1a 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4359,34 +4359,16 @@
static const uint32_t skip_pred_threshold[3][BLOCK_SIZES_ALL] = {
{
- 50, 50, 50, 55, 47, 47, 53, 53, 53, 53, 53, 53, 53,
-#if CONFIG_EXT_PARTITION
- 53, 53, 53,
-#endif
- 50, 50, 55, 55, 53, 53,
-#if CONFIG_EXT_PARTITION
- 53, 53,
-#endif
+ 50, 50, 50, 55, 47, 47, 53, 53, 53, 53, 53, 53,
+ 53, 53, 53, 53, 50, 50, 55, 55, 53, 53, 53, 53,
},
{
- 69, 69, 69, 67, 68, 68, 53, 53, 53, 53, 53, 53, 53,
-#if CONFIG_EXT_PARTITION
- 53, 53, 53,
-#endif
- 69, 69, 67, 67, 53, 53,
-#if CONFIG_EXT_PARTITION
- 53, 53,
-#endif
+ 69, 69, 69, 67, 68, 68, 53, 53, 53, 53, 53, 53,
+ 53, 53, 53, 53, 69, 69, 67, 67, 53, 53, 53, 53,
},
{
- 70, 73, 73, 70, 73, 73, 58, 58, 58, 58, 58, 58, 58,
-#if CONFIG_EXT_PARTITION
- 58, 58, 58,
-#endif
- 70, 70, 70, 70, 58, 58,
-#if CONFIG_EXT_PARTITION
- 58, 58,
-#endif
+ 70, 73, 73, 70, 73, 73, 58, 58, 58, 58, 58, 58,
+ 58, 58, 58, 58, 70, 70, 70, 70, 58, 58, 58, 58,
}
};
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 1b0a562..883f4f9 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -304,11 +304,9 @@
sf->inter_mode_mask[BLOCK_32X64] = INTER_NEAREST;
sf->inter_mode_mask[BLOCK_64X32] = INTER_NEAREST;
sf->inter_mode_mask[BLOCK_64X64] = INTER_NEAREST;
-#if CONFIG_EXT_PARTITION
sf->inter_mode_mask[BLOCK_64X128] = INTER_NEAREST;
sf->inter_mode_mask[BLOCK_128X64] = INTER_NEAREST;
sf->inter_mode_mask[BLOCK_128X128] = INTER_NEAREST;
-#endif // CONFIG_EXT_PARTITION
sf->partition_search_type = REFERENCE_PARTITION;
sf->default_min_partition_size = BLOCK_8X8;
sf->reuse_inter_pred_sby = 1;
diff --git a/examples/inspect.c b/examples/inspect.c
index b0c7f30..8e4cb14 100644
--- a/examples/inspect.c
+++ b/examples/inspect.c
@@ -143,22 +143,19 @@
ENUM(ALTREF2_FRAME), ENUM(ALTREF_FRAME), LAST_ENUM
};
-const map_entry block_size_map[] = {
- ENUM(BLOCK_4X4), ENUM(BLOCK_4X8), ENUM(BLOCK_8X4),
- ENUM(BLOCK_8X8), ENUM(BLOCK_8X16), ENUM(BLOCK_16X8),
- ENUM(BLOCK_16X16), ENUM(BLOCK_16X32), ENUM(BLOCK_32X16),
- ENUM(BLOCK_32X32), ENUM(BLOCK_32X64), ENUM(BLOCK_64X32),
- ENUM(BLOCK_64X64),
-#if CONFIG_EXT_PARTITION
- ENUM(BLOCK_64X128), ENUM(BLOCK_128X64), ENUM(BLOCK_128X128),
-#endif
- ENUM(BLOCK_4X16), ENUM(BLOCK_16X4), ENUM(BLOCK_8X32),
- ENUM(BLOCK_32X8), ENUM(BLOCK_16X64), ENUM(BLOCK_64X16),
-#if CONFIG_EXT_PARTITION
- ENUM(BLOCK_32X128), ENUM(BLOCK_128X32),
-#endif
- LAST_ENUM
-};
+const map_entry block_size_map[] = { ENUM(BLOCK_4X4), ENUM(BLOCK_4X8),
+ ENUM(BLOCK_8X4), ENUM(BLOCK_8X8),
+ ENUM(BLOCK_8X16), ENUM(BLOCK_16X8),
+ ENUM(BLOCK_16X16), ENUM(BLOCK_16X32),
+ ENUM(BLOCK_32X16), ENUM(BLOCK_32X32),
+ ENUM(BLOCK_32X64), ENUM(BLOCK_64X32),
+ ENUM(BLOCK_64X64), ENUM(BLOCK_64X128),
+ ENUM(BLOCK_128X64), ENUM(BLOCK_128X128),
+ ENUM(BLOCK_4X16), ENUM(BLOCK_16X4),
+ ENUM(BLOCK_8X32), ENUM(BLOCK_32X8),
+ ENUM(BLOCK_16X64), ENUM(BLOCK_64X16),
+ ENUM(BLOCK_32X128), ENUM(BLOCK_128X32),
+ LAST_ENUM };
const map_entry tx_size_map[] = {
ENUM(TX_4X4), ENUM(TX_8X8), ENUM(TX_16X16), ENUM(TX_32X32),
diff --git a/test/av1_ext_tile_test.cc b/test/av1_ext_tile_test.cc
index 9aa3d75..8e93c39 100644
--- a/test/av1_ext_tile_test.cc
+++ b/test/av1_ext_tile_test.cc
@@ -87,10 +87,8 @@
encoder->Control(AV1E_SET_TILE_ROWS, kTileSize);
// TODO(yunqingwang): test single_tile_decoding = 0.
encoder->Control(AV1E_SET_SINGLE_TILE_DECODING, 1);
-#if CONFIG_EXT_PARTITION
// Always use 64x64 max partition.
encoder->Control(AV1E_SET_SUPERBLOCK_SIZE, AOM_SUPERBLOCK_SIZE_64X64);
-#endif
#if CONFIG_LOOPFILTERING_ACROSS_TILES
#if CONFIG_LOOPFILTERING_ACROSS_TILES_EXT
encoder->Control(AV1E_SET_TILE_LOOPFILTER_V, 0);
diff --git a/test/convolve_test.cc b/test/convolve_test.cc
index 7d7e253..f6e770b 100644
--- a/test/convolve_test.cc
+++ b/test/convolve_test.cc
@@ -76,13 +76,13 @@
make_tuple(64, 32, &convolve_fn), make_tuple(32, 64, &convolve_fn), \
make_tuple(64, 64, &convolve_fn)
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
#define ALL_SIZES(convolve_fn) \
make_tuple(128, 64, &convolve_fn), make_tuple(64, 128, &convolve_fn), \
make_tuple(128, 128, &convolve_fn), ALL_SIZES_64(convolve_fn)
#else
#define ALL_SIZES ALL_SIZES_64
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
// Reference 8-tap subpixel filter, slightly modified to fit into this test.
#define AV1_FILTER_WEIGHT 128
@@ -1167,7 +1167,7 @@
#endif // HAVE_AVX2
// TODO(any): Make NEON versions support 128x128 128x64 64x128 block sizes
-#if HAVE_NEON && !(CONFIG_AV1 && CONFIG_EXT_PARTITION)
+#if HAVE_NEON && !(CONFIG_AV1)
#if HAVE_NEON_ASM
const ConvolveFunctions convolve8_neon(
aom_convolve_copy_neon, aom_convolve_avg_neon, aom_convolve8_horiz_neon,
@@ -1187,10 +1187,10 @@
const ConvolveParam kArrayConvolve8_neon[] = { ALL_SIZES_64(convolve8_neon) };
INSTANTIATE_TEST_CASE_P(NEON, ConvolveTest,
::testing::ValuesIn(kArrayConvolve8_neon));
-#endif // HAVE_NEON && !(CONFIG_AV1 && CONFIG_EXT_PARTITION)
+#endif // HAVE_NEON && !(CONFIG_AV1)
// TODO(any): Make DSPR2 versions support 128x128 128x64 64x128 block sizes
-#if HAVE_DSPR2 && !(CONFIG_AV1 && CONFIG_EXT_PARTITION)
+#if HAVE_DSPR2 && !(CONFIG_AV1)
const ConvolveFunctions convolve8_dspr2(
aom_convolve_copy_dspr2, aom_convolve_avg_dspr2, aom_convolve8_horiz_dspr2,
aom_convolve8_avg_horiz_dspr2, aom_convolve8_vert_dspr2,
@@ -1201,10 +1201,10 @@
const ConvolveParam kArrayConvolve8_dspr2[] = { ALL_SIZES_64(convolve8_dspr2) };
INSTANTIATE_TEST_CASE_P(DSPR2, ConvolveTest,
::testing::ValuesIn(kArrayConvolve8_dspr2));
-#endif // HAVE_DSPR2 && !(CONFIG_AV1 && CONFIG_EXT_PARTITION)
+#endif // HAVE_DSPR2 && !(CONFIG_AV1)
// TODO(any): Make MSA versions support 128x128 128x64 64x128 block sizes
-#if HAVE_MSA && !(CONFIG_AV1 && CONFIG_EXT_PARTITION)
+#if HAVE_MSA && !(CONFIG_AV1)
const ConvolveFunctions convolve8_msa(
aom_convolve_copy_msa, aom_convolve_avg_msa, aom_convolve8_horiz_msa,
aom_convolve8_avg_horiz_msa, aom_convolve8_vert_msa,
@@ -1215,5 +1215,5 @@
const ConvolveParam kArrayConvolve8_msa[] = { ALL_SIZES_64(convolve8_msa) };
INSTANTIATE_TEST_CASE_P(MSA, ConvolveTest,
::testing::ValuesIn(kArrayConvolve8_msa));
-#endif // HAVE_MSA && !(CONFIG_AV1 && CONFIG_EXT_PARTITION)
+#endif // HAVE_MSA && !(CONFIG_AV1)
} // namespace
diff --git a/test/intrabc_test.cc b/test/intrabc_test.cc
index d8fd0d4..09d40e4 100644
--- a/test/intrabc_test.cc
+++ b/test/intrabc_test.cc
@@ -29,9 +29,7 @@
const int kSubPelScale = 8;
const int kTileMaxMibWidth = 8;
const DvTestCase kDvCases[] = {
-#if CONFIG_EXT_PARTITION
{ { 0, 0 }, 0, 0, BLOCK_128X128, false },
-#endif
{ { 0, 0 }, 0, 0, BLOCK_64X64, false },
{ { 0, 0 }, 0, 0, BLOCK_32X32, false },
{ { 0, 0 }, 0, 0, BLOCK_16X16, false },
diff --git a/test/masked_sad_test.cc b/test/masked_sad_test.cc
index 928b47e..7af59cc 100644
--- a/test/masked_sad_test.cc
+++ b/test/masked_sad_test.cc
@@ -159,11 +159,9 @@
#if HAVE_SSSE3
const MaskedSADParam msad_test[] = {
-#if CONFIG_EXT_PARTITION
make_tuple(&aom_masked_sad128x128_ssse3, &aom_masked_sad128x128_c),
make_tuple(&aom_masked_sad128x64_ssse3, &aom_masked_sad128x64_c),
make_tuple(&aom_masked_sad64x128_ssse3, &aom_masked_sad64x128_c),
-#endif // CONFIG_EXT_PARTITION
make_tuple(&aom_masked_sad64x64_ssse3, &aom_masked_sad64x64_c),
make_tuple(&aom_masked_sad64x32_ssse3, &aom_masked_sad64x32_c),
make_tuple(&aom_masked_sad32x64_ssse3, &aom_masked_sad32x64_c),
@@ -182,14 +180,12 @@
INSTANTIATE_TEST_CASE_P(SSSE3_C_COMPARE, MaskedSADTest,
::testing::ValuesIn(msad_test));
const HighbdMaskedSADParam hbd_msad_test[] = {
-#if CONFIG_EXT_PARTITION
make_tuple(&aom_highbd_masked_sad128x128_ssse3,
&aom_highbd_masked_sad128x128_c),
make_tuple(&aom_highbd_masked_sad128x64_ssse3,
&aom_highbd_masked_sad128x64_c),
make_tuple(&aom_highbd_masked_sad64x128_ssse3,
&aom_highbd_masked_sad64x128_c),
-#endif // CONFIG_EXT_PARTITION
make_tuple(&aom_highbd_masked_sad64x64_ssse3, &aom_highbd_masked_sad64x64_c),
make_tuple(&aom_highbd_masked_sad64x32_ssse3, &aom_highbd_masked_sad64x32_c),
make_tuple(&aom_highbd_masked_sad32x64_ssse3, &aom_highbd_masked_sad32x64_c),
diff --git a/test/masked_variance_test.cc b/test/masked_variance_test.cc
index d01a84b..89470e2 100644
--- a/test/masked_variance_test.cc
+++ b/test/masked_variance_test.cc
@@ -316,14 +316,12 @@
#if HAVE_SSSE3
const MaskedSubPixelVarianceParam sub_pel_var_test[] = {
-#if CONFIG_EXT_PARTITION
make_tuple(&aom_masked_sub_pixel_variance128x128_ssse3,
&aom_masked_sub_pixel_variance128x128_c),
make_tuple(&aom_masked_sub_pixel_variance128x64_ssse3,
&aom_masked_sub_pixel_variance128x64_c),
make_tuple(&aom_masked_sub_pixel_variance64x128_ssse3,
&aom_masked_sub_pixel_variance64x128_c),
-#endif // CONFIG_EXT_PARTITION
make_tuple(&aom_masked_sub_pixel_variance64x64_ssse3,
&aom_masked_sub_pixel_variance64x64_c),
make_tuple(&aom_masked_sub_pixel_variance64x32_ssse3,
@@ -356,14 +354,12 @@
::testing::ValuesIn(sub_pel_var_test));
const HighbdMaskedSubPixelVarianceParam hbd_sub_pel_var_test[] = {
-#if CONFIG_EXT_PARTITION
make_tuple(&aom_highbd_8_masked_sub_pixel_variance128x128_ssse3,
&aom_highbd_8_masked_sub_pixel_variance128x128_c, AOM_BITS_8),
make_tuple(&aom_highbd_8_masked_sub_pixel_variance128x64_ssse3,
&aom_highbd_8_masked_sub_pixel_variance128x64_c, AOM_BITS_8),
make_tuple(&aom_highbd_8_masked_sub_pixel_variance64x128_ssse3,
&aom_highbd_8_masked_sub_pixel_variance64x128_c, AOM_BITS_8),
-#endif // CONFIG_EXT_PARTITION
make_tuple(&aom_highbd_8_masked_sub_pixel_variance64x64_ssse3,
&aom_highbd_8_masked_sub_pixel_variance64x64_c, AOM_BITS_8),
make_tuple(&aom_highbd_8_masked_sub_pixel_variance64x32_ssse3,
@@ -390,14 +386,12 @@
&aom_highbd_8_masked_sub_pixel_variance4x8_c, AOM_BITS_8),
make_tuple(&aom_highbd_8_masked_sub_pixel_variance4x4_ssse3,
&aom_highbd_8_masked_sub_pixel_variance4x4_c, AOM_BITS_8),
-#if CONFIG_EXT_PARTITION
make_tuple(&aom_highbd_10_masked_sub_pixel_variance128x128_ssse3,
&aom_highbd_10_masked_sub_pixel_variance128x128_c, AOM_BITS_10),
make_tuple(&aom_highbd_10_masked_sub_pixel_variance128x64_ssse3,
&aom_highbd_10_masked_sub_pixel_variance128x64_c, AOM_BITS_10),
make_tuple(&aom_highbd_10_masked_sub_pixel_variance64x128_ssse3,
&aom_highbd_10_masked_sub_pixel_variance64x128_c, AOM_BITS_10),
-#endif // CONFIG_EXT_PARTITION
make_tuple(&aom_highbd_10_masked_sub_pixel_variance64x64_ssse3,
&aom_highbd_10_masked_sub_pixel_variance64x64_c, AOM_BITS_10),
make_tuple(&aom_highbd_10_masked_sub_pixel_variance64x32_ssse3,
@@ -424,14 +418,12 @@
&aom_highbd_10_masked_sub_pixel_variance4x8_c, AOM_BITS_10),
make_tuple(&aom_highbd_10_masked_sub_pixel_variance4x4_ssse3,
&aom_highbd_10_masked_sub_pixel_variance4x4_c, AOM_BITS_10),
-#if CONFIG_EXT_PARTITION
make_tuple(&aom_highbd_12_masked_sub_pixel_variance128x128_ssse3,
&aom_highbd_12_masked_sub_pixel_variance128x128_c, AOM_BITS_12),
make_tuple(&aom_highbd_12_masked_sub_pixel_variance128x64_ssse3,
&aom_highbd_12_masked_sub_pixel_variance128x64_c, AOM_BITS_12),
make_tuple(&aom_highbd_12_masked_sub_pixel_variance64x128_ssse3,
&aom_highbd_12_masked_sub_pixel_variance64x128_c, AOM_BITS_12),
-#endif // CONFIG_EXT_PARTITION
make_tuple(&aom_highbd_12_masked_sub_pixel_variance64x64_ssse3,
&aom_highbd_12_masked_sub_pixel_variance64x64_c, AOM_BITS_12),
make_tuple(&aom_highbd_12_masked_sub_pixel_variance64x32_ssse3,
diff --git a/test/obmc_sad_test.cc b/test/obmc_sad_test.cc
index 317f0f5..64fd81d 100644
--- a/test/obmc_sad_test.cc
+++ b/test/obmc_sad_test.cc
@@ -85,11 +85,9 @@
#if HAVE_SSE4_1
const ObmcSadTest::ParamType sse4_functions[] = {
-#if CONFIG_EXT_PARTITION
TestFuncs(aom_obmc_sad128x128_c, aom_obmc_sad128x128_sse4_1),
TestFuncs(aom_obmc_sad128x64_c, aom_obmc_sad128x64_sse4_1),
TestFuncs(aom_obmc_sad64x128_c, aom_obmc_sad64x128_sse4_1),
-#endif // CONFIG_EXT_PARTITION
TestFuncs(aom_obmc_sad64x64_c, aom_obmc_sad64x64_sse4_1),
TestFuncs(aom_obmc_sad64x32_c, aom_obmc_sad64x32_sse4_1),
TestFuncs(aom_obmc_sad32x64_c, aom_obmc_sad32x64_sse4_1),
@@ -167,11 +165,9 @@
#if HAVE_SSE4_1
ObmcSadHBDTest::ParamType sse4_functions_hbd[] = {
-#if CONFIG_EXT_PARTITION
TestFuncs(aom_highbd_obmc_sad128x128_c, aom_highbd_obmc_sad128x128_sse4_1),
TestFuncs(aom_highbd_obmc_sad128x64_c, aom_highbd_obmc_sad128x64_sse4_1),
TestFuncs(aom_highbd_obmc_sad64x128_c, aom_highbd_obmc_sad64x128_sse4_1),
-#endif // CONFIG_EXT_PARTITION
TestFuncs(aom_highbd_obmc_sad64x64_c, aom_highbd_obmc_sad64x64_sse4_1),
TestFuncs(aom_highbd_obmc_sad64x32_c, aom_highbd_obmc_sad64x32_sse4_1),
TestFuncs(aom_highbd_obmc_sad32x64_c, aom_highbd_obmc_sad32x64_sse4_1),
diff --git a/test/obmc_variance_test.cc b/test/obmc_variance_test.cc
index ed6c4c1..5fc1e9c 100644
--- a/test/obmc_variance_test.cc
+++ b/test/obmc_variance_test.cc
@@ -94,11 +94,9 @@
#if HAVE_SSE4_1
const ObmcVarianceTest::ParamType sse4_functions[] = {
-#if CONFIG_EXT_PARTITION
TestFuncs(aom_obmc_variance128x128_c, aom_obmc_variance128x128_sse4_1),
TestFuncs(aom_obmc_variance128x64_c, aom_obmc_variance128x64_sse4_1),
TestFuncs(aom_obmc_variance64x128_c, aom_obmc_variance64x128_sse4_1),
-#endif // CONFIG_EXT_PARTITION
TestFuncs(aom_obmc_variance64x64_c, aom_obmc_variance64x64_sse4_1),
TestFuncs(aom_obmc_variance64x32_c, aom_obmc_variance64x32_sse4_1),
TestFuncs(aom_obmc_variance32x64_c, aom_obmc_variance32x64_sse4_1),
@@ -181,14 +179,12 @@
#if HAVE_SSE4_1
ObmcVarianceHBDTest::ParamType sse4_functions_hbd[] = {
-#if CONFIG_EXT_PARTITION
TestFuncs(aom_highbd_obmc_variance128x128_c,
aom_highbd_obmc_variance128x128_sse4_1, 8),
TestFuncs(aom_highbd_obmc_variance128x64_c,
aom_highbd_obmc_variance128x64_sse4_1, 8),
TestFuncs(aom_highbd_obmc_variance64x128_c,
aom_highbd_obmc_variance64x128_sse4_1, 8),
-#endif // CONFIG_EXT_PARTITION
TestFuncs(aom_highbd_obmc_variance64x64_c,
aom_highbd_obmc_variance64x64_sse4_1, 8),
TestFuncs(aom_highbd_obmc_variance64x32_c,
@@ -215,14 +211,12 @@
8),
TestFuncs(aom_highbd_obmc_variance4x4_c, aom_highbd_obmc_variance4x4_sse4_1,
8),
-#if CONFIG_EXT_PARTITION
TestFuncs(aom_highbd_10_obmc_variance128x128_c,
aom_highbd_10_obmc_variance128x128_sse4_1, 10),
TestFuncs(aom_highbd_10_obmc_variance128x64_c,
aom_highbd_10_obmc_variance128x64_sse4_1, 10),
TestFuncs(aom_highbd_10_obmc_variance64x128_c,
aom_highbd_10_obmc_variance64x128_sse4_1, 10),
-#endif // CONFIG_EXT_PARTITION
TestFuncs(aom_highbd_10_obmc_variance64x64_c,
aom_highbd_10_obmc_variance64x64_sse4_1, 10),
TestFuncs(aom_highbd_10_obmc_variance64x32_c,
@@ -249,14 +243,12 @@
aom_highbd_10_obmc_variance4x8_sse4_1, 10),
TestFuncs(aom_highbd_10_obmc_variance4x4_c,
aom_highbd_10_obmc_variance4x4_sse4_1, 10),
-#if CONFIG_EXT_PARTITION
TestFuncs(aom_highbd_12_obmc_variance128x128_c,
aom_highbd_12_obmc_variance128x128_sse4_1, 12),
TestFuncs(aom_highbd_12_obmc_variance128x64_c,
aom_highbd_12_obmc_variance128x64_sse4_1, 12),
TestFuncs(aom_highbd_12_obmc_variance64x128_c,
aom_highbd_12_obmc_variance64x128_sse4_1, 12),
-#endif // CONFIG_EXT_PARTITION
TestFuncs(aom_highbd_12_obmc_variance64x64_c,
aom_highbd_12_obmc_variance64x64_sse4_1, 12),
TestFuncs(aom_highbd_12_obmc_variance64x32_c,
diff --git a/test/sad_test.cc b/test/sad_test.cc
index 40cb9e6..ae08ed0 100644
--- a/test/sad_test.cc
+++ b/test/sad_test.cc
@@ -838,11 +838,11 @@
//------------------------------------------------------------------------------
// C functions
const SadMxNParam c_tests[] = {
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
make_tuple(128, 128, &aom_sad128x128_c, -1),
make_tuple(128, 64, &aom_sad128x64_c, -1),
make_tuple(64, 128, &aom_sad64x128_c, -1),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
make_tuple(64, 64, &aom_sad64x64_c, -1),
make_tuple(64, 32, &aom_sad64x32_c, -1),
make_tuple(32, 64, &aom_sad32x64_c, -1),
@@ -856,11 +856,11 @@
make_tuple(8, 4, &aom_sad8x4_c, -1),
make_tuple(4, 8, &aom_sad4x8_c, -1),
make_tuple(4, 4, &aom_sad4x4_c, -1),
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
make_tuple(128, 128, &aom_highbd_sad128x128_c, 8),
make_tuple(128, 64, &aom_highbd_sad128x64_c, 8),
make_tuple(64, 128, &aom_highbd_sad64x128_c, 8),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
make_tuple(64, 64, &aom_highbd_sad64x64_c, 8),
make_tuple(64, 32, &aom_highbd_sad64x32_c, 8),
make_tuple(32, 64, &aom_highbd_sad32x64_c, 8),
@@ -874,11 +874,11 @@
make_tuple(8, 4, &aom_highbd_sad8x4_c, 8),
make_tuple(4, 8, &aom_highbd_sad4x8_c, 8),
make_tuple(4, 4, &aom_highbd_sad4x4_c, 8),
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
make_tuple(128, 128, &aom_highbd_sad128x128_c, 10),
make_tuple(128, 64, &aom_highbd_sad128x64_c, 10),
make_tuple(64, 128, &aom_highbd_sad64x128_c, 10),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
make_tuple(64, 64, &aom_highbd_sad64x64_c, 10),
make_tuple(64, 32, &aom_highbd_sad64x32_c, 10),
make_tuple(32, 64, &aom_highbd_sad32x64_c, 10),
@@ -892,11 +892,11 @@
make_tuple(8, 4, &aom_highbd_sad8x4_c, 10),
make_tuple(4, 8, &aom_highbd_sad4x8_c, 10),
make_tuple(4, 4, &aom_highbd_sad4x4_c, 10),
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
make_tuple(128, 128, &aom_highbd_sad128x128_c, 12),
make_tuple(128, 64, &aom_highbd_sad128x64_c, 12),
make_tuple(64, 128, &aom_highbd_sad64x128_c, 12),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
make_tuple(64, 64, &aom_highbd_sad64x64_c, 12),
make_tuple(64, 32, &aom_highbd_sad64x32_c, 12),
make_tuple(32, 64, &aom_highbd_sad32x64_c, 12),
@@ -914,11 +914,11 @@
INSTANTIATE_TEST_CASE_P(C, SADTest, ::testing::ValuesIn(c_tests));
const SadMxNAvgParam avg_c_tests[] = {
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
make_tuple(128, 128, &aom_sad128x128_avg_c, -1),
make_tuple(128, 64, &aom_sad128x64_avg_c, -1),
make_tuple(64, 128, &aom_sad64x128_avg_c, -1),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
make_tuple(64, 64, &aom_sad64x64_avg_c, -1),
make_tuple(64, 32, &aom_sad64x32_avg_c, -1),
make_tuple(32, 64, &aom_sad32x64_avg_c, -1),
@@ -932,11 +932,11 @@
make_tuple(8, 4, &aom_sad8x4_avg_c, -1),
make_tuple(4, 8, &aom_sad4x8_avg_c, -1),
make_tuple(4, 4, &aom_sad4x4_avg_c, -1),
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
make_tuple(128, 128, &aom_highbd_sad128x128_avg_c, 8),
make_tuple(128, 64, &aom_highbd_sad128x64_avg_c, 8),
make_tuple(64, 128, &aom_highbd_sad64x128_avg_c, 8),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
make_tuple(64, 64, &aom_highbd_sad64x64_avg_c, 8),
make_tuple(64, 32, &aom_highbd_sad64x32_avg_c, 8),
make_tuple(32, 64, &aom_highbd_sad32x64_avg_c, 8),
@@ -950,11 +950,11 @@
make_tuple(8, 4, &aom_highbd_sad8x4_avg_c, 8),
make_tuple(4, 8, &aom_highbd_sad4x8_avg_c, 8),
make_tuple(4, 4, &aom_highbd_sad4x4_avg_c, 8),
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
make_tuple(128, 128, &aom_highbd_sad128x128_avg_c, 10),
make_tuple(128, 64, &aom_highbd_sad128x64_avg_c, 10),
make_tuple(64, 128, &aom_highbd_sad64x128_avg_c, 10),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
make_tuple(64, 64, &aom_highbd_sad64x64_avg_c, 10),
make_tuple(64, 32, &aom_highbd_sad64x32_avg_c, 10),
make_tuple(32, 64, &aom_highbd_sad32x64_avg_c, 10),
@@ -968,11 +968,11 @@
make_tuple(8, 4, &aom_highbd_sad8x4_avg_c, 10),
make_tuple(4, 8, &aom_highbd_sad4x8_avg_c, 10),
make_tuple(4, 4, &aom_highbd_sad4x4_avg_c, 10),
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
make_tuple(128, 128, &aom_highbd_sad128x128_avg_c, 12),
make_tuple(128, 64, &aom_highbd_sad128x64_avg_c, 12),
make_tuple(64, 128, &aom_highbd_sad64x128_avg_c, 12),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
make_tuple(64, 64, &aom_highbd_sad64x64_avg_c, 12),
make_tuple(64, 32, &aom_highbd_sad64x32_avg_c, 12),
make_tuple(32, 64, &aom_highbd_sad32x64_avg_c, 12),
@@ -992,11 +992,11 @@
#if CONFIG_JNT_COMP
// TODO(chengchen): add highbd tests
const JntCompAvgParam jnt_comp_avg_c_tests[] = {
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
make_tuple(128, 128, &aom_jnt_comp_avg_pred_c, -1),
make_tuple(128, 64, &aom_jnt_comp_avg_pred_c, -1),
make_tuple(64, 128, &aom_jnt_comp_avg_pred_c, -1),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
make_tuple(64, 64, &aom_jnt_comp_avg_pred_c, -1),
make_tuple(64, 32, &aom_jnt_comp_avg_pred_c, -1),
make_tuple(32, 64, &aom_jnt_comp_avg_pred_c, -1),
@@ -1016,11 +1016,11 @@
::testing::ValuesIn(jnt_comp_avg_c_tests));
const JntSadMxNAvgParam jnt_avg_c_tests[] = {
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
make_tuple(128, 128, &aom_jnt_sad128x128_avg_c, -1),
make_tuple(128, 64, &aom_jnt_sad128x64_avg_c, -1),
make_tuple(64, 128, &aom_jnt_sad64x128_avg_c, -1),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
make_tuple(64, 64, &aom_jnt_sad64x64_avg_c, -1),
make_tuple(64, 32, &aom_jnt_sad64x32_avg_c, -1),
make_tuple(32, 64, &aom_jnt_sad32x64_avg_c, -1),
@@ -1039,11 +1039,11 @@
#endif // CONFIG_JNT_COMP
const SadMxNx4Param x4d_c_tests[] = {
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
make_tuple(128, 128, &aom_sad128x128x4d_c, -1),
make_tuple(128, 64, &aom_sad128x64x4d_c, -1),
make_tuple(64, 128, &aom_sad64x128x4d_c, -1),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
make_tuple(64, 64, &aom_sad64x64x4d_c, -1),
make_tuple(64, 32, &aom_sad64x32x4d_c, -1),
make_tuple(32, 64, &aom_sad32x64x4d_c, -1),
@@ -1057,11 +1057,11 @@
make_tuple(8, 4, &aom_sad8x4x4d_c, -1),
make_tuple(4, 8, &aom_sad4x8x4d_c, -1),
make_tuple(4, 4, &aom_sad4x4x4d_c, -1),
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
make_tuple(128, 128, &aom_highbd_sad128x128x4d_c, 8),
make_tuple(128, 64, &aom_highbd_sad128x64x4d_c, 8),
make_tuple(64, 128, &aom_highbd_sad64x128x4d_c, 8),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
make_tuple(64, 64, &aom_highbd_sad64x64x4d_c, 8),
make_tuple(64, 32, &aom_highbd_sad64x32x4d_c, 8),
make_tuple(32, 64, &aom_highbd_sad32x64x4d_c, 8),
@@ -1075,11 +1075,11 @@
make_tuple(8, 4, &aom_highbd_sad8x4x4d_c, 8),
make_tuple(4, 8, &aom_highbd_sad4x8x4d_c, 8),
make_tuple(4, 4, &aom_highbd_sad4x4x4d_c, 8),
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
make_tuple(128, 128, &aom_highbd_sad128x128x4d_c, 10),
make_tuple(128, 64, &aom_highbd_sad128x64x4d_c, 10),
make_tuple(64, 128, &aom_highbd_sad64x128x4d_c, 10),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
make_tuple(64, 64, &aom_highbd_sad64x64x4d_c, 10),
make_tuple(64, 32, &aom_highbd_sad64x32x4d_c, 10),
make_tuple(32, 64, &aom_highbd_sad32x64x4d_c, 10),
@@ -1093,11 +1093,11 @@
make_tuple(8, 4, &aom_highbd_sad8x4x4d_c, 10),
make_tuple(4, 8, &aom_highbd_sad4x8x4d_c, 10),
make_tuple(4, 4, &aom_highbd_sad4x4x4d_c, 10),
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
make_tuple(128, 128, &aom_highbd_sad128x128x4d_c, 12),
make_tuple(128, 64, &aom_highbd_sad128x64x4d_c, 12),
make_tuple(64, 128, &aom_highbd_sad64x128x4d_c, 12),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
make_tuple(64, 64, &aom_highbd_sad64x64x4d_c, 12),
make_tuple(64, 32, &aom_highbd_sad64x32x4d_c, 12),
make_tuple(32, 64, &aom_highbd_sad32x64x4d_c, 12),
@@ -1140,11 +1140,11 @@
// x86 functions
#if HAVE_SSE2
const SadMxNParam sse2_tests[] = {
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
make_tuple(128, 128, &aom_sad128x128_sse2, -1),
make_tuple(128, 64, &aom_sad128x64_sse2, -1),
make_tuple(64, 128, &aom_sad64x128_sse2, -1),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
make_tuple(64, 64, &aom_sad64x64_sse2, -1),
make_tuple(64, 32, &aom_sad64x32_sse2, -1),
make_tuple(32, 64, &aom_sad32x64_sse2, -1),
@@ -1195,11 +1195,11 @@
INSTANTIATE_TEST_CASE_P(SSE2, SADTest, ::testing::ValuesIn(sse2_tests));
const SadMxNAvgParam avg_sse2_tests[] = {
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
make_tuple(128, 128, &aom_sad128x128_avg_sse2, -1),
make_tuple(128, 64, &aom_sad128x64_avg_sse2, -1),
make_tuple(64, 128, &aom_sad64x128_avg_sse2, -1),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
make_tuple(64, 64, &aom_sad64x64_avg_sse2, -1),
make_tuple(64, 32, &aom_sad64x32_avg_sse2, -1),
make_tuple(32, 64, &aom_sad32x64_avg_sse2, -1),
@@ -1250,11 +1250,11 @@
INSTANTIATE_TEST_CASE_P(SSE2, SADavgTest, ::testing::ValuesIn(avg_sse2_tests));
const SadMxNx4Param x4d_sse2_tests[] = {
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
make_tuple(128, 128, &aom_sad128x128x4d_sse2, -1),
make_tuple(128, 64, &aom_sad128x64x4d_sse2, -1),
make_tuple(64, 128, &aom_sad64x128x4d_sse2, -1),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
make_tuple(64, 64, &aom_sad64x64x4d_sse2, -1),
make_tuple(64, 32, &aom_sad64x32x4d_sse2, -1),
make_tuple(32, 64, &aom_sad32x64x4d_sse2, -1),
@@ -1325,11 +1325,9 @@
make_tuple(32, 64, &aom_sad32xh_sse2, -1),
make_tuple(64, 32, &aom_sad64xh_sse2, -1),
make_tuple(64, 64, &aom_sad64xh_sse2, -1),
-#if CONFIG_EXT_PARTITION
make_tuple(128, 128, &aom_sad128xh_sse2, -1),
make_tuple(128, 64, &aom_sad128xh_sse2, -1),
make_tuple(64, 128, &aom_sad64xh_sse2, -1),
-#endif // CONFIG_EXT_PARTITION
#if CONFIG_EXT_PARTITION_TYPES
make_tuple(4, 16, &aom_sad4xh_sse2, -1),
make_tuple(16, 4, &aom_sad16xh_sse2, -1),
@@ -1354,11 +1352,11 @@
#if HAVE_SSSE3
#if CONFIG_JNT_COMP
const JntCompAvgParam jnt_comp_avg_ssse3_tests[] = {
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
make_tuple(128, 128, &aom_jnt_comp_avg_pred_ssse3, -1),
make_tuple(128, 64, &aom_jnt_comp_avg_pred_ssse3, -1),
make_tuple(64, 128, &aom_jnt_comp_avg_pred_ssse3, -1),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
make_tuple(64, 64, &aom_jnt_comp_avg_pred_ssse3, -1),
make_tuple(64, 32, &aom_jnt_comp_avg_pred_ssse3, -1),
make_tuple(32, 64, &aom_jnt_comp_avg_pred_ssse3, -1),
@@ -1379,11 +1377,11 @@
::testing::ValuesIn(jnt_comp_avg_ssse3_tests));
const JntSadMxNAvgParam jnt_avg_ssse3_tests[] = {
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
make_tuple(128, 128, &aom_jnt_sad128x128_avg_ssse3, -1),
make_tuple(128, 64, &aom_jnt_sad128x64_avg_ssse3, -1),
make_tuple(64, 128, &aom_jnt_sad64x128_avg_ssse3, -1),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
make_tuple(64, 64, &aom_jnt_sad64x64_avg_ssse3, -1),
make_tuple(64, 32, &aom_jnt_sad64x32_avg_ssse3, -1),
make_tuple(32, 64, &aom_jnt_sad32x64_avg_ssse3, -1),
@@ -1409,17 +1407,14 @@
#if HAVE_AVX2
const SadMxNParam avx2_tests[] = {
-#if CONFIG_EXT_PARTITION
make_tuple(64, 128, &aom_sad64x128_avx2, -1),
make_tuple(128, 64, &aom_sad128x64_avx2, -1),
make_tuple(128, 128, &aom_sad128x128_avx2, -1),
-#endif
make_tuple(64, 64, &aom_sad64x64_avx2, -1),
make_tuple(64, 32, &aom_sad64x32_avx2, -1),
make_tuple(32, 64, &aom_sad32x64_avx2, -1),
make_tuple(32, 32, &aom_sad32x32_avx2, -1),
make_tuple(32, 16, &aom_sad32x16_avx2, -1),
-#if CONFIG_EXT_PARTITION
make_tuple(128, 128, &aom_highbd_sad128x128_avx2, 8),
make_tuple(128, 128, &aom_highbd_sad128x128_avx2, 10),
make_tuple(128, 128, &aom_highbd_sad128x128_avx2, 12),
@@ -1429,7 +1424,6 @@
make_tuple(64, 128, &aom_highbd_sad64x128_avx2, 8),
make_tuple(64, 128, &aom_highbd_sad64x128_avx2, 10),
make_tuple(64, 128, &aom_highbd_sad64x128_avx2, 12),
-#endif
make_tuple(64, 64, &aom_highbd_sad64x64_avx2, 8),
make_tuple(64, 64, &aom_highbd_sad64x64_avx2, 10),
make_tuple(64, 64, &aom_highbd_sad64x64_avx2, 12),
@@ -1458,17 +1452,14 @@
INSTANTIATE_TEST_CASE_P(AVX2, SADTest, ::testing::ValuesIn(avx2_tests));
const SadMxNAvgParam avg_avx2_tests[] = {
-#if CONFIG_EXT_PARTITION
make_tuple(64, 128, &aom_sad64x128_avg_avx2, -1),
make_tuple(128, 64, &aom_sad128x64_avg_avx2, -1),
make_tuple(128, 128, &aom_sad128x128_avg_avx2, -1),
-#endif
make_tuple(64, 64, &aom_sad64x64_avg_avx2, -1),
make_tuple(64, 32, &aom_sad64x32_avg_avx2, -1),
make_tuple(32, 64, &aom_sad32x64_avg_avx2, -1),
make_tuple(32, 32, &aom_sad32x32_avg_avx2, -1),
make_tuple(32, 16, &aom_sad32x16_avg_avx2, -1),
-#if CONFIG_EXT_PARTITION
make_tuple(128, 128, &aom_highbd_sad128x128_avg_avx2, 8),
make_tuple(128, 128, &aom_highbd_sad128x128_avg_avx2, 10),
make_tuple(128, 128, &aom_highbd_sad128x128_avg_avx2, 12),
@@ -1478,7 +1469,6 @@
make_tuple(64, 128, &aom_highbd_sad64x128_avg_avx2, 8),
make_tuple(64, 128, &aom_highbd_sad64x128_avg_avx2, 10),
make_tuple(64, 128, &aom_highbd_sad64x128_avg_avx2, 12),
-#endif
make_tuple(64, 64, &aom_highbd_sad64x64_avg_avx2, 8),
make_tuple(64, 64, &aom_highbd_sad64x64_avg_avx2, 10),
make_tuple(64, 64, &aom_highbd_sad64x64_avg_avx2, 12),
@@ -1507,16 +1497,13 @@
INSTANTIATE_TEST_CASE_P(AVX2, SADavgTest, ::testing::ValuesIn(avg_avx2_tests));
const SadMxNx4Param x4d_avx2_tests[] = {
-#if CONFIG_EXT_PARTITION
make_tuple(64, 128, &aom_sad64x128x4d_avx2, -1),
make_tuple(128, 64, &aom_sad128x64x4d_avx2, -1),
make_tuple(128, 128, &aom_sad128x128x4d_avx2, -1),
-#endif
make_tuple(64, 64, &aom_sad64x64x4d_avx2, -1),
make_tuple(32, 64, &aom_sad32x64x4d_avx2, -1),
make_tuple(64, 32, &aom_sad64x32x4d_avx2, -1),
make_tuple(32, 32, &aom_sad32x32x4d_avx2, -1),
-#if CONFIG_EXT_PARTITION
make_tuple(128, 128, &aom_highbd_sad128x128x4d_avx2, 8),
make_tuple(128, 128, &aom_highbd_sad128x128x4d_avx2, 10),
make_tuple(128, 128, &aom_highbd_sad128x128x4d_avx2, 12),
@@ -1526,7 +1513,6 @@
make_tuple(64, 128, &aom_highbd_sad64x128x4d_avx2, 8),
make_tuple(64, 128, &aom_highbd_sad64x128x4d_avx2, 10),
make_tuple(64, 128, &aom_highbd_sad64x128x4d_avx2, 12),
-#endif
make_tuple(64, 64, &aom_highbd_sad64x64x4d_avx2, 8),
make_tuple(64, 64, &aom_highbd_sad64x64x4d_avx2, 10),
make_tuple(64, 64, &aom_highbd_sad64x64x4d_avx2, 12),
diff --git a/test/subtract_test.cc b/test/subtract_test.cc
index 47bd259..75c999aa 100644
--- a/test/subtract_test.cc
+++ b/test/subtract_test.cc
@@ -127,11 +127,7 @@
rnd_.Reset(ACMRandom::DeterministicSeed());
-#if CONFIG_EXT_PARTITION
const size_t max_width = 128;
-#else
- const size_t max_width = 64;
-#endif
const size_t max_block_size = max_width * max_width;
src_ = CONVERT_TO_BYTEPTR(reinterpret_cast<uint16_t *>(
aom_memalign(16, max_block_size * sizeof(uint16_t))));
@@ -164,11 +160,7 @@
void AV1HBDSubtractBlockTest::CheckResult() {
const int test_num = 100;
-#if CONFIG_EXT_PARTITION
const size_t max_width = 128;
-#else
- const size_t max_width = 64;
-#endif
const int max_block_size = max_width * max_width;
const int mask = (1 << bit_depth_) - 1;
int i, j;
@@ -197,11 +189,7 @@
void AV1HBDSubtractBlockTest::RunForSpeed() {
const int test_num = 200000;
-#if CONFIG_EXT_PARTITION
const size_t max_width = 128;
-#else
- const size_t max_width = 64;
-#endif
const int max_block_size = max_width * max_width;
const int mask = (1 << bit_depth_) - 1;
int i, j;
@@ -248,14 +236,12 @@
make_tuple(64, 32, 12, &aom_highbd_subtract_block_c),
make_tuple(64, 64, 12, &aom_highbd_subtract_block_sse2),
make_tuple(64, 64, 12, &aom_highbd_subtract_block_c),
-#if CONFIG_EXT_PARTITION
make_tuple(64, 128, 12, &aom_highbd_subtract_block_sse2),
make_tuple(64, 128, 12, &aom_highbd_subtract_block_c),
make_tuple(128, 64, 12, &aom_highbd_subtract_block_sse2),
make_tuple(128, 64, 12, &aom_highbd_subtract_block_c),
make_tuple(128, 128, 12, &aom_highbd_subtract_block_sse2),
make_tuple(128, 128, 12, &aom_highbd_subtract_block_c)
-#endif // CONFIG_EXT_PARTITION
};
INSTANTIATE_TEST_CASE_P(SSE2, AV1HBDSubtractBlockTest,
diff --git a/test/variance_test.cc b/test/variance_test.cc
index 9368a2b..5b5a690 100644
--- a/test/variance_test.cc
+++ b/test/variance_test.cc
@@ -944,11 +944,11 @@
*/
const VarianceParams kArrayHBDVariance_c[] = {
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
VarianceParams(7, 7, &aom_highbd_12_variance128x128_c, 12),
VarianceParams(7, 6, &aom_highbd_12_variance128x64_c, 12),
VarianceParams(6, 7, &aom_highbd_12_variance64x128_c, 12),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
VarianceParams(6, 6, &aom_highbd_12_variance64x64_c, 12),
VarianceParams(6, 5, &aom_highbd_12_variance64x32_c, 12),
VarianceParams(5, 6, &aom_highbd_12_variance32x64_c, 12),
@@ -962,11 +962,11 @@
VarianceParams(3, 2, &aom_highbd_12_variance8x4_c, 12),
VarianceParams(2, 3, &aom_highbd_12_variance4x8_c, 12),
VarianceParams(2, 2, &aom_highbd_12_variance4x4_c, 12),
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
VarianceParams(7, 7, &aom_highbd_10_variance128x128_c, 10),
VarianceParams(7, 6, &aom_highbd_10_variance128x64_c, 10),
VarianceParams(6, 7, &aom_highbd_10_variance64x128_c, 10),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
VarianceParams(6, 6, &aom_highbd_10_variance64x64_c, 10),
VarianceParams(6, 5, &aom_highbd_10_variance64x32_c, 10),
VarianceParams(5, 6, &aom_highbd_10_variance32x64_c, 10),
@@ -980,11 +980,11 @@
VarianceParams(3, 2, &aom_highbd_10_variance8x4_c, 10),
VarianceParams(2, 3, &aom_highbd_10_variance4x8_c, 10),
VarianceParams(2, 2, &aom_highbd_10_variance4x4_c, 10),
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
VarianceParams(7, 7, &aom_highbd_8_variance128x128_c, 8),
VarianceParams(7, 6, &aom_highbd_8_variance128x64_c, 8),
VarianceParams(6, 7, &aom_highbd_8_variance64x128_c, 8),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
VarianceParams(6, 6, &aom_highbd_8_variance64x64_c, 8),
VarianceParams(6, 5, &aom_highbd_8_variance64x32_c, 8),
VarianceParams(5, 6, &aom_highbd_8_variance32x64_c, 8),
@@ -1012,11 +1012,11 @@
#endif // HAVE_SSE4_1
const SubpelVarianceParams kArrayHBDSubpelVariance_c[] = {
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
SubpelVarianceParams(7, 7, &aom_highbd_8_sub_pixel_variance128x128_c, 8),
SubpelVarianceParams(7, 6, &aom_highbd_8_sub_pixel_variance128x64_c, 8),
SubpelVarianceParams(6, 7, &aom_highbd_8_sub_pixel_variance64x128_c, 8),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
SubpelVarianceParams(6, 6, &aom_highbd_8_sub_pixel_variance64x64_c, 8),
SubpelVarianceParams(6, 5, &aom_highbd_8_sub_pixel_variance64x32_c, 8),
SubpelVarianceParams(5, 6, &aom_highbd_8_sub_pixel_variance32x64_c, 8),
@@ -1030,11 +1030,11 @@
SubpelVarianceParams(3, 2, &aom_highbd_8_sub_pixel_variance8x4_c, 8),
SubpelVarianceParams(2, 3, &aom_highbd_8_sub_pixel_variance4x8_c, 8),
SubpelVarianceParams(2, 2, &aom_highbd_8_sub_pixel_variance4x4_c, 8),
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
SubpelVarianceParams(7, 7, &aom_highbd_10_sub_pixel_variance128x128_c, 10),
SubpelVarianceParams(7, 6, &aom_highbd_10_sub_pixel_variance128x64_c, 10),
SubpelVarianceParams(6, 7, &aom_highbd_10_sub_pixel_variance64x128_c, 10),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
SubpelVarianceParams(6, 6, &aom_highbd_10_sub_pixel_variance64x64_c, 10),
SubpelVarianceParams(6, 5, &aom_highbd_10_sub_pixel_variance64x32_c, 10),
SubpelVarianceParams(5, 6, &aom_highbd_10_sub_pixel_variance32x64_c, 10),
@@ -1048,11 +1048,11 @@
SubpelVarianceParams(3, 2, &aom_highbd_10_sub_pixel_variance8x4_c, 10),
SubpelVarianceParams(2, 3, &aom_highbd_10_sub_pixel_variance4x8_c, 10),
SubpelVarianceParams(2, 2, &aom_highbd_10_sub_pixel_variance4x4_c, 10),
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
SubpelVarianceParams(7, 7, &aom_highbd_12_sub_pixel_variance128x128_c, 12),
SubpelVarianceParams(7, 6, &aom_highbd_12_sub_pixel_variance128x64_c, 12),
SubpelVarianceParams(6, 7, &aom_highbd_12_sub_pixel_variance64x128_c, 12),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
SubpelVarianceParams(6, 6, &aom_highbd_12_sub_pixel_variance64x64_c, 12),
SubpelVarianceParams(6, 5, &aom_highbd_12_sub_pixel_variance64x32_c, 12),
SubpelVarianceParams(5, 6, &aom_highbd_12_sub_pixel_variance32x64_c, 12),
@@ -1071,14 +1071,14 @@
::testing::ValuesIn(kArrayHBDSubpelVariance_c));
const SubpelAvgVarianceParams kArrayHBDSubpelAvgVariance_c[] = {
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
SubpelAvgVarianceParams(7, 7, &aom_highbd_8_sub_pixel_avg_variance128x128_c,
8),
SubpelAvgVarianceParams(7, 6, &aom_highbd_8_sub_pixel_avg_variance128x64_c,
8),
SubpelAvgVarianceParams(6, 7, &aom_highbd_8_sub_pixel_avg_variance64x128_c,
8),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
SubpelAvgVarianceParams(6, 6, &aom_highbd_8_sub_pixel_avg_variance64x64_c, 8),
SubpelAvgVarianceParams(6, 5, &aom_highbd_8_sub_pixel_avg_variance64x32_c, 8),
SubpelAvgVarianceParams(5, 6, &aom_highbd_8_sub_pixel_avg_variance32x64_c, 8),
@@ -1092,14 +1092,14 @@
SubpelAvgVarianceParams(3, 2, &aom_highbd_8_sub_pixel_avg_variance8x4_c, 8),
SubpelAvgVarianceParams(2, 3, &aom_highbd_8_sub_pixel_avg_variance4x8_c, 8),
SubpelAvgVarianceParams(2, 2, &aom_highbd_8_sub_pixel_avg_variance4x4_c, 8),
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
SubpelAvgVarianceParams(7, 7, &aom_highbd_10_sub_pixel_avg_variance128x128_c,
10),
SubpelAvgVarianceParams(7, 6, &aom_highbd_10_sub_pixel_avg_variance128x64_c,
10),
SubpelAvgVarianceParams(6, 7, &aom_highbd_10_sub_pixel_avg_variance64x128_c,
10),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
SubpelAvgVarianceParams(6, 6, &aom_highbd_10_sub_pixel_avg_variance64x64_c,
10),
SubpelAvgVarianceParams(6, 5, &aom_highbd_10_sub_pixel_avg_variance64x32_c,
@@ -1122,14 +1122,14 @@
SubpelAvgVarianceParams(3, 2, &aom_highbd_10_sub_pixel_avg_variance8x4_c, 10),
SubpelAvgVarianceParams(2, 3, &aom_highbd_10_sub_pixel_avg_variance4x8_c, 10),
SubpelAvgVarianceParams(2, 2, &aom_highbd_10_sub_pixel_avg_variance4x4_c, 10),
-#if CONFIG_AV1 && CONFIG_EXT_PARTITION
+#if CONFIG_AV1
SubpelAvgVarianceParams(7, 7, &aom_highbd_12_sub_pixel_avg_variance128x128_c,
12),
SubpelAvgVarianceParams(7, 6, &aom_highbd_12_sub_pixel_avg_variance128x64_c,
12),
SubpelAvgVarianceParams(6, 7, &aom_highbd_12_sub_pixel_avg_variance64x128_c,
12),
-#endif // CONFIG_AV1 && CONFIG_EXT_PARTITION
+#endif // CONFIG_AV1
SubpelAvgVarianceParams(6, 6, &aom_highbd_12_sub_pixel_avg_variance64x64_c,
12),
SubpelAvgVarianceParams(6, 5, &aom_highbd_12_sub_pixel_avg_variance64x32_c,
