Merge CONFIG_BLOCK_256, CONFIG_FLEX_PARTITION into CONFIG_EXT_RECUR_PARTITIONS
Addresses one task of #468
diff --git a/aom/aom_encoder.h b/aom/aom_encoder.h
index 22d5399..851319d 100644
--- a/aom/aom_encoder.h
+++ b/aom/aom_encoder.h
@@ -255,7 +255,7 @@
* 0 or 1
*/
unsigned int init_by_cfg_file;
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
/*!\brief Superblock size
* 0, 64, 128 or 256
*/
@@ -281,7 +281,7 @@
* 8, 16, 32, 64, 128
*/
unsigned int min_partition_size;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
/*!\brief enable AB Shape partition type
*
*/
diff --git a/aom/src/aom_encoder.c b/aom/src/aom_encoder.c
index 6909767..a85f009 100644
--- a/aom/src/aom_encoder.c
+++ b/aom/src/aom_encoder.c
@@ -93,11 +93,11 @@
if (cfg) {
memset(&cfg->encoder_cfg, 0, sizeof(cfg->encoder_cfg));
cfg->encoder_cfg.superblock_size = 0; // Dynamic
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
cfg->encoder_cfg.max_partition_size = 256;
#else
cfg->encoder_cfg.max_partition_size = 128;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
cfg->encoder_cfg.min_partition_size = 4;
cfg->encoder_cfg.enable_trellis_quant = 3;
}
diff --git a/aom_dsp/aom_dsp_rtcd_defs.pl b/aom_dsp/aom_dsp_rtcd_defs.pl
index bcd2121..3f6f211 100644
--- a/aom_dsp/aom_dsp_rtcd_defs.pl
+++ b/aom_dsp/aom_dsp_rtcd_defs.pl
@@ -39,7 +39,7 @@
$avx2_x86_64 = 'avx2';
}
-if (aom_config("CONFIG_BLOCK_256") eq "yes"){
+if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes"){
@block_widths = (4, 8, 16, 32, 64, 128, 256);
} else {
@block_widths = (4, 8, 16, 32, 64, 128);
@@ -58,14 +58,14 @@
push @block_sizes, [16, 64];
push @block_sizes, [64, 16];
-if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
+if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
push @block_sizes, [4, 32];
push @block_sizes, [32, 4];
push @block_sizes, [8, 64];
push @block_sizes, [64, 8];
push @block_sizes, [4, 64];
push @block_sizes, [64, 4];
-} # CONFIG_FLEX_PARTITION
+} # CONFIG_EXT_RECUR_PARTITIONS
@tx_dims = (2, 4, 8, 16, 32, 64);
@tx_sizes = ();
@@ -74,7 +74,7 @@
foreach $h (@tx_dims) {
push @tx_sizes, [$w, $h] if ($w >=4 && $h >=4 && ($w == 2*$h || $h == 2*$w));
push @tx_sizes, [$w, $h] if ($w >=4 && $h >=4 && ($w == 4*$h || $h == 4*$w));
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
push @tx_sizes, [$w, $h] if ($w >=4 && $h >=4 && ($w == 8*$h || $h == 8*$w));
push @tx_sizes, [$w, $h] if ($w >=4 && $h >=4 && ($w == 16*$h || $h == 16*$w));
}
@@ -356,17 +356,10 @@
add_proto qw/unsigned int/, "aom_highbd_sad${w}x${h}_avg", "const uint16_t *src_ptr, int src_stride, const uint16_t *ref_ptr, int ref_stride, const uint16_t *second_pred";
if ($w != 128 && $h != 128 && $w != 4 && $w != 256 && $h != 256) {
if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
- if (!($w == 16 && $h == 64) && !($w == 16 && $h == 32) && !($w == 16 && $h == 16) && !($w == 16 && $h == 8) && !($w == 16 && $h == 4)) {
- specialize "aom_highbd_sad${w}x${h}", qw/sse2/;
- specialize "aom_highbd_sad${w}x${h}_avg", qw/sse2/;
- }
- } else {
- if (!($w == 16 && $h == 16) && !($w == 16 && $h == 8) && !($w == 16 && $h == 4)) {
- specialize "aom_highbd_sad${w}x${h}", qw/sse2/;
- specialize "aom_highbd_sad${w}x${h}_avg", qw/sse2/;
- }
- } # CONFIG_FLEX_PARTITION
+ if (!($w == 16 && $h == 64) && !($w == 16 && $h == 32) && !($w == 16 && $h == 16) && !($w == 16 && $h == 8) && !($w == 16 && $h == 4)) {
+ specialize "aom_highbd_sad${w}x${h}", qw/sse2/;
+ specialize "aom_highbd_sad${w}x${h}_avg", qw/sse2/;
+ }
} else {
specialize "aom_highbd_sad${w}x${h}", qw/sse2/;
specialize "aom_highbd_sad${w}x${h}_avg", qw/sse2/;
@@ -401,18 +394,15 @@
specialize qw/aom_highbd_sad12x20 avx2/;
specialize qw/aom_highbd_sad12x12 avx2/;
}
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
- specialize qw/aom_highbd_sad16x32 avx2/;
- specialize qw/aom_highbd_sad16x64 avx2/;
- } else {
- specialize qw/aom_highbd_sad16x32 avx2 sse2/;
- specialize qw/aom_highbd_sad16x64 avx2 sse2/;
- }
if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
+ specialize qw/aom_highbd_sad16x64 avx2/;
+ specialize qw/aom_highbd_sad16x32 avx2/;
specialize qw/aom_highbd_sad16x16 avx2/;
specialize qw/aom_highbd_sad16x8 avx2/;
specialize qw/aom_highbd_sad16x4 avx2/;
} else {
+ specialize qw/aom_highbd_sad16x64 avx2 sse2/;
+ specialize qw/aom_highbd_sad16x32 avx2 sse2/;
specialize qw/aom_highbd_sad16x16 avx2 sse2/;
specialize qw/aom_highbd_sad16x8 avx2 sse2/;
specialize qw/aom_highbd_sad16x4 avx2 sse2/;
@@ -439,15 +429,14 @@
specialize qw/aom_highbd_sad_skip_32x64 avx2 sse2/;
specialize qw/aom_highbd_sad_skip_32x32 avx2 sse2/;
specialize qw/aom_highbd_sad_skip_32x16 avx2 sse2/;
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
- specialize qw/aom_highbd_sad_skip_16x32 avx2/;
- } else {
- specialize qw/aom_highbd_sad_skip_16x32 avx2 sse2/;
- }
if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
+ specialize qw/aom_highbd_sad_skip_16x64 avx2/;
+ specialize qw/aom_highbd_sad_skip_16x32 avx2/;
specialize qw/aom_highbd_sad_skip_16x16 avx2/;
specialize qw/aom_highbd_sad_skip_16x8 avx2/;
} else {
+ specialize qw/aom_highbd_sad_skip_16x64 avx2 sse2/;
+ specialize qw/aom_highbd_sad_skip_16x32 avx2 sse2/;
specialize qw/aom_highbd_sad_skip_16x16 avx2 sse2/;
specialize qw/aom_highbd_sad_skip_16x8 avx2 sse2/;
}
@@ -458,11 +447,6 @@
specialize qw/aom_highbd_sad_skip_4x16 sse2/;
specialize qw/aom_highbd_sad_skip_8x32 sse2/;
specialize qw/aom_highbd_sad_skip_32x8 avx2 sse2/;
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
- specialize qw/aom_highbd_sad_skip_16x64 avx2/;
- } else {
- specialize qw/aom_highbd_sad_skip_16x64 avx2 sse2/;
- }
specialize qw/aom_highbd_sad_skip_64x16 avx2 sse2/;
specialize qw/aom_highbd_sad256x256_avg avx2/;
@@ -476,17 +460,14 @@
specialize qw/aom_highbd_sad32x64_avg avx2 sse2/;
specialize qw/aom_highbd_sad32x32_avg avx2 sse2/;
specialize qw/aom_highbd_sad32x16_avg avx2 sse2/;
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
- specialize qw/aom_highbd_sad16x32_avg avx2/;
- specialize qw/aom_highbd_sad16x64_avg avx2/;
- } else {
- specialize qw/aom_highbd_sad16x32_avg avx2 sse2/;
- specialize qw/aom_highbd_sad16x64_avg avx2 sse2/;
- }
if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
+ specialize qw/aom_highbd_sad16x64_avg avx2/;
+ specialize qw/aom_highbd_sad16x32_avg avx2/;
specialize qw/aom_highbd_sad16x16_avg avx2/;
specialize qw/aom_highbd_sad16x8_avg avx2/;
} else {
+ specialize qw/aom_highbd_sad16x64_avg avx2 sse2/;
+ specialize qw/aom_highbd_sad16x32_avg avx2 sse2/;
specialize qw/aom_highbd_sad16x16_avg avx2 sse2/;
specialize qw/aom_highbd_sad16x8_avg avx2 sse2/;
}
@@ -503,7 +484,7 @@
specialize qw/aom_highbd_sad32x8_avg avx2 sse2/;
specialize qw/aom_highbd_sad64x16_avg avx2 sse2/;
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
specialize qw/aom_highbd_sad32x4 sse2/;
specialize qw/aom_highbd_sad8x64 sse2/;
specialize qw/aom_highbd_sad64x8 sse2/;
@@ -607,7 +588,7 @@
specialize qw/aom_highbd_sad_skip_16x64x4d avx2 sse2/;
specialize qw/aom_highbd_sad_skip_64x16x4d avx2 sse2/;
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
specialize qw/aom_highbd_sad4x32x4d sse2/;
specialize qw/aom_highbd_sad32x4x4d sse2/;
specialize qw/aom_highbd_sad8x64x4d sse2/;
@@ -715,16 +696,9 @@
if ($w != 128 && $h != 128 && $w != 4 && $w != 256 && $h != 256) {
if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
- if (!($w == 16 && $h == 4) && !($w == 16 && $h == 8) && !($w == 16 && $h == 16)) {
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
- if (!($w == 16 && $h == 32) && !($w == 16 && $h == 64)) {
- specialize "aom_highbd_${bd}_sub_pixel_variance${w}x${h}", qw/sse2/;
- specialize "aom_highbd_${bd}_sub_pixel_avg_variance${w}x${h}", qw/sse2/;
- }
- } else {
- specialize "aom_highbd_${bd}_sub_pixel_variance${w}x${h}", qw/sse2/;
- specialize "aom_highbd_${bd}_sub_pixel_avg_variance${w}x${h}", qw/sse2/;
- } # CONFIG_FLEX_PARTITION
+ if (!($w == 16 && $h == 4) && !($w == 16 && $h == 8) && !($w == 16 && $h == 16) && !($w == 16 && $h == 32) && !($w == 16 && $h == 64)) {
+ specialize "aom_highbd_${bd}_sub_pixel_variance${w}x${h}", qw/sse2/;
+ specialize "aom_highbd_${bd}_sub_pixel_avg_variance${w}x${h}", qw/sse2/;
}
} else {
specialize "aom_highbd_${bd}_sub_pixel_variance${w}x${h}", qw/sse2/;
@@ -732,9 +706,6 @@
} # CONFIG_EXT_RECUR_PARTITIONS
}
-
-
-
add_proto qw/uint32_t/, "aom_highbd_${bd}_dist_wtd_sub_pixel_avg_variance${w}x${h}", "const uint16_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint16_t *ref_ptr, int ref_stride, uint32_t *sse, const uint16_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param";
}
}
@@ -764,7 +735,7 @@
#
# Variance
#
- if (aom_config("CONFIG_BLOCK_256") eq "yes"){
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes"){
add_proto qw/unsigned int aom_highbd_12_variance256x256/, "const uint16_t *src_ptr, int source_stride, const uint16_t *ref_ptr, int ref_stride, unsigned int *sse";
specialize qw/aom_highbd_12_variance256x256 avx2/;
@@ -827,15 +798,13 @@
add_proto qw/unsigned int aom_highbd_12_variance64x16/, "const uint16_t *src_ptr, int source_stride, const uint16_t *ref_ptr, int ref_stride, unsigned int *sse";
specialize qw/aom_highbd_12_variance64x16 sse2 avx2/;
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes"){
add_proto qw/unsigned int aom_highbd_12_variance64x8/, "const uint16_t *src_ptr, int source_stride, const uint16_t *ref_ptr, int ref_stride, unsigned int *sse";
specialize qw/aom_highbd_12_variance64x8 sse2 avx2/;
add_proto qw/unsigned int aom_highbd_12_variance8x64/, "const uint16_t *src_ptr, int source_stride, const uint16_t *ref_ptr, int ref_stride, unsigned int *sse";
specialize qw/aom_highbd_12_variance8x64 sse2 avx2/;
- }
- if (aom_config("CONFIG_BLOCK_256") eq "yes"){
add_proto qw/unsigned int aom_highbd_10_variance256x256/, "const uint16_t *src_ptr, int source_stride, const uint16_t *ref_ptr, int ref_stride, unsigned int *sse";
specialize qw/aom_highbd_10_variance256x256 avx2/;
@@ -911,15 +880,13 @@
add_proto qw/unsigned int aom_highbd_10_variance64x16/, "const uint16_t *src_ptr, int source_stride, const uint16_t *ref_ptr, int ref_stride, unsigned int *sse";
specialize qw/aom_highbd_10_variance64x16 sse2 avx2/;
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
add_proto qw/unsigned int aom_highbd_10_variance64x8/, "const uint16_t *src_ptr, int source_stride, const uint16_t *ref_ptr, int ref_stride, unsigned int *sse";
specialize qw/aom_highbd_10_variance64x8 sse2 avx2/;
add_proto qw/unsigned int aom_highbd_10_variance8x64/, "const uint16_t *src_ptr, int source_stride, const uint16_t *ref_ptr, int ref_stride, unsigned int *sse";
specialize qw/aom_highbd_10_variance8x64 sse2 avx2/;
- }
- if (aom_config("CONFIG_BLOCK_256") eq "yes") {
add_proto qw/unsigned int aom_highbd_8_variance256x256/, "const uint16_t *src_ptr, int source_stride, const uint16_t *ref_ptr, int ref_stride, unsigned int *sse";
specialize qw/aom_highbd_8_variance256x256 avx2/;
@@ -982,7 +949,7 @@
add_proto qw/unsigned int aom_highbd_8_variance64x16/, "const uint16_t *src_ptr, int source_stride, const uint16_t *ref_ptr, int ref_stride, unsigned int *sse";
specialize qw/aom_highbd_8_variance64x16 sse2 avx2/;
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
add_proto qw/unsigned int aom_highbd_8_variance64x8/, "const uint16_t *src_ptr, int source_stride, const uint16_t *ref_ptr, int ref_stride, unsigned int *sse";
specialize qw/aom_highbd_8_variance64x8 sse2 avx2/;
@@ -1034,7 +1001,7 @@
#
# Subpixel Variance
#
- if (aom_config("CONFIG_BLOCK_256") eq "yes"){
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes"){
# specialize qw/aom_highbd_12_sub_pixel_variance256x256 avx2/;
# specialize qw/aom_highbd_12_sub_pixel_variance256x128 avx2/;
# specialize qw/aom_highbd_12_sub_pixel_variance128x256 avx2/;
@@ -1073,7 +1040,7 @@
specialize qw/aom_highbd_12_sub_pixel_variance32x16 sse2/;
add_proto qw/uint32_t aom_highbd_12_sub_pixel_variance16x32/, "const uint16_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint16_t *ref_ptr, int ref_stride, uint32_t *sse";
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
# specialize qw/aom_highbd_12_sub_pixel_variance16x32 avx2/;
} else {
# specialize qw/aom_highbd_12_sub_pixel_variance16x32 sse2 avx2/;
@@ -1113,7 +1080,7 @@
specialize qw/aom_highbd_12_sub_pixel_variance64x16 sse2/;
add_proto qw/uint32_t aom_highbd_12_sub_pixel_variance16x64/, "const uint16_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint16_t *ref_ptr, int ref_stride, uint32_t *sse";
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
# specialize qw/aom_highbd_12_sub_pixel_variance16x64 avx2/;
} else {
# specialize qw/aom_highbd_12_sub_pixel_variance16x64 sse2 avx2/;
@@ -1131,7 +1098,7 @@
specialize qw/aom_highbd_12_sub_pixel_variance16x4 sse2 avx2/;
}
- if (aom_config("CONFIG_BLOCK_256") eq "yes"){
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes"){
specialize qw/aom_highbd_10_sub_pixel_variance256x256 avx2/;
specialize qw/aom_highbd_10_sub_pixel_variance256x128 avx2/;
specialize qw/aom_highbd_10_sub_pixel_variance128x256 avx2/;
@@ -1162,7 +1129,7 @@
specialize qw/aom_highbd_10_sub_pixel_variance32x16 sse2 avx2/;
add_proto qw/uint32_t aom_highbd_10_sub_pixel_variance16x32/, "const uint16_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint16_t *ref_ptr, int ref_stride, uint32_t *sse";
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
specialize qw/aom_highbd_10_sub_pixel_variance16x32 avx2/;
} else {
specialize qw/aom_highbd_10_sub_pixel_variance16x32 sse2 avx2/;
@@ -1199,7 +1166,7 @@
specialize qw/aom_highbd_10_sub_pixel_variance64x16 sse2 avx2/;
add_proto qw/uint32_t aom_highbd_10_sub_pixel_variance16x64/, "const uint16_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint16_t *ref_ptr, int ref_stride, uint32_t *sse";
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
specialize qw/aom_highbd_10_sub_pixel_variance16x64 avx2/;
} else {
specialize qw/aom_highbd_10_sub_pixel_variance16x64 sse2 avx2/;
@@ -1216,7 +1183,7 @@
}
- if (aom_config("CONFIG_BLOCK_256") eq "yes"){
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes"){
specialize qw/aom_highbd_8_sub_pixel_variance256x256 avx2/;
specialize qw/aom_highbd_8_sub_pixel_variance256x128 avx2/;
specialize qw/aom_highbd_8_sub_pixel_variance128x256 avx2/;
@@ -1247,7 +1214,7 @@
specialize qw/aom_highbd_8_sub_pixel_variance32x16 sse2 avx2/;
add_proto qw/uint32_t aom_highbd_8_sub_pixel_variance16x32/, "const uint16_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint16_t *ref_ptr, int ref_stride, uint32_t *sse";
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
specialize qw/aom_highbd_8_sub_pixel_variance16x32 avx2/;
} else {
specialize qw/aom_highbd_8_sub_pixel_variance16x32 sse2 avx2/;
@@ -1284,7 +1251,7 @@
specialize qw/aom_highbd_8_sub_pixel_variance64x16 sse2 avx2/;
add_proto qw/uint32_t aom_highbd_8_sub_pixel_variance16x64/, "const uint16_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint16_t *ref_ptr, int ref_stride, uint32_t *sse";
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
specialize qw/aom_highbd_8_sub_pixel_variance16x64 avx2/;
} else {
specialize qw/aom_highbd_8_sub_pixel_variance16x64 sse2 avx2/;
@@ -1320,7 +1287,7 @@
specialize qw/aom_highbd_12_sub_pixel_avg_variance32x16 sse2/;
add_proto qw/uint32_t aom_highbd_12_sub_pixel_avg_variance16x32/, "const uint16_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint16_t *ref_ptr, int ref_stride, uint32_t *sse, const uint16_t *second_pred";
- if (aom_config("CONFIG_FLEX_PARTITION") ne "yes") {
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") ne "yes") {
specialize qw/aom_highbd_12_sub_pixel_avg_variance16x32 sse2/;
}
@@ -1362,7 +1329,7 @@
specialize qw/aom_highbd_10_sub_pixel_avg_variance32x16 sse2/;
add_proto qw/uint32_t aom_highbd_10_sub_pixel_avg_variance16x32/, "const uint16_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint16_t *ref_ptr, int ref_stride, uint32_t *sse, const uint16_t *second_pred";
- if (aom_config("CONFIG_FLEX_PARTITION") ne "yes") {
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") ne "yes") {
specialize qw/aom_highbd_10_sub_pixel_avg_variance16x32 sse2/;
}
@@ -1404,7 +1371,7 @@
specialize qw/aom_highbd_8_sub_pixel_avg_variance32x16 sse2/;
add_proto qw/uint32_t aom_highbd_8_sub_pixel_avg_variance16x32/, "const uint16_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint16_t *ref_ptr, int ref_stride, uint32_t *sse, const uint16_t *second_pred";
- if (aom_config("CONFIG_FLEX_PARTITION") ne "yes") {
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") ne "yes") {
specialize qw/aom_highbd_8_sub_pixel_avg_variance16x32 sse2/;
}
diff --git a/aom_dsp/intrapred.c b/aom_dsp/intrapred.c
index b51acb7..1dfb7b6 100644
--- a/aom_dsp/intrapred.c
+++ b/aom_dsp/intrapred.c
@@ -695,7 +695,7 @@
// - Shift 'sum_w_h' right until we reach an odd number. Let the number of
// shifts for that block size be called 'shift1' (see the parameter in
// dc_predictor_rect() function), and let the odd number be 'd'.
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
// d has only 4 possible values:
// * d = 3 for a 1:2 rect block,
// * d = 5 for a 1:4 rect block,
@@ -741,7 +741,7 @@
// Note: This constant is odd, but a smaller even constant (0x199a) with the
// appropriate shift should work for neon in 8/10-bit.
#define HIGHBD_DC_MULTIPLIER_1X4 0x6667
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
static INLINE void highbd_dc_predictor_rect(uint16_t *dst, ptrdiff_t stride,
int bw, int bh,
@@ -868,7 +868,7 @@
HIGHBD_DC_MULTIPLIER_1X2);
}
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
void aom_highbd_dc_predictor_4x32_c(uint16_t *dst, ptrdiff_t stride,
const uint16_t *above, const uint16_t *left,
int bd) {
@@ -910,14 +910,14 @@
highbd_dc_predictor_rect(dst, stride, 64, 4, above, left, bd, 2,
HIGHBD_DC_MULTIPLIER_1X16);
}
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#undef HIGHBD_DC_MULTIPLIER_1X2
#undef HIGHBD_DC_MULTIPLIER_1X4
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
#undef HIGHBD_DC_MULTIPLIER_1X8
#undef HIGHBD_DC_MULTIPLIER_1X16
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// This serves as a wrapper function, so that all the prediction functions
// can be unified and accessed as a pointer array. Note that the boundary
@@ -937,7 +937,7 @@
}
/* clang-format off */
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
#define intra_pred_rectangular(type) \
intra_pred_sized(type, 4, 8) \
intra_pred_sized(type, 8, 4) \
@@ -1009,7 +1009,7 @@
intra_pred_highbd_sized(type, 32, 8) \
intra_pred_highbd_sized(type, 16, 64) \
intra_pred_highbd_sized(type, 64, 16)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#define intra_pred_above_4x4(type) \
intra_pred_sized(type, 8, 8) \
diff --git a/aom_dsp/sad.c b/aom_dsp/sad.c
index 0634f76..3bcbf1e 100644
--- a/aom_dsp/sad.c
+++ b/aom_dsp/sad.c
@@ -77,7 +77,7 @@
highbd_sadMxN_ds(20, 20);
#endif // CONFIG_SUBBLK_REF_DS
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
// 256X256
highbd_sadMxN(256, 256);
@@ -86,7 +86,7 @@
// 128X256
highbd_sadMxN(128, 256);
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// 128x128
highbd_sadMxN(128, 128);
@@ -150,11 +150,11 @@
highbd_sadMxN(16, 64);
highbd_sadMxN(64, 16);
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
highbd_sadMxN(4, 32);
highbd_sadMxN(32, 4);
highbd_sadMxN(8, 64);
highbd_sadMxN(64, 8);
highbd_sadMxN(4, 64);
highbd_sadMxN(64, 4);
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
diff --git a/aom_dsp/sad4d.c b/aom_dsp/sad4d.c
index 1e434ed..cfdb103 100644
--- a/aom_dsp/sad4d.c
+++ b/aom_dsp/sad4d.c
@@ -95,7 +95,7 @@
} \
}
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
// 256X256
highbd_avg_skip_sadMxN(256, 256);
highbd_sadMxNx4D(256, 256);
@@ -107,7 +107,7 @@
// 128X256
highbd_avg_skip_sadMxN(128, 256);
highbd_sadMxNx4D(128, 256);
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// 128x128
highbd_avg_skip_sadMxN(128, 128);
@@ -186,7 +186,7 @@
highbd_avg_skip_sadMxN(64, 16);
highbd_sadMxNx4D(64, 16);
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
highbd_avg_skip_sadMxN(4, 32);
highbd_sadMxNx4D(4, 32);
highbd_avg_skip_sadMxN(32, 4);
@@ -199,4 +199,4 @@
highbd_sadMxNx4D(4, 64);
highbd_avg_skip_sadMxN(64, 4);
highbd_sadMxNx4D(64, 4);
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
diff --git a/aom_dsp/sad_av1.c b/aom_dsp/sad_av1.c
index d07c430..f8d539e 100644
--- a/aom_dsp/sad_av1.c
+++ b/aom_dsp/sad_av1.c
@@ -57,11 +57,11 @@
ref_stride, msk, msk_stride, m, n); \
}
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_MASKSADMXN(256, 256)
HIGHBD_MASKSADMXN(256, 128)
HIGHBD_MASKSADMXN(128, 256)
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_MASKSADMXN(128, 128)
HIGHBD_MASKSADMXN(128, 64)
HIGHBD_MASKSADMXN(64, 128)
@@ -84,14 +84,14 @@
HIGHBD_MASKSADMXN(32, 8)
HIGHBD_MASKSADMXN(16, 64)
HIGHBD_MASKSADMXN(64, 16)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_MASKSADMXN(4, 32)
HIGHBD_MASKSADMXN(32, 4)
HIGHBD_MASKSADMXN(8, 64)
HIGHBD_MASKSADMXN(64, 8)
HIGHBD_MASKSADMXN(4, 64)
HIGHBD_MASKSADMXN(64, 4)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// pre: predictor being evaluated
// wsrc: target weighted prediction (has been *4096 to keep precision)
@@ -126,11 +126,11 @@
}
/* clang-format off */
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_OBMCSADMXN(256, 256)
HIGHBD_OBMCSADMXN(256, 128)
HIGHBD_OBMCSADMXN(128, 256)
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_OBMCSADMXN(128, 128)
HIGHBD_OBMCSADMXN(128, 64)
HIGHBD_OBMCSADMXN(64, 128)
@@ -153,13 +153,13 @@
HIGHBD_OBMCSADMXN(32, 8)
HIGHBD_OBMCSADMXN(16, 64)
HIGHBD_OBMCSADMXN(64, 16)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_OBMCSADMXN(4, 32)
HIGHBD_OBMCSADMXN(32, 4)
HIGHBD_OBMCSADMXN(8, 64)
HIGHBD_OBMCSADMXN(64, 8)
HIGHBD_OBMCSADMXN(4, 64)
HIGHBD_OBMCSADMXN(64, 4)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
/* clang-format on */
diff --git a/aom_dsp/variance.c b/aom_dsp/variance.c
index 993fe00..5ba3f15 100644
--- a/aom_dsp/variance.c
+++ b/aom_dsp/variance.c
@@ -437,11 +437,11 @@
HIGHBD_SUBPIX_VAR(W, H) \
HIGHBD_SUBPIX_AVG_VAR(W, H)
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_VARIANCES(256, 256)
HIGHBD_VARIANCES(256, 128)
HIGHBD_VARIANCES(128, 256)
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_VARIANCES(128, 128)
HIGHBD_VARIANCES(128, 64)
HIGHBD_VARIANCES(64, 128)
@@ -467,14 +467,14 @@
HIGHBD_VARIANCES(32, 8)
HIGHBD_VARIANCES(16, 64)
HIGHBD_VARIANCES(64, 16)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_VARIANCES(4, 32)
HIGHBD_VARIANCES(32, 4)
HIGHBD_VARIANCES(8, 64)
HIGHBD_VARIANCES(64, 8)
HIGHBD_VARIANCES(4, 64)
HIGHBD_VARIANCES(64, 4)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_GET_VAR(8)
HIGHBD_GET_VAR(16)
@@ -751,25 +751,25 @@
HIGHBD_MASK_SUBPIX_VAR(64, 128)
HIGHBD_MASK_SUBPIX_VAR(128, 64)
HIGHBD_MASK_SUBPIX_VAR(128, 128)
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_MASK_SUBPIX_VAR(128, 256)
HIGHBD_MASK_SUBPIX_VAR(256, 128)
HIGHBD_MASK_SUBPIX_VAR(256, 256)
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_MASK_SUBPIX_VAR(4, 16)
HIGHBD_MASK_SUBPIX_VAR(16, 4)
HIGHBD_MASK_SUBPIX_VAR(8, 32)
HIGHBD_MASK_SUBPIX_VAR(32, 8)
HIGHBD_MASK_SUBPIX_VAR(16, 64)
HIGHBD_MASK_SUBPIX_VAR(64, 16)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_MASK_SUBPIX_VAR(4, 32)
HIGHBD_MASK_SUBPIX_VAR(32, 4)
HIGHBD_MASK_SUBPIX_VAR(8, 64)
HIGHBD_MASK_SUBPIX_VAR(64, 8)
HIGHBD_MASK_SUBPIX_VAR(4, 64)
HIGHBD_MASK_SUBPIX_VAR(64, 4)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
static INLINE void highbd_obmc_variance64(const uint16_t *pre, int pre_stride,
const int32_t *wsrc,
@@ -948,7 +948,7 @@
HIGHBD_OBMC_VAR(128, 128)
HIGHBD_OBMC_SUBPIX_VAR(128, 128)
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_OBMC_VAR(128, 256)
HIGHBD_OBMC_SUBPIX_VAR(128, 256)
@@ -957,7 +957,7 @@
HIGHBD_OBMC_VAR(256, 256)
HIGHBD_OBMC_SUBPIX_VAR(256, 256)
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_OBMC_VAR(4, 16)
HIGHBD_OBMC_SUBPIX_VAR(4, 16)
@@ -972,7 +972,7 @@
HIGHBD_OBMC_VAR(64, 16)
HIGHBD_OBMC_SUBPIX_VAR(64, 16)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_OBMC_VAR(4, 32)
HIGHBD_OBMC_SUBPIX_VAR(4, 32)
HIGHBD_OBMC_VAR(32, 4)
@@ -985,7 +985,7 @@
HIGHBD_OBMC_SUBPIX_VAR(4, 64)
HIGHBD_OBMC_VAR(64, 4)
HIGHBD_OBMC_SUBPIX_VAR(64, 4)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
uint64_t aom_mse_wxh_16bit_highbd_c(uint16_t *dst, int dstride, uint16_t *src,
int sstride, int w, int h) {
diff --git a/aom_dsp/x86/aom_convolve_copy_avx2.c b/aom_dsp/x86/aom_convolve_copy_avx2.c
index 02b2d70..1306163 100644
--- a/aom_dsp/x86/aom_convolve_copy_avx2.c
+++ b/aom_dsp/x86/aom_convolve_copy_avx2.c
@@ -288,7 +288,7 @@
h -= 2;
} while (h);
} else {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
assert(w == 256);
do {
highbd_copy_128(src, dst);
@@ -303,6 +303,6 @@
} while (h);
#else
assert(0);
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
}
}
diff --git a/aom_dsp/x86/aom_convolve_copy_sse2.c b/aom_dsp/x86/aom_convolve_copy_sse2.c
index 6ddfee5..bd32344 100644
--- a/aom_dsp/x86/aom_convolve_copy_sse2.c
+++ b/aom_dsp/x86/aom_convolve_copy_sse2.c
@@ -349,7 +349,7 @@
h -= 2;
} while (h);
} else {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
assert(w == 256);
do {
highbd_copy_128(src, dst);
@@ -364,6 +364,6 @@
} while (h);
#else
assert(0);
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
}
}
diff --git a/aom_dsp/x86/highbd_sad4d_sse2.asm b/aom_dsp/x86/highbd_sad4d_sse2.asm
index ceb68cd..b9b2286 100644
--- a/aom_dsp/x86/highbd_sad4d_sse2.asm
+++ b/aom_dsp/x86/highbd_sad4d_sse2.asm
@@ -331,7 +331,7 @@
HIGH_SADNXN4D 16, 64, 2
HIGH_SADNXN4D 64, 16, 2
-%if CONFIG_FLEX_PARTITION
+%if CONFIG_EXT_RECUR_PARTITIONS
HIGH_SADNXN4D 4, 32
HIGH_SADNXN4D 32, 4
HIGH_SADNXN4D 8, 64
diff --git a/aom_dsp/x86/highbd_sad_sse2.asm b/aom_dsp/x86/highbd_sad_sse2.asm
index 101cdb1..9401898 100644
--- a/aom_dsp/x86/highbd_sad_sse2.asm
+++ b/aom_dsp/x86/highbd_sad_sse2.asm
@@ -182,7 +182,7 @@
HIGH_SAD64XN 32, 2 ; highbd_sad_skip_64x32_sse2
HIGH_SAD64XN 16, 2 ; highbd_sad_skip_64x16_sse2
-%if CONFIG_FLEX_PARTITION
+%if CONFIG_EXT_RECUR_PARTITIONS
HIGH_SAD64XN 8 ; highbd_sad_64x8_sse2
HIGH_SAD64XN 8, 1 ; highbd_sad_64x8_avg_sse2
HIGH_SAD64XN 8, 2 ; highbd_sad_skip_64x8_sse2
@@ -271,7 +271,7 @@
HIGH_SAD32XN 32, 2 ; highbd_sad_skip_32x32_sse2
HIGH_SAD32XN 16, 2 ; highbd_sad_skip_32x16_sse2
HIGH_SAD32XN 8, 2 ; highbd_sad_skip_32x8_sse2
-%if CONFIG_FLEX_PARTITION
+%if CONFIG_EXT_RECUR_PARTITIONS
HIGH_SAD32XN 4 ; highbd_sad_32x4_sse2
HIGH_SAD32XN 4, 1 ; highbd_sad_32x4_avg_sse2
HIGH_SAD32XN 4, 2 ; highbd_sad_skip_32x4_sse2
@@ -452,7 +452,7 @@
; Current code fails there are only 2 rows
; HIGH_SAD8XN 4, 2 ; highbd_sad8x4_avg_sse2
-%if CONFIG_FLEX_PARTITION
+%if CONFIG_EXT_RECUR_PARTITIONS
HIGH_SAD8XN 64 ; highbd_sad_8x64_sse2
HIGH_SAD8XN 64, 1 ; highbd_sad_8x64_avg_sse2
HIGH_SAD8XN 64, 2 ; highbd_sad_skip_8x64_sse2
@@ -537,7 +537,7 @@
; Current code fails there are only 2 rows
; HIGH_SAD4XN 4, 2 ; highbd_sad_skip_4x4_sse2
-%if CONFIG_FLEX_PARTITION
+%if CONFIG_EXT_RECUR_PARTITIONS
HIGH_SAD4XN 64 ; highbd_sad_4x64_sse2
HIGH_SAD4XN 64, 1 ; highbd_sad_4x64_avg_sse2
HIGH_SAD4XN 64, 2 ; highbd_sad_skip_4x64_sse2
diff --git a/aom_dsp/x86/highbd_subtract_sse2.c b/aom_dsp/x86/highbd_subtract_sse2.c
index 511aad4..a605e76 100644
--- a/aom_dsp/x86/highbd_subtract_sse2.c
+++ b/aom_dsp/x86/highbd_subtract_sse2.c
@@ -208,44 +208,44 @@
SUBTRACT_FUN(64x128) { STACK_V(64, subtract_64x64); }
SUBTRACT_FUN(128x64) { STACK_H(64, subtract_64x64); }
SUBTRACT_FUN(128x128) { STACK_V(64, subtract_128x64); }
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
SUBTRACT_FUN(128x256) { STACK_V(128, subtract_128x128); }
SUBTRACT_FUN(256x128) { STACK_H(128, subtract_128x128); }
SUBTRACT_FUN(256x256) { STACK_V(128, subtract_256x128); }
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
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_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
SUBTRACT_FUN(4x32) { STACK_V(16, subtract_4x16); }
SUBTRACT_FUN(32x4) { STACK_H(16, subtract_16x4); }
SUBTRACT_FUN(8x64) { STACK_V(32, subtract_8x32); }
SUBTRACT_FUN(64x8) { STACK_H(32, subtract_32x8); }
SUBTRACT_FUN(4x64) { STACK_V(32, subtract_4x32); }
SUBTRACT_FUN(64x4) { STACK_H(32, subtract_32x4); }
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
static SubtractWxHFuncType getSubtractFunc(int rows, int cols) {
if (rows == 4) {
if (cols == 4) return subtract_4x4;
if (cols == 8) return subtract_8x4;
if (cols == 16) return subtract_16x4;
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
if (cols == 32) return subtract_32x4;
if (cols == 64) return subtract_64x4;
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
}
if (rows == 8) {
if (cols == 4) return subtract_4x8;
if (cols == 8) return subtract_8x8;
if (cols == 16) return subtract_16x8;
if (cols == 32) return subtract_32x8;
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
if (cols == 64) return subtract_64x8;
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
}
if (rows == 16) {
if (cols == 4) return subtract_4x16;
@@ -255,19 +255,19 @@
if (cols == 64) return subtract_64x16;
}
if (rows == 32) {
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
if (cols == 4) return subtract_4x32;
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
if (cols == 8) return subtract_8x32;
if (cols == 16) return subtract_16x32;
if (cols == 32) return subtract_32x32;
if (cols == 64) return subtract_64x32;
}
if (rows == 64) {
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
if (cols == 4) return subtract_4x64;
if (cols == 8) return subtract_8x64;
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
if (cols == 16) return subtract_16x64;
if (cols == 32) return subtract_32x64;
if (cols == 64) return subtract_64x64;
@@ -276,16 +276,16 @@
if (rows == 128) {
if (cols == 64) return subtract_64x128;
if (cols == 128) return subtract_128x128;
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
if (cols == 256) return subtract_256x128;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
}
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
if (rows == 256) {
if (cols == 128) return subtract_128x256;
if (cols == 256) return subtract_256x256;
}
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
assert(0);
return NULL;
}
diff --git a/aom_dsp/x86/highbd_variance_avx2.c b/aom_dsp/x86/highbd_variance_avx2.c
index 1140b10..13ce9c8 100644
--- a/aom_dsp/x86/highbd_variance_avx2.c
+++ b/aom_dsp/x86/highbd_variance_avx2.c
@@ -759,11 +759,11 @@
return (var >= 0) ? (uint32_t)var : 0; \
}
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
VAR_FN(256, 256, 16, 16);
VAR_FN(256, 128, 16, 15);
VAR_FN(128, 256, 16, 15);
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
VAR_FN(128, 128, 16, 14);
VAR_FN(128, 64, 16, 13);
VAR_FN(64, 128, 16, 13);
@@ -782,16 +782,14 @@
VAR_FN(16, 64, 16, 10);
VAR_FN(64, 16, 16, 10);
VAR_FN(8, 16, 8, 7);
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
VAR_FN(64, 8, 8, 9);
VAR_FN(8, 64, 8, 9);
-#endif // CONFIG_FLEX_PARTITION
-#if CONFIG_BLOCK_256
VAR_FN_BD12(256, 256, 8, 16);
VAR_FN_BD12(256, 128, 8, 15);
VAR_FN_BD12(128, 256, 8, 15);
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
VAR_FN_BD12(128, 128, 8, 14);
VAR_FN_BD12(128, 64, 8, 13);
VAR_FN_BD12(64, 128, 8, 13);
@@ -810,10 +808,10 @@
VAR_FN_BD12(16, 64, 8, 10);
VAR_FN_BD12(64, 16, 8, 10);
VAR_FN_BD12(8, 16, 8, 7);
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
VAR_FN_BD12(64, 8, 8, 9);
VAR_FN_BD12(8, 64, 8, 9);
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#undef VAR_FN
#undef VAR_FN_BD12
@@ -872,11 +870,11 @@
return (var > 0) ? var : 0; \
}
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_SUBPIX_VAR(256, 256, 16);
HIGHBD_SUBPIX_VAR(256, 128, 15);
HIGHBD_SUBPIX_VAR(128, 256, 15);
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_SUBPIX_VAR(128, 128, 14);
HIGHBD_SUBPIX_VAR(128, 64, 13);
HIGHBD_SUBPIX_VAR(64, 128, 13);
@@ -894,11 +892,11 @@
HIGHBD_SUBPIX_VAR(32, 8, 8);
HIGHBD_SUBPIX_VAR(16, 4, 6);
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
// HIGHBD_SUBPIX_VAR_BD12(256, 256, 16);
// HIGHBD_SUBPIX_VAR_BD12(256, 128, 15);
// HIGHBD_SUBPIX_VAR_BD12(128, 256, 15);
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// HIGHBD_SUBPIX_VAR_BD12(128, 128, 14);
// HIGHBD_SUBPIX_VAR_BD12(128, 64, 13);
// HIGHBD_SUBPIX_VAR_BD12(64, 128, 13);
diff --git a/aom_dsp/x86/highbd_variance_sse2.c b/aom_dsp/x86/highbd_variance_sse2.c
index ce88649..27a1e5d 100644
--- a/aom_dsp/x86/highbd_variance_sse2.c
+++ b/aom_dsp/x86/highbd_variance_sse2.c
@@ -186,10 +186,10 @@
VAR_FN(32, 8, 8, 8);
VAR_FN(16, 64, 16, 10);
VAR_FN(64, 16, 16, 10);
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
VAR_FN(8, 64, 8, 9);
VAR_FN(64, 8, 8, 9);
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#undef VAR_FN
@@ -468,9 +468,9 @@
return (var >= 0) ? (uint32_t)var : 0; \
}
-// TODO(any): Add back 16X16, 16X8, 16X4 for CONFIG_FLEX_PARTITION and
-// CONFIG_EXT_RECUR_PARTITIONS after fixing alignment issues.
-#if CONFIG_FLEX_PARTITION
+// TODO(any): Add back 16X16, 16X8, 16X4 for CONFIG_EXT_RECUR_PARTITIONS after
+// fixing alignment issues.
+#if CONFIG_EXT_RECUR_PARTITIONS
#define FNS(opt) \
FN(128, 128, 16, 7, 7, opt, (int64_t)); \
FN(128, 64, 16, 7, 6, opt, (int64_t)); \
@@ -492,24 +492,6 @@
FN(8, 64, 8, 3, 6, opt, (int64_t)); \
FN(32, 4, 16, 5, 2, opt, (int64_t)); \
FN(64, 4, 16, 6, 2, opt, (int64_t));
-#elif CONFIG_EXT_RECUR_PARTITIONS
-#define FNS(opt) \
- FN(128, 128, 16, 7, 7, opt, (int64_t)); \
- FN(128, 64, 16, 7, 6, opt, (int64_t)); \
- FN(64, 128, 16, 6, 7, opt, (int64_t)); \
- FN(64, 64, 16, 6, 6, opt, (int64_t)); \
- FN(64, 32, 16, 6, 5, opt, (int64_t)); \
- FN(32, 64, 16, 5, 6, opt, (int64_t)); \
- FN(32, 32, 16, 5, 5, opt, (int64_t)); \
- FN(32, 16, 16, 5, 4, opt, (int64_t)); \
- FN(16, 32, 16, 4, 5, opt, (int64_t)); \
- FN(8, 16, 8, 3, 4, opt, (int64_t)); \
- FN(8, 8, 8, 3, 3, opt, (int64_t)); \
- FN(8, 4, 8, 3, 2, opt, (int64_t)); \
- FN(8, 32, 8, 3, 5, opt, (int64_t)); \
- FN(32, 8, 16, 5, 3, opt, (int64_t)); \
- FN(16, 64, 16, 4, 6, opt, (int64_t)); \
- FN(64, 16, 16, 6, 4, opt, (int64_t))
#else
#define FNS(opt) \
FN(128, 128, 16, 7, 7, opt, (int64_t)); \
@@ -531,7 +513,7 @@
FN(32, 8, 16, 5, 3, opt, (int64_t)); \
FN(16, 64, 16, 4, 6, opt, (int64_t)); \
FN(64, 16, 16, 6, 4, opt, (int64_t))
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
FNS(sse2);
@@ -740,9 +722,9 @@
return (var >= 0) ? (uint32_t)var : 0; \
}
-// TODO(any): Add back 16X16, 16X8, 16X4 for CONFIG_FLEX_PARTITION and
-// CONFIG_EXT_RECUR_PARTITIONS after fixing alignment issues.
-#if CONFIG_FLEX_PARTITION
+// TODO(any): Add back 16X16, 16X8, 16X4 for CONFIG_EXT_RECUR_PARTITIONS after
+// fixing alignment issues.
+#if CONFIG_EXT_RECUR_PARTITIONS
#define FNS(opt) \
FN(64, 64, 16, 6, 6, opt, (int64_t)); \
FN(64, 32, 16, 6, 5, opt, (int64_t)); \
@@ -761,21 +743,6 @@
FN(8, 64, 8, 3, 6, opt, (int64_t)); \
FN(32, 4, 16, 5, 2, opt, (int64_t)); \
FN(64, 4, 16, 6, 2, opt, (int64_t));
-#elif CONFIG_EXT_RECUR_PARTITIONS
-#define FNS(opt) \
- FN(64, 64, 16, 6, 6, opt, (int64_t)); \
- FN(64, 32, 16, 6, 5, opt, (int64_t)); \
- FN(32, 64, 16, 5, 6, opt, (int64_t)); \
- FN(32, 32, 16, 5, 5, opt, (int64_t)); \
- FN(32, 16, 16, 5, 4, opt, (int64_t)); \
- FN(16, 32, 16, 4, 5, opt, (int64_t)); \
- FN(8, 16, 8, 3, 4, opt, (int64_t)); \
- FN(8, 8, 8, 3, 3, opt, (int64_t)); \
- FN(8, 4, 8, 3, 2, opt, (int64_t)); \
- FN(8, 32, 8, 3, 5, opt, (int64_t)); \
- FN(32, 8, 16, 5, 3, opt, (int64_t)); \
- FN(16, 64, 16, 4, 6, opt, (int64_t)); \
- FN(64, 16, 16, 6, 4, opt, (int64_t));
#else
#define FNS(opt) \
FN(64, 64, 16, 6, 6, opt, (int64_t)); \
@@ -794,7 +761,7 @@
FN(32, 8, 16, 5, 3, opt, (int64_t)); \
FN(16, 64, 16, 4, 6, opt, (int64_t)); \
FN(64, 16, 16, 6, 4, opt, (int64_t));
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
FNS(sse2);
diff --git a/aom_dsp/x86/intrapred_avx2.c b/aom_dsp/x86/intrapred_avx2.c
index 5d8ac44..b4b80af 100644
--- a/aom_dsp/x86/intrapred_avx2.c
+++ b/aom_dsp/x86/intrapred_avx2.c
@@ -433,11 +433,11 @@
const uint16_t *above,
int upsample_above, int dx, int bd,
int mrl_index) {
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
__m128i dstvec[64];
#else
__m128i dstvec[16];
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
if (bd < 12) {
highbd_dr_prediction_z1_4xN_internal_avx2(N, dstvec, above, upsample_above,
dx, mrl_index);
@@ -622,11 +622,11 @@
const uint16_t *above,
int upsample_above, int dx, int bd,
int mrl_index) {
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
__m128i dstvec[64];
#else
__m128i dstvec[32];
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
if (bd < 12) {
highbd_dr_prediction_z1_8xN_internal_avx2(N, dstvec, above, upsample_above,
dx, mrl_index);
@@ -2620,7 +2620,7 @@
}
}
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
static void highbd_dr_prediction_z3_32x4_avx2(uint16_t *dst, ptrdiff_t stride,
const uint16_t *left,
int upsample_left, int dy, int bd,
@@ -2811,7 +2811,7 @@
}
}
}
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
void av1_highbd_dr_prediction_z3_avx2(uint16_t *dst, ptrdiff_t stride, int bw,
int bh, const uint16_t *above,
@@ -2870,7 +2870,7 @@
} else {
switch (bw) {
case 4:
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
if (bh == 32)
highbd_dr_prediction_z3_4x32_avx2(
dst, stride, left, upsample_left, dy, bd, mrl_index);
@@ -2878,17 +2878,17 @@
highbd_dr_prediction_z3_4x64_avx2(
dst, stride, left, upsample_left, dy, bd, mrl_index);
else
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
highbd_dr_prediction_z3_4x16_avx2(
dst, stride, left, upsample_left, dy, bd, mrl_index);
break;
case 8:
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
if (bh == 64)
highbd_dr_prediction_z3_8x64_avx2(
dst, stride, left, upsample_left, dy, bd, mrl_index);
else
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
highbd_dr_prediction_z3_8x32_avx2(
dst, stride, left, upsample_left, dy, bd, mrl_index);
break;
@@ -2921,7 +2921,7 @@
} else {
switch (bh) {
case 4:
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
if (bw == 64)
highbd_dr_prediction_z3_64x4_avx2(
dst, stride, left, upsample_left, dy, bd, mrl_index);
@@ -2929,17 +2929,17 @@
highbd_dr_prediction_z3_32x4_avx2(
dst, stride, left, upsample_left, dy, bd, mrl_index);
else
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
highbd_dr_prediction_z3_16x4_avx2(
dst, stride, left, upsample_left, dy, bd, mrl_index);
break;
case 8:
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
if (bw == 64)
highbd_dr_prediction_z3_64x8_avx2(
dst, stride, left, upsample_left, dy, bd, mrl_index);
else
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
highbd_dr_prediction_z3_32x8_avx2(
dst, stride, left, upsample_left, dy, bd, mrl_index);
break;
@@ -3121,13 +3121,13 @@
assert(bw == 4);
int N = bh;
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
assert(bh <= 64);
__m128i dstvec[64];
#else
assert(bh <= 16);
__m128i dstvec[16];
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
if (bd < 10) {
highbd_dr_prediction_z1_4xN_internal_idif_avx2(N, dstvec, above, dx,
@@ -3289,13 +3289,13 @@
assert(bw == 8);
int N = bh;
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
assert(bh <= 64);
__m128i dstvec[64];
#else
assert(bh <= 32);
__m128i dstvec[32];
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
if (bd < 10) {
highbd_dr_prediction_z1_8xN_internal_idif_avx2(N, dstvec, above, dx,
@@ -4714,7 +4714,7 @@
}
}
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
static void highbd_dr_prediction_z3_64x8_idif_avx2(uint16_t *dst,
ptrdiff_t stride,
@@ -4899,7 +4899,7 @@
}
}
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
static void highbd_dr_prediction_z3_16x4_idif_avx2(uint16_t *dst,
ptrdiff_t stride,
@@ -5171,7 +5171,7 @@
} else {
switch (bw) {
case 4:
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
if (bh == 32)
highbd_dr_prediction_z3_4x32_idif_avx2(dst, stride, left, dy, bd,
mrl_index);
@@ -5179,18 +5179,18 @@
highbd_dr_prediction_z3_4x64_idif_avx2(dst, stride, left, dy, bd,
mrl_index);
else
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
highbd_dr_prediction_z3_4x16_idif_avx2(dst, stride, left, dy, bd,
mrl_index);
break;
case 8:
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
if (bh == 64)
highbd_dr_prediction_z3_8x64_idif_avx2(dst, stride, left, dy, bd,
mrl_index);
else
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
highbd_dr_prediction_z3_8x32_idif_avx2(dst, stride, left, dy, bd,
mrl_index);
break;
@@ -5223,7 +5223,7 @@
} else {
switch (bh) {
case 4:
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
if (bw == 32)
highbd_dr_prediction_z3_32x4_idif_avx2(dst, stride, left, dy, bd,
@@ -5233,18 +5233,18 @@
mrl_index);
else
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
highbd_dr_prediction_z3_16x4_idif_avx2(dst, stride, left, dy, bd,
mrl_index);
break;
case 8:
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
if (bw == 64)
highbd_dr_prediction_z3_64x8_idif_avx2(dst, stride, left, dy, bd,
mrl_index);
else
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
highbd_dr_prediction_z3_32x8_idif_avx2(dst, stride, left, dy, bd,
mrl_index);
break;
diff --git a/aom_dsp/x86/lpf_common_sse2.h b/aom_dsp/x86/lpf_common_sse2.h
index 6020641..2574944 100644
--- a/aom_dsp/x86/lpf_common_sse2.h
+++ b/aom_dsp/x86/lpf_common_sse2.h
@@ -493,7 +493,7 @@
*d14d15 = _mm_unpackhi_epi64(w7, w15);
}
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
static INLINE void transpose16x4_4x16_sse2(
__m128i *x0, __m128i *x1, __m128i *x2, __m128i *x3, __m128i *x4,
__m128i *x5, __m128i *x6, __m128i *x7, __m128i *x8, __m128i *x9,
@@ -528,5 +528,5 @@
*d2 = _mm_unpacklo_epi64(w7, w15);
*d3 = _mm_unpackhi_epi64(w7, w15);
}
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#endif // AOM_AOM_DSP_X86_LPF_COMMON_SSE2_H_
diff --git a/aom_dsp/x86/masked_sad_intrin_avx2.c b/aom_dsp/x86/masked_sad_intrin_avx2.c
index df037d2..03dce54 100644
--- a/aom_dsp/x86/masked_sad_intrin_avx2.c
+++ b/aom_dsp/x86/masked_sad_intrin_avx2.c
@@ -199,14 +199,14 @@
MASKSADMXN_AVX2(32, 8)
MASKSADMXN_AVX2(16, 64)
MASKSADMXN_AVX2(64, 16)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
MASKSADMXN_AVX2(4, 32)
MASKSADMXN_AVX2(32, 4)
MASKSADMXN_AVX2(8, 64)
MASKSADMXN_AVX2(64, 8)
MASKSADMXN_AVX2(4, 64)
MASKSADMXN_AVX2(64, 4)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
static INLINE unsigned int highbd_masked_sad8xh_avx2(
const uint16_t *src_ptr, int src_stride, const uint16_t *a_ptr,
@@ -394,11 +394,11 @@
HIGHBD_MASKSADMXN_AVX2(32, 8);
HIGHBD_MASKSADMXN_AVX2(16, 64);
HIGHBD_MASKSADMXN_AVX2(64, 16);
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_MASKSADMXN_AVX2(4, 32);
HIGHBD_MASKSADMXN_AVX2(32, 4);
HIGHBD_MASKSADMXN_AVX2(8, 64);
HIGHBD_MASKSADMXN_AVX2(64, 8);
HIGHBD_MASKSADMXN_AVX2(4, 64);
HIGHBD_MASKSADMXN_AVX2(64, 4);
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
diff --git a/aom_dsp/x86/masked_sad_intrin_ssse3.c b/aom_dsp/x86/masked_sad_intrin_ssse3.c
index 5673b36..8021f0c 100644
--- a/aom_dsp/x86/masked_sad_intrin_ssse3.c
+++ b/aom_dsp/x86/masked_sad_intrin_ssse3.c
@@ -91,14 +91,14 @@
MASKSADMXN_SSSE3(32, 8)
MASKSADMXN_SSSE3(16, 64)
MASKSADMXN_SSSE3(64, 16)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
MASKSAD4XN_SSSE3(32)
MASKSADMXN_SSSE3(32, 4)
MASKSAD8XN_SSSE3(64)
MASKSADMXN_SSSE3(64, 8)
MASKSAD4XN_SSSE3(64)
MASKSADMXN_SSSE3(64, 4)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
static INLINE unsigned int masked_sad_ssse3(const uint8_t *src_ptr,
int src_stride,
@@ -291,14 +291,14 @@
HIGHBD_MASKSADMXN_SSSE3(32, 8)
HIGHBD_MASKSADMXN_SSSE3(16, 64)
HIGHBD_MASKSADMXN_SSSE3(64, 16)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_MASKSAD4XN_SSSE3(32)
HIGHBD_MASKSADMXN_SSSE3(32, 4)
HIGHBD_MASKSADMXN_SSSE3(8, 64)
HIGHBD_MASKSADMXN_SSSE3(64, 8)
HIGHBD_MASKSAD4XN_SSSE3(64)
HIGHBD_MASKSADMXN_SSSE3(64, 4)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
static INLINE unsigned int highbd_masked_sad_ssse3(
const uint16_t *src_ptr, int src_stride, const uint16_t *a_ptr,
diff --git a/aom_dsp/x86/masked_variance_intrin_ssse3.c b/aom_dsp/x86/masked_variance_intrin_ssse3.c
index a74a4af..7783e32 100644
--- a/aom_dsp/x86/masked_variance_intrin_ssse3.c
+++ b/aom_dsp/x86/masked_variance_intrin_ssse3.c
@@ -133,14 +133,14 @@
MASK_SUBPIX_VAR_SSSE3(32, 8)
MASK_SUBPIX_VAR_SSSE3(64, 16)
MASK_SUBPIX_VAR_SSSE3(16, 64)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
MASK_SUBPIX_VAR_SSSE3(64, 8)
MASK_SUBPIX_VAR8XH_SSSE3(64)
MASK_SUBPIX_VAR_SSSE3(32, 4)
MASK_SUBPIX_VAR4XH_SSSE3(32)
MASK_SUBPIX_VAR_SSSE3(64, 4)
MASK_SUBPIX_VAR4XH_SSSE3(64)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
static INLINE __m128i filter_block(const __m128i a, const __m128i b,
const __m128i filter) {
@@ -679,11 +679,11 @@
return (var >= 0) ? (uint32_t)var : 0; \
}
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_MASK_SUBPIX_VAR_SSSE3(256, 256)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(256, 128)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(128, 256)
-#endif // CONFIG_BLOCK_256X256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_MASK_SUBPIX_VAR_SSSE3(128, 128)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(128, 64)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(64, 128)
@@ -706,14 +706,14 @@
HIGHBD_MASK_SUBPIX_VAR_SSSE3(32, 8)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(16, 64)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(64, 16)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_MASK_SUBPIX_VAR_SSSE3(8, 64)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(64, 8)
HIGHBD_MASK_SUBPIX_VAR4XH_SSSE3(32)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(32, 4)
HIGHBD_MASK_SUBPIX_VAR4XH_SSSE3(64)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(64, 4)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
static INLINE __m128i highbd_filter_block(const __m128i a, const __m128i b,
const __m128i filter) {
diff --git a/aom_dsp/x86/obmc_sad_avx2.c b/aom_dsp/x86/obmc_sad_avx2.c
index d8f27ee..17a0d3b 100644
--- a/aom_dsp/x86/obmc_sad_avx2.c
+++ b/aom_dsp/x86/obmc_sad_avx2.c
@@ -148,11 +148,11 @@
HBD_OBMCSADWXH(32, 8)
HBD_OBMCSADWXH(16, 64)
HBD_OBMCSADWXH(64, 16)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HBD_OBMCSADWXH(4, 32)
HBD_OBMCSADWXH(32, 4)
HBD_OBMCSADWXH(8, 64)
HBD_OBMCSADWXH(64, 8)
HBD_OBMCSADWXH(4, 64)
HBD_OBMCSADWXH(64, 4)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
diff --git a/aom_dsp/x86/obmc_sad_sse4.c b/aom_dsp/x86/obmc_sad_sse4.c
index 9bcf93e..87d2de5 100644
--- a/aom_dsp/x86/obmc_sad_sse4.c
+++ b/aom_dsp/x86/obmc_sad_sse4.c
@@ -143,11 +143,11 @@
HBD_OBMCSADWXH(32, 8)
HBD_OBMCSADWXH(16, 64)
HBD_OBMCSADWXH(64, 16)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HBD_OBMCSADWXH(4, 32)
HBD_OBMCSADWXH(32, 4)
HBD_OBMCSADWXH(8, 64)
HBD_OBMCSADWXH(64, 8)
HBD_OBMCSADWXH(4, 64)
HBD_OBMCSADWXH(64, 4)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
diff --git a/aom_dsp/x86/obmc_variance_sse4.c b/aom_dsp/x86/obmc_variance_sse4.c
index 689aaf5..fa5303e 100644
--- a/aom_dsp/x86/obmc_variance_sse4.c
+++ b/aom_dsp/x86/obmc_variance_sse4.c
@@ -213,11 +213,11 @@
return (var >= 0) ? (uint32_t)var : 0; \
}
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
HBD_OBMCVARWXH(256, 256)
HBD_OBMCVARWXH(256, 128)
HBD_OBMCVARWXH(128, 256)
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
HBD_OBMCVARWXH(128, 128)
HBD_OBMCVARWXH(128, 64)
HBD_OBMCVARWXH(64, 128)
@@ -240,11 +240,11 @@
HBD_OBMCVARWXH(32, 8)
HBD_OBMCVARWXH(16, 64)
HBD_OBMCVARWXH(64, 16)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HBD_OBMCVARWXH(4, 32)
HBD_OBMCVARWXH(32, 4)
HBD_OBMCVARWXH(8, 64)
HBD_OBMCVARWXH(64, 8)
HBD_OBMCVARWXH(4, 64)
HBD_OBMCVARWXH(64, 4)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
diff --git a/aom_scale/yv12config.h b/aom_scale/yv12config.h
index 4aa5936..7e58ccf 100644
--- a/aom_scale/yv12config.h
+++ b/aom_scale/yv12config.h
@@ -29,7 +29,7 @@
/*!\cond */
#define AOM_INTERP_EXTEND 4
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
#define AOMINNERBORDERINPIXELS \
ALIGN_POWER_OF_TWO(256 + 2 * AOM_INTERP_EXTEND, 5)
#define AOM_BORDER_IN_PIXELS \
@@ -42,7 +42,7 @@
#define AOM_BORDER_IN_PIXELS (2 * 128 + 32)
#define AOM_ENC_NO_SCALE_BORDER (128 + 32)
#define AOM_DEC_BORDER_IN_PIXELS 64
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#if CONFIG_AV1_ENCODER
struct image_pyramid;
diff --git a/apps/aomenc.c b/apps/aomenc.c
index 9f426af..c6d7821 100644
--- a/apps/aomenc.c
+++ b/apps/aomenc.c
@@ -631,13 +631,13 @@
/* These parameters are set in the function parseCfg.
In absence of these parameters in the config file,
the default values should match */
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
config->superblock_size = 256;
config->max_partition_size = 256;
#else
config->superblock_size = 128;
config->max_partition_size = 128;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
config->min_partition_size = 4;
config->enable_ab_partitions = 1;
config->enable_rect_partitions = 1;
diff --git a/av1/arg_defs.c b/av1/arg_defs.c
index 722ce00..f0eeda8 100644
--- a/av1/arg_defs.c
+++ b/av1/arg_defs.c
@@ -486,7 +486,7 @@
"(4:4x4, 8:8x8, 16:16x16, 32:32x32, 64:64x64, 128:128x128). "
"On frame with 4k+ resolutions or higher speed settings, the min "
"partition size will have a minimum of 8."),
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
.max_partition_size = ARG_DEF(
NULL, "max-partition-size", 1,
"Set max partition size "
@@ -496,7 +496,7 @@
ARG_DEF(NULL, "max-partition-size", 1,
"Set max partition size "
"(4:4x4, 8:8x8, 16:16x16, 32:32x32, 64:64x64, 128:128x128)"),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
.enable_chroma_deltaq = ARG_DEF(NULL, "enable-chroma-deltaq", 1,
"Enable chroma delta quant "
"(0: false (default), 1: true)"),
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index dcccc77..5b1c87f 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -506,11 +506,11 @@
1, // enable mvd-sign derivation
#endif // CONFIG_DERIVED_MVD_SIGN
4, // min_partition_size
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
256, // max_partition_size
#else
128, // max_partition_size
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
1, // enable intra edge filter
1, // frame order hint
1, // enable 64-pt transform usage
@@ -871,7 +871,7 @@
RANGE_CHECK(extra_cfg, mode_cost_upd_freq, 0, 2);
RANGE_CHECK(extra_cfg, mv_cost_upd_freq, 0, 3);
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
RANGE_CHECK(extra_cfg, min_partition_size, 4, 256);
// when sdp is enabled, the maximum partition size must be equal to or greater
// than 8x8
@@ -887,7 +887,7 @@
RANGE_CHECK(extra_cfg, max_partition_size, 8, 128);
else
RANGE_CHECK(extra_cfg, max_partition_size, 4, 128);
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
RANGE_CHECK_HI(extra_cfg, min_partition_size, extra_cfg->max_partition_size);
for (int i = 0; i < MAX_NUM_OPERATING_POINTS; ++i) {
diff --git a/av1/common/av1_common_int.h b/av1/common/av1_common_int.h
index 569ab3e..8d9305e 100644
--- a/av1/common/av1_common_int.h
+++ b/av1/common/av1_common_int.h
@@ -2561,11 +2561,7 @@
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_BLOCK_256
- if (bsize < BLOCK_128X128) out[0] -= cdf_element_prob(in, PARTITION_HORZ_4);
-#else
if (bsize != BLOCK_128X128) out[0] -= cdf_element_prob(in, PARTITION_HORZ_4);
-#endif // CONFIG_BLOCK_256
out[0] = AOM_ICDF(out[0]);
out[1] = AOM_ICDF(CDF_PROB_TOP);
}
@@ -2580,11 +2576,7 @@
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_BLOCK_256
- if (bsize < BLOCK_128X128) out[0] -= cdf_element_prob(in, PARTITION_VERT_4);
-#else
if (bsize != BLOCK_128X128) out[0] -= cdf_element_prob(in, PARTITION_VERT_4);
-#endif // CONFIG_BLOCK_256
out[0] = AOM_ICDF(out[0]);
out[1] = AOM_ICDF(CDF_PROB_TOP);
}
@@ -2667,7 +2659,7 @@
}
#endif // CONFIG_EXTENDED_SDP
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
/*!\brief Returns the context used by \ref PARTITION_SPLIT. */
static INLINE int square_split_context(const MACROBLOCKD *xd, int mi_row,
int mi_col, BLOCK_SIZE bsize) {
@@ -2685,7 +2677,7 @@
return (left * 2 + above) + (bsize == BLOCK_256X256) * PARTITION_PLOFFSET;
}
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
static INLINE int partition_plane_context(const MACROBLOCKD *xd, int mi_row,
#if CONFIG_PARTITION_CONTEXT_REDUCE
@@ -2725,11 +2717,11 @@
13, // BLOCK_64X128,
14, // BLOCK_128X64,
15, // BLOCK_128X128,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
16, // BLOCK_128X256,
17, // BLOCK_256X128,
18, // BLOCK_256X256,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
19, // BLOCK_4X16,
20, // BLOCK_16X4,
21, // BLOCK_8X32,
@@ -2759,14 +2751,10 @@
// Return the number of elements in the partition CDF when
// partitioning the (square) block with luma block size of bsize.
static INLINE int partition_cdf_length(BLOCK_SIZE bsize) {
- if (bsize <= BLOCK_8X8) return PARTITION_TYPES;
-#if CONFIG_BLOCK_256
- else if (bsize >= BLOCK_128X128)
- return EXT_PARTITION_TYPES - 2;
-#else
+ if (bsize <= BLOCK_8X8)
+ return PARTITION_TYPES;
else if (bsize == BLOCK_128X128)
return EXT_PARTITION_TYPES - 2;
-#endif // CONFIG_BLOCK_256
else
return EXT_PARTITION_TYPES;
}
@@ -2998,11 +2986,11 @@
#if CONFIG_INTRA_SDP_LATENCY_FIX
return bsize >= BLOCK_64X64 && bsize <= BLOCK_LARGEST;
#else
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
return bsize >= BLOCK_128X128 && bsize <= BLOCK_256X256;
#else
return bsize == BLOCK_128X128;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#endif // CONFIG_INTRA_SDP_LATENCY_FIX
}
@@ -3268,9 +3256,9 @@
static INLINE TX_SIZE get_sqr_tx_size(int tx_dim) {
switch (tx_dim) {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
case 256:
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
case 128:
case 64: return TX_64X64; break;
case 32: return TX_32X32; break;
@@ -3292,7 +3280,7 @@
case 16: return (height == 32) ? TX_16X32 : TX_INVALID;
case 32: return (height == 64) ? TX_32X64 : TX_INVALID;
}
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
} else if ((4 * width) < height) {
switch (width) {
case 4:
@@ -3301,7 +3289,7 @@
: TX_INVALID;
case 8: return (height == 64) ? TX_8X64 : TX_INVALID;
}
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
} else {
switch (width) {
case 4: return (height == 16) ? TX_4X16 : TX_INVALID;
@@ -3317,14 +3305,14 @@
case 16: return (width == 32) ? TX_32X16 : TX_INVALID;
case 32: return (width == 64) ? TX_64X32 : TX_INVALID;
}
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
} else if ((4 * height) < width) {
switch (height) {
case 4:
return (width == 32) ? TX_32X4 : (width == 64) ? TX_64X4 : TX_INVALID;
case 8: return (width == 64) ? TX_64X8 : TX_INVALID;
}
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
} else {
switch (height) {
case 4: return (width == 16) ? TX_16X4 : TX_INVALID;
@@ -3648,13 +3636,13 @@
static AOM_INLINE void av1_set_frame_sb_size(AV1_COMMON *cm,
BLOCK_SIZE sb_size) {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
// BLOCK_256X256 gives no benefits in all intra encoding, so downsize the
// superblock size to 128x128 on key frames.
if (frame_is_intra_only(cm) && sb_size == BLOCK_256X256) {
sb_size = BLOCK_128X128;
}
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
cm->sb_size = sb_size;
cm->mib_size = mi_size_wide[sb_size];
cm->mib_size_log2 = mi_size_wide_log2[sb_size];
diff --git a/av1/common/av1_inv_txfm1d_cfg.h b/av1/common/av1_inv_txfm1d_cfg.h
index 3705281..b8b8f34 100644
--- a/av1/common/av1_inv_txfm1d_cfg.h
+++ b/av1/common/av1_inv_txfm1d_cfg.h
@@ -34,14 +34,14 @@
7, // 32x8 transform
7, // 16x64 transform
7, // 64x16 transform
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
6, // 4x32 transform
6, // 32x4 transform
6, // 8x64 transform
6, // 64x8 transform
7, // 4x64 transform
7, // 64x4 transform
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
extern const int8_t *av1_inv_txfm_shift_ls[TX_SIZES_ALL];
diff --git a/av1/common/av1_inv_txfm2d.c b/av1/common/av1_inv_txfm2d.c
index b28ee69..bcc1809 100644
--- a/av1/common/av1_inv_txfm2d.c
+++ b/av1/common/av1_inv_txfm2d.c
@@ -399,14 +399,14 @@
static const int8_t inv_shift_32x8[2] = { -2, -4 };
static const int8_t inv_shift_16x64[2] = { -2, -4 };
static const int8_t inv_shift_64x16[2] = { -2, -4 };
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
static const int8_t inv_shift_4x32[2] = { -1, -4 };
static const int8_t inv_shift_32x4[2] = { -1, -4 };
static const int8_t inv_shift_8x64[2] = { -1, -4 };
static const int8_t inv_shift_64x8[2] = { -1, -4 };
static const int8_t inv_shift_4x64[2] = { -2, -4 };
static const int8_t inv_shift_64x4[2] = { -2, -4 };
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
const int8_t *av1_inv_txfm_shift_ls[TX_SIZES_ALL] = {
inv_shift_4x4, inv_shift_8x8, inv_shift_16x16, inv_shift_32x32,
@@ -414,10 +414,10 @@
inv_shift_16x8, inv_shift_16x32, inv_shift_32x16, inv_shift_32x64,
inv_shift_64x32, inv_shift_4x16, inv_shift_16x4, inv_shift_8x32,
inv_shift_32x8, inv_shift_16x64, inv_shift_64x16,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
inv_shift_4x32, inv_shift_32x4, inv_shift_8x64, inv_shift_64x8,
inv_shift_4x64, inv_shift_64x4,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
/* clang-format off */
@@ -1136,7 +1136,7 @@
bd);
}
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
void av1_inv_txfm2d_add_4x32_c(const int32_t *input, uint16_t *output,
int stride, TX_TYPE tx_type,
#if CONFIG_INTER_DDT
@@ -1248,4 +1248,4 @@
#endif // CONFIG_INTER_DDT
bd);
}
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
diff --git a/av1/common/av1_rtcd_defs.pl b/av1/common/av1_rtcd_defs.pl
index bc2e598..65f5276 100644
--- a/av1/common/av1_rtcd_defs.pl
+++ b/av1/common/av1_rtcd_defs.pl
@@ -175,7 +175,7 @@
specialize qw/av1_highbd_inv_txfm_add_64x32 neon/;
add_proto qw/void av1_highbd_inv_txfm_add_64x16/, "const tran_low_t *input, uint16_t *dest, int stride, const TxfmParam *txfm_param";
specialize qw/av1_highbd_inv_txfm_add_64x64 neon/;
-if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
+if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
add_proto qw/void av1_highbd_inv_txfm_add_4x32/, "const tran_low_t *input, uint16_t *dest, int stride, const TxfmParam *txfm_param";
specialize qw/av1_highbd_inv_txfm_add_4x32 sse4_1/;
add_proto qw/void av1_highbd_inv_txfm_add_32x4/, "const tran_low_t *input, uint16_t *dest, int stride, const TxfmParam *txfm_param";
@@ -223,7 +223,7 @@
add_proto qw/void av1_inv_txfm2d_add_8x32/, "const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int use_ddt, int bd";
add_proto qw/void av1_inv_txfm2d_add_32x8/, "const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int use_ddt, int bd";
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
add_proto qw/void av1_inv_txfm2d_add_4x32/, "const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int use_ddt, int bd";
add_proto qw/void av1_inv_txfm2d_add_32x4/, "const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int use_ddt, int bd";
add_proto qw/void av1_inv_txfm2d_add_8x64/, "const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int use_ddt, int bd";
@@ -272,7 +272,7 @@
specialize qw/av1_inv_txfm2d_add_8x32 neon/;
add_proto qw/void av1_inv_txfm2d_add_32x8/, "const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd";
specialize qw/av1_inv_txfm2d_add_32x8 neon/;
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
add_proto qw/void av1_inv_txfm2d_add_4x32/, "const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd";
add_proto qw/void av1_inv_txfm2d_add_32x4/, "const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd";
add_proto qw/void av1_inv_txfm2d_add_8x64/, "const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd";
@@ -443,7 +443,7 @@
specialize qw/av1_fwd_txfm2d_16x64 sse4_1/;
add_proto qw/void av1_fwd_txfm2d_64x16/, "const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int use_ddt, int bd";
specialize qw/av1_fwd_txfm2d_64x16 sse4_1/;
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
add_proto qw/void av1_fwd_txfm2d_4x32/, "const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int use_ddt, int bd";
specialize qw/av1_fwd_txfm2d_4x32 sse4_1/;
add_proto qw/void av1_fwd_txfm2d_32x4/, "const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int use_ddt, int bd";
@@ -468,7 +468,7 @@
specialize qw/av1_fwd_txfm2d_16x64 sse4_1 neon/;
add_proto qw/void av1_fwd_txfm2d_64x16/, "const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd";
specialize qw/av1_fwd_txfm2d_64x16 sse4_1 neon/;
- if (aom_config("CONFIG_FLEX_PARTITION") eq "yes") {
+ if (aom_config("CONFIG_EXT_RECUR_PARTITIONS") eq "yes") {
add_proto qw/void av1_fwd_txfm2d_4x32/, "const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd";
specialize qw/av1_fwd_txfm2d_4x32 sse4_1/;
add_proto qw/void av1_fwd_txfm2d_32x4/, "const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd";
diff --git a/av1/common/av1_txfm.h b/av1/common/av1_txfm.h
index b466125..80623eb 100644
--- a/av1/common/av1_txfm.h
+++ b/av1/common/av1_txfm.h
@@ -239,18 +239,18 @@
if (col > row) {
if (col == row * 2) return 1;
if (col == row * 4) return 2;
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
if (col == row * 8) return 3;
if (col == row * 16) return 4;
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
assert(0 && "Unsupported transform size");
} else {
if (row == col * 2) return -1;
if (row == col * 4) return -2;
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
if (row == col * 8) return -3;
if (row == col * 16) return -4;
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
assert(0 && "Unsupported transform size");
}
return 0; // Invalid
diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 7d883c1..cb09f52 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -380,11 +380,11 @@
} TXB_POS_INFO;
#endif // CONFIG_NEW_TX_PARTITION
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
#define INTER_TX_SIZE_BUF_LEN 64
#else
#define INTER_TX_SIZE_BUF_LEN 16
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#define TXK_TYPE_BUF_LEN 64
/*!\endcond */
@@ -944,7 +944,6 @@
if (!is_ext_partition_allowed_at_bsize(bsize, tree_type)) {
return false;
}
-#if CONFIG_FLEX_PARTITION
// If 16x8 block performs HORZ_3 split, we'll get a block size 16x2, which is
// invalid. So, extended partitions are disabled. Same goes for tall blocks.
if ((bsize == BLOCK_16X8 && rect_type == HORZ) ||
@@ -975,15 +974,6 @@
return false;
}
#endif // CONFIG_CB1TO4_SPLIT
-#else
- // A splittable wide block has ratio 2:1. If it performs HORZ_3 split, then
- // we'll get a block ratio of 2:0.25 == 8:1, which is illegal. So extended
- // partition is disabled. The same goes for tall block.
- if ((is_wide_block(bsize) && rect_type == HORZ) ||
- (is_tall_block(bsize) && rect_type == VERT)) {
- return false;
- }
-#endif // CONFIG_FLEX_PARTITION
assert(IMPLIES(rect_type == HORZ,
subsize_lookup[PARTITION_HORZ_3][bsize] != BLOCK_INVALID));
assert(IMPLIES(rect_type == VERT,
@@ -996,7 +986,6 @@
static AOM_INLINE bool is_uneven_4way_partition_allowed_at_bsize(
BLOCK_SIZE bsize, TREE_TYPE tree_type) {
if (!is_ext_partition_allowed_at_bsize(bsize, tree_type)) return false;
-#if CONFIG_FLEX_PARTITION
#if CONFIG_CB1TO4_SPLIT
if (bsize > BLOCK_LARGEST) {
if (bsize >= BLOCK_16X64) { // 16x64, 64x16
@@ -1020,9 +1009,6 @@
return true;
}
return false;
-#else
- return true;
-#endif // CONFIG_FLEX_PARTITION
}
/*!\brief Checks whether uneven 4-way partition is allowed for current bsize and
@@ -1033,7 +1019,6 @@
if (!is_uneven_4way_partition_allowed_at_bsize(bsize, tree_type)) {
return false;
}
-#if CONFIG_FLEX_PARTITION
const int bw = block_size_wide[bsize];
const int bh = block_size_high[bsize];
assert(bw <= 64 && bh <= 64);
@@ -1045,16 +1030,6 @@
if (bw == 64) return true;
if (bw >= 32 && tree_type != CHROMA_PART) return true;
}
-#else
- if (rect_type == HORZ) {
- if (bsize == BLOCK_32X64) return true;
- if (bsize == BLOCK_16X32 && tree_type != CHROMA_PART) return true;
- } else {
- assert(rect_type == VERT);
- if (bsize == BLOCK_64X32) return true;
- if (bsize == BLOCK_32X16 && tree_type != CHROMA_PART) return true;
- }
-#endif // CONFIG_FLEX_PARTITION
return false;
}
@@ -1063,14 +1038,12 @@
static AOM_INLINE RECT_PART_TYPE
rect_type_implied_by_bsize(BLOCK_SIZE bsize, TREE_TYPE tree_type) {
// Handle luma part first
-#if CONFIG_BLOCK_256
if (bsize == BLOCK_128X256) {
return HORZ;
}
if (bsize == BLOCK_256X128) {
return VERT;
}
-#endif // CONFIG_BLOCK_256
if (bsize == BLOCK_4X8 || bsize == BLOCK_64X128
#if CONFIG_CB1TO4_SPLIT
|| bsize == BLOCK_4X16
@@ -1109,14 +1082,8 @@
/*!\brief Returns whether square split is allowed for current bsize. */
static AOM_INLINE bool is_square_split_eligible(BLOCK_SIZE bsize,
BLOCK_SIZE sb_size) {
-#if CONFIG_BLOCK_256
(void)sb_size;
return bsize == BLOCK_128X128 || bsize == BLOCK_256X256;
-#else
- (void)bsize;
- (void)sb_size;
- return false;
-#endif // CONFIG_BLOCK_256
}
/*!\brief Returns whether the current partition is horizontal type or vertical
@@ -1184,9 +1151,9 @@
case BLOCK_32X32: return 3;
case BLOCK_64X64: return 4;
case BLOCK_128X128: return 5;
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
case BLOCK_256X256: return 6;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
default: return SQR_BLOCK_SIZES;
}
}
@@ -1249,11 +1216,9 @@
BLOCK_INVALID, // BLOCK_64X128
BLOCK_INVALID, // BLOCK_128X64
BLOCK_INVALID, // BLOCK_128X128
-#if CONFIG_BLOCK_256
BLOCK_INVALID, // BLOCK_128X256
BLOCK_INVALID, // BLOCK_256X128
BLOCK_INVALID, // BLOCK_256X256
-#endif // CONFIG_BLOCK_256
#if CONFIG_CB1TO4_SPLIT
BLOCK_INVALID, // BLOCK_4X16
BLOCK_INVALID, // BLOCK_16X4
@@ -1318,9 +1283,6 @@
#endif // CONFIG_EXT_RECUR_PARTITIONS
static INLINE int is_partition_valid(BLOCK_SIZE bsize, PARTITION_TYPE p) {
-#if CONFIG_EXT_RECUR_PARTITIONS && !CONFIG_BLOCK_256
- if (p == PARTITION_SPLIT) return 0;
-#endif // CONFIG_EXT_RECUR_PARTITIONS && !CONFIG_BLOCK_256
if (is_partition_point(bsize))
return get_partition_subsize(bsize, p) < BLOCK_SIZES_ALL;
else
@@ -1821,13 +1783,13 @@
// - Current superblock, on decoder side.
uint8_t *color_index_map;
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
// block size in pixels
uint16_t width, height;
#else
// block size in pixels
uint8_t width, height;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
qm_val_t *seg_iqmatrix[MAX_SEGMENTS][TX_SIZES_ALL];
qm_val_t *seg_qmatrix[MAX_SEGMENTS][TX_SIZES_ALL];
@@ -3291,25 +3253,25 @@
3,
3,
3,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
3,
3,
3,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
0,
1,
1,
2,
2,
3,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
0,
2,
1,
3,
0,
3,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static const uint8_t tw_h_log2_table[BLOCK_SIZES_ALL] = {
0,
@@ -3328,25 +3290,25 @@
3,
3,
3,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
3,
3,
3,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
1,
0,
2,
1,
3,
2,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
2,
0,
3,
1,
3,
0,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static const uint8_t stride_log2_table[BLOCK_SIZES_ALL] = {
0,
@@ -3365,25 +3327,25 @@
1,
2,
2,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
2,
3,
3,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
0,
1,
0,
1,
0,
1,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
0,
1,
0,
1,
0,
1,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
const int index =
((blk_row >> tw_h_log2_table[bsize]) << stride_log2_table[bsize]) +
@@ -3438,11 +3400,11 @@
2,
2,
2,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
2,
2,
2,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
0,
0,
1,
@@ -3467,11 +3429,11 @@
2,
2,
2,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
2,
2,
2,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
0,
0,
1,
@@ -3496,11 +3458,11 @@
2,
3,
3,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
3,
4,
4,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
0,
2,
0,
@@ -4066,25 +4028,25 @@
2,
2,
2,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
2,
2,
2,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
2,
2,
2,
2,
2,
2,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
2,
2,
2,
2,
2,
2,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
return bsize_to_max_depth_table[bsize];
}
@@ -4120,25 +4082,25 @@
4,
4,
4,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
4,
4,
4,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
2,
2,
3,
3,
4,
4,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
3,
3,
4,
4,
4,
4,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
const int depth = bsize_to_tx_size_depth_table[bsize];
assert(depth <= MAX_TX_CATS);
@@ -4159,12 +4121,12 @@
case TX_32X64: return TX_32X32;
case TX_64X16: return TX_32X16;
case TX_16X64: return TX_16X32;
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
case TX_64X8: return TX_32X8;
case TX_8X64: return TX_8X32;
case TX_64X4: return TX_32X4;
case TX_4X64: return TX_4X32;
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
default: return tx_size;
}
}
@@ -4375,12 +4337,12 @@
return !has_second_ref(mbmi);
}
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
static const int max_neighbor_obmc[MAX_SB_SIZE - 1] = { 0, 1, 2, 3, 4, 4, 4 };
#else
// input: log2 of length, 0(4), 1(8), ...
static const int max_neighbor_obmc[MAX_SB_SIZE - 1] = { 0, 1, 2, 3, 4, 4 };
-#endif // BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
static INLINE int check_num_overlappable_neighbors(const MB_MODE_INFO *mbmi) {
return !(mbmi->overlappable_neighbors[0] == 0 &&
@@ -4547,14 +4509,14 @@
if (tx_size == TX_16X64 || tx_size == TX_64X16) {
return 512;
}
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
if (tx_size == TX_8X64 || tx_size == TX_64X8) {
return 256;
}
if (tx_size == TX_4X64 || tx_size == TX_64X4) {
return 128;
}
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
return tx_size_2d[tx_size];
}
diff --git a/av1/common/cdef.c b/av1/common/cdef.c
index 9c215a1..1ddfcca 100644
--- a/av1/common/cdef.c
+++ b/av1/common/cdef.c
@@ -41,20 +41,20 @@
int maxc = mi_params->mi_cols - mi_col;
int maxr = mi_params->mi_rows - mi_row;
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
if (bs == BLOCK_256X256 || bs == BLOCK_256X128) {
maxc = AOMMIN(maxc, MI_SIZE_256X256);
} else
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
if (bs == BLOCK_128X128 || bs == BLOCK_128X64)
maxc = AOMMIN(maxc, MI_SIZE_128X128);
else
maxc = AOMMIN(maxc, MI_SIZE_64X64);
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
if (bs == BLOCK_256X256 || bs == BLOCK_128X256) {
maxr = AOMMIN(maxr, MI_SIZE_256X256);
} else
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
if (bs == BLOCK_128X128 || bs == BLOCK_64X128)
maxr = AOMMIN(maxr, MI_SIZE_128X128);
else
diff --git a/av1/common/cfl.c b/av1/common/cfl.c
index f164204..ea7b07e 100644
--- a/av1/common/cfl.c
+++ b/av1/common/cfl.c
@@ -965,7 +965,7 @@
#endif // CONFIG_IMPROVED_CFL
}
-#if !CONFIG_FLEX_PARTITION
+#if !CONFIG_EXT_RECUR_PARTITIONS
static INLINE int max_intra_block_width(const MACROBLOCKD *xd,
BLOCK_SIZE plane_bsize, int plane,
TX_SIZE tx_size) {
@@ -981,7 +981,7 @@
<< MI_SIZE_LOG2;
return ALIGN_POWER_OF_TWO(max_blocks_high, tx_size_high_log2[tx_size]);
}
-#endif // !CONFIG_FLEX_PARTITION
+#endif // !CONFIG_EXT_RECUR_PARTITIONS
void cfl_store_block(MACROBLOCKD *const xd, BLOCK_SIZE bsize, TX_SIZE tx_size
#if CONFIG_IMPROVED_CFL
@@ -991,7 +991,7 @@
) {
CFL_CTX *const cfl = &xd->cfl;
struct macroblockd_plane *const pd = &xd->plane[AOM_PLANE_Y];
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
// Always store full block, even if partially outside frame boundary.
const int width = block_size_wide[bsize];
const int height = block_size_high[bsize];
@@ -1001,7 +1001,7 @@
// get_tx_size(width, height) below.
const int width = max_intra_block_width(xd, bsize, AOM_PLANE_Y, tx_size);
const int height = max_intra_block_height(xd, bsize, AOM_PLANE_Y, tx_size);
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
const int mi_row = -xd->mb_to_top_edge >> MI_SUBPEL_SIZE_LOG2;
const int mi_col = -xd->mb_to_left_edge >> MI_SUBPEL_SIZE_LOG2;
const int row_offset = mi_row - xd->mi[0]->chroma_ref_info.mi_row_chroma_base;
diff --git a/av1/common/cfl.h b/av1/common/cfl.h
index 61fc1f7..22f0364 100644
--- a/av1/common/cfl.h
+++ b/av1/common/cfl.h
@@ -102,7 +102,7 @@
if (cm->seq_params.monochrome) return CFL_DISALLOWED;
if (!xd->is_chroma_ref) {
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
// CfL is available to luma partitions lesser than or equal to 32x32.
const BLOCK_SIZE bsize = mbmi->sb_type[0];
assert(bsize < BLOCK_SIZES_ALL);
@@ -119,7 +119,7 @@
block_size_wide[mbmi->sb_type[0]] <= 32 &&
block_size_high[mbmi->sb_type[0]] <= 32));
return CFL_ALLOWED;
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
}
// If this block has chroma information, we know whether we're
@@ -281,7 +281,7 @@
}
// Declare size-specific wrappers for all valid CfL sizes.
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
#if CONFIG_CFL_64x64
#define CFL_SUBSAMPLE_FUNCTIONS(arch, sub, bd) \
CFL_SUBSAMPLE(arch, sub, bd, 4, 4) \
@@ -359,11 +359,11 @@
CFL_SUBSAMPLE_FUNCTION_ARRAY(arch, sub, bd) \
return subfn_##sub[tx_size]; \
}
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// Declare an architecture-specific array of function pointers for size-specific
// wrappers.
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
#if CONFIG_CFL_64x64
#define CFL_SUBSAMPLE_FUNCTION_ARRAY(arch, sub, bd) \
static const cfl_subsample_##bd##_fn subfn_##sub[TX_SIZES_ALL] = { \
@@ -446,7 +446,7 @@
NULL, /* 16x64 (invalid CFL size) */ \
NULL, /* 64x16 (invalid CFL size) */ \
};
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// The RTCD script does not support passing in an array, so we wrap it in this
// function.
@@ -467,7 +467,7 @@
}
// Declare size-specific wrappers for all valid CfL sizes.
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
#if CONFIG_CFL_64x64
#define CFL_SUB_AVG_FN(arch) \
CFL_SUB_AVG_X(arch, 4, 4, 8, 4) \
@@ -623,7 +623,7 @@
/* index the function pointer array out of bounds. */ \
return sub_avg[tx_size % TX_SIZES_ALL]; \
}
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// For VSX SIMD optimization, the C versions of width == 4 subtract are
// faster than the VSX. As such, the VSX code calls the C versions.
@@ -644,7 +644,7 @@
#define CFL_PREDICT_X(arch, width, height, bd) \
CFL_PREDICT_##bd(arch, width, height)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
#if CONFIG_CFL_64x64
#define CFL_PREDICT_FN(arch, bd) \
CFL_PREDICT_X(arch, 4, 4, bd) \
@@ -797,6 +797,6 @@
/* index the function pointer array out of bounds. */ \
return pred[tx_size % TX_SIZES_ALL]; \
}
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#endif // AOM_AV1_COMMON_CFL_H_
diff --git a/av1/common/common_data.h b/av1/common/common_data.h
index 449a3bc..6a0f72d 100644
--- a/av1/common/common_data.h
+++ b/av1/common/common_data.h
@@ -28,74 +28,74 @@
// The Mi_Width_Log2 table in the spec (Section 9.3. Conversion tables).
static const uint8_t mi_size_wide_log2[BLOCK_SIZES_ALL] = {
0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
5, 6, 6,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
0, 2, 1, 3, 2, 4,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
0, 3, 1, 4, 0, 4,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
// The Mi_Height_Log2 table in the spec (Section 9.3. Conversion tables).
static const uint8_t mi_size_high_log2[BLOCK_SIZES_ALL] = {
0, 1, 0, 1, 2, 1, 2, 3, 2, 3, 4, 3, 4, 5, 4, 5,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
6, 5, 6,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
2, 0, 3, 1, 4, 2,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
3, 0, 4, 1, 4, 0,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
// Width/height lookup tables in units of mode info (4x4).
// The Num_4x4_Blocks_Wide table in the spec (Section 9.3. Conversion tables).
static const uint8_t mi_size_wide[BLOCK_SIZES_ALL] = {
1, 1, 2, 2, 2, 4, 4, 4, 8, 8, 8, 16, 16, 16, 32, 32,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
32, 64, 64,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
1, 4, 2, 8, 4, 16,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
1, 8, 2, 16, 1, 16,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
// The Num_4x4_Blocks_High table in the spec (Section 9.3. Conversion tables).
static const uint8_t mi_size_high[BLOCK_SIZES_ALL] = {
1, 2, 1, 2, 4, 2, 4, 8, 4, 8, 16, 8, 16, 32, 16, 32,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
64, 32, 64,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
4, 1, 8, 2, 16, 4,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
8, 1, 16, 2, 16, 1,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
// Width/height lookup tables in units of samples.
// The Block_Width table in the spec (Section 9.3. Conversion tables).
static const uint16_t block_size_wide[BLOCK_SIZES_ALL] = {
4, 4, 8, 8, 8, 16, 16, 16, 32, 32, 32, 64, 64, 64, 128, 128,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
128, 256, 256,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
4, 16, 8, 32, 16, 64,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
4, 32, 8, 64, 4, 64,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
// The Block_Height table in the spec (Section 9.3. Conversion tables).
static const uint16_t block_size_high[BLOCK_SIZES_ALL] = {
4, 8, 4, 8, 16, 8, 16, 32, 16, 32, 64, 32, 64, 128, 64, 128,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
256, 128, 256,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
16, 4, 32, 8, 64, 16,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
32, 4, 64, 8, 64, 4,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
// Maps a block size to a context.
@@ -103,13 +103,13 @@
// AOMMIN(3, AOMMIN(mi_size_wide_log2(bsize), mi_size_high_log2(bsize)))
static const uint8_t size_group_lookup[BLOCK_SIZES_ALL] = {
0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
3, 3, 3,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
0, 0, 1, 1, 2, 2,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
1, 1, 2, 2, 2, 2,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#if CONFIG_NEW_TX_PARTITION
@@ -120,35 +120,35 @@
// for NxN square block size, then (i + 1) is the mapping value of (N)x(2N)
// and (2N)x(N) sizes.
// 3) For block size >= 64x64, the mapping value is 7
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
// 4) For 1:4/4:1 and 1:8/8:1 block sizes, mapping value is 8
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
static const uint8_t size_to_tx_part_group_lookup[BLOCK_SIZES_ALL] = {
0, 0, 0, 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 7, 7, 7,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
7, 7, 7,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
8, 8,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
8, 8, 8, 8, 8, 8, 8, 8, 8, 8
#else
0, 0, 0, 0
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#endif // CONFIG_TX_PARTITION_CTX
static const uint8_t size_to_tx_type_group_lookup[BLOCK_SIZES_ALL] = {
0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 10, 10,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
10, 10, 10,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
11, 12, 13, 14, 15, 16,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
11, 12, 13, 14, 11, 12
#else
0, 0, 0, 0
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#else
#if CONFIG_TX_PARTITION_CTX
@@ -158,44 +158,44 @@
// for NxN square block size, then (i + 1) is the mapping value of (N)x(2N)
// and (2N)x(N) sizes.
// 3) For block size >= 64x64, the mapping value is 7
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
// 4) For 1:4/4:1 and 1:8/8:1 block sizes, mapping value is 8
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
static const uint8_t size_to_tx_part_group_lookup[BLOCK_SIZES_ALL] = {
0, 0, 0, 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 7, 7, 7,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
7, 7, 7,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
0, 0,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
8, 8, 8, 8, 0, 0, 8, 8, 0, 0
#else
0, 0, 0, 0
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#endif // CONFIG_TX_PARTITION_CTX
#endif // CONFIG_NEW_TX_PARTITION
static const uint8_t fsc_bsize_groups[BLOCK_SIZES_ALL] = {
0, 1, 1, 2, 3, 3, 4, 5, 5, 5, 6, 6, 6, 6, 6, 6,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
6, 6, 6,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
3, 3, 4, 4, 6, 6,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
4, 4, 6, 6, 6, 6
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static const uint8_t num_pels_log2_lookup[BLOCK_SIZES_ALL] = {
4, 5, 5, 6, 7, 7, 8, 9, 9, 10, 11, 11, 12, 13, 13, 14,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
15, 15, 16,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
6, 6, 8, 8, 10, 10,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
7, 7, 9, 9, 8, 8,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
// Supported weighting factor for compound weighted prediction
@@ -223,17 +223,13 @@
BLOCK_16X32, BLOCK_32X16, BLOCK_32X32, // 32
BLOCK_32X64, BLOCK_64X32, BLOCK_64X64, // 64
BLOCK_64X128, BLOCK_128X64, BLOCK_128X128, // 128
-#if CONFIG_BLOCK_256
BLOCK_128X256, BLOCK_256X128, BLOCK_256X256, // 256
-#endif // CONFIG_BLOCK_256
BLOCK_4X16, BLOCK_16X4, // 4,16
BLOCK_8X32, BLOCK_32X8, // 8,32
BLOCK_16X64, BLOCK_64X16, // 16,64
-#if CONFIG_FLEX_PARTITION
BLOCK_4X32, BLOCK_32X4, // 4, 32
BLOCK_8X64, BLOCK_64X8, // 8, 64
BLOCK_4X64, BLOCK_64X4, // 4, 64
-#endif // CONFIG_FLEX_PARTITION
}, {
// PARTITION_HORZ
BLOCK_INVALID, // 4
@@ -242,22 +238,13 @@
BLOCK_16X16, BLOCK_32X8, BLOCK_32X16, // 32
BLOCK_32X32, BLOCK_64X16, BLOCK_64X32, // 64
BLOCK_64X64, BLOCK_INVALID, BLOCK_128X64, // 128
-#if CONFIG_BLOCK_256
BLOCK_128X128, BLOCK_INVALID, BLOCK_256X128, // 256
-#endif // CONFIG_BLOCK_256
BLOCK_4X8, BLOCK_INVALID, // 4,16
-#if CONFIG_FLEX_PARTITION
BLOCK_8X16, BLOCK_32X4, // 8,32
BLOCK_16X32, BLOCK_64X8, // 16,64
-#else
- BLOCK_8X16, BLOCK_INVALID, // 8,32
- BLOCK_16X32, BLOCK_INVALID, // 16,64
-#endif // CONFIG_FLEX_PARTITION
-#if CONFIG_FLEX_PARTITION
BLOCK_4X16, BLOCK_INVALID, // 4, 32
BLOCK_8X32, BLOCK_64X4, // 8, 64
BLOCK_4X32, BLOCK_INVALID, // 4, 64
-#endif // CONFIG_FLEX_PARTITION
}, {
// PARTITION_VERT
BLOCK_INVALID, // 4
@@ -266,170 +253,99 @@
BLOCK_8X32, BLOCK_16X16, BLOCK_16X32, // 32
BLOCK_16X64, BLOCK_32X32, BLOCK_32X64, // 64
BLOCK_INVALID, BLOCK_64X64, BLOCK_64X128, // 128
-#if CONFIG_BLOCK_256
BLOCK_INVALID, BLOCK_128X128, BLOCK_128X256, // 256
-#endif // CONFIG_BLOCK_256
BLOCK_INVALID, BLOCK_8X4, // 4,16
-#if CONFIG_FLEX_PARTITION
BLOCK_4X32, BLOCK_16X8, // 8,32
BLOCK_8X64, BLOCK_32X16, // 16,64
-#else
- BLOCK_INVALID, BLOCK_16X8, // 8,32
- BLOCK_INVALID, BLOCK_32X16, // 16,64
-#endif // CONFIG_FLEX_PARTITION
-#if CONFIG_FLEX_PARTITION
BLOCK_INVALID, BLOCK_16X4, // 4, 32
BLOCK_4X64, BLOCK_32X8, // 8, 64
BLOCK_INVALID, BLOCK_32X4, // 4, 64
-#endif // CONFIG_FLEX_PARTITION
}, {
// PARTITION_HORZ_3
BLOCK_INVALID, // 4
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 8
BLOCK_8X4, BLOCK_INVALID, BLOCK_16X4, // 16
-#if CONFIG_FLEX_PARTITION
BLOCK_16X8, BLOCK_32X4, BLOCK_32X8, // 32
BLOCK_32X16, BLOCK_64X8, BLOCK_64X16, // 64
-#else
- BLOCK_16X8, BLOCK_INVALID, BLOCK_32X8, // 32
- BLOCK_32X16, BLOCK_INVALID, BLOCK_64X16, // 64
-#endif // CONFIG_FLEX_PARTITION
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 128
-#if CONFIG_BLOCK_256
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 256
-#endif // CONFIG_BLOCK_256
BLOCK_INVALID, BLOCK_INVALID, // 4,16
BLOCK_8X8, BLOCK_INVALID, // 8,32
-#if CONFIG_FLEX_PARTITION
BLOCK_16X16, BLOCK_64X4, // 16,64
-#else
- BLOCK_16X16, BLOCK_INVALID, // 16,64
-#endif // CONFIG_FLEX_PARTITION
-#if CONFIG_FLEX_PARTITION
BLOCK_INVALID, BLOCK_INVALID, // 4, 32
BLOCK_INVALID, BLOCK_INVALID, // 8, 64
BLOCK_INVALID, BLOCK_INVALID, // 4, 64
-#endif // CONFIG_FLEX_PARTITION
}, {
// PARTITION_VERT_3
BLOCK_INVALID, // 4
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 8
BLOCK_INVALID, BLOCK_4X8, BLOCK_4X16, // 16
-#if CONFIG_FLEX_PARTITION
BLOCK_4X32, BLOCK_8X16, BLOCK_8X32, // 32
BLOCK_8X64, BLOCK_16X32, BLOCK_16X64, // 64
-#else
- BLOCK_INVALID, BLOCK_8X16, BLOCK_8X32, // 32
- BLOCK_INVALID, BLOCK_16X32, BLOCK_16X64, // 64
-#endif // CONFIG_FLEX_PARTITION
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 128
-#if CONFIG_BLOCK_256
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 256
-#endif // CONFIG_BLOCK_256
BLOCK_INVALID, BLOCK_INVALID, // 4,16
BLOCK_INVALID, BLOCK_8X8, // 8,32
-#if CONFIG_FLEX_PARTITION
BLOCK_4X64, BLOCK_16X16, // 16,64
-#else
- BLOCK_INVALID, BLOCK_16X16, // 16,64
-#endif // CONFIG_FLEX_PARTITION
-#if CONFIG_FLEX_PARTITION
BLOCK_INVALID, BLOCK_INVALID, // 4, 32
BLOCK_INVALID, BLOCK_INVALID, // 8, 64
BLOCK_INVALID, BLOCK_INVALID, // 4, 64
-#endif // CONFIG_FLEX_PARTITION
}, { // PARTITION_HORZ_4A
BLOCK_INVALID, // 4
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 8
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 16
-#if CONFIG_FLEX_PARTITION
BLOCK_16X4, BLOCK_INVALID, BLOCK_32X4, // 32
BLOCK_32X8, BLOCK_64X4, BLOCK_64X8, // 64
-#else
- BLOCK_16X4, BLOCK_INVALID, BLOCK_INVALID, // 32
- BLOCK_32X8, BLOCK_INVALID, BLOCK_INVALID, // 64
-#endif // CONFIG_FLEX_PARTITION
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 128
-#if CONFIG_BLOCK_256
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 256
-#endif // CONFIG_BLOCK_256
BLOCK_INVALID, BLOCK_INVALID, // 4,16
BLOCK_8X4, BLOCK_INVALID, // 8,32
BLOCK_16X8, BLOCK_INVALID, // 16,64
-#if CONFIG_FLEX_PARTITION
BLOCK_INVALID, BLOCK_INVALID, // 4, 32
BLOCK_INVALID, BLOCK_INVALID, // 8, 64
BLOCK_INVALID, BLOCK_INVALID, // 4, 64
-#endif // CONFIG_FLEX_PARTITION
}, { // PARTITION_HORZ_4B
BLOCK_INVALID, // 4
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 8
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 16
-#if CONFIG_FLEX_PARTITION
BLOCK_16X4, BLOCK_INVALID, BLOCK_32X4, // 32
BLOCK_32X8, BLOCK_64X4, BLOCK_64X8, // 64
-#else
- BLOCK_16X4, BLOCK_INVALID, BLOCK_INVALID, // 32
- BLOCK_32X8, BLOCK_INVALID, BLOCK_INVALID, // 64
-#endif // CONFIG_FLEX_PARTITION
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 128
-#if CONFIG_BLOCK_256
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 256
-#endif // CONFIG_BLOCK_256
BLOCK_INVALID, BLOCK_INVALID, // 4,16
BLOCK_8X4, BLOCK_INVALID, // 8,32
BLOCK_16X8, BLOCK_INVALID, // 16,64
-#if CONFIG_FLEX_PARTITION
BLOCK_INVALID, BLOCK_INVALID, // 4, 32
BLOCK_INVALID, BLOCK_INVALID, // 8, 64
BLOCK_INVALID, BLOCK_INVALID, // 4, 64
-#endif // CONFIG_FLEX_PARTITION
}, { // PARTITION_VERT_4A
BLOCK_INVALID, // 4
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 8
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 16
-#if CONFIG_FLEX_PARTITION
BLOCK_INVALID, BLOCK_4X16, BLOCK_4X32, // 32
BLOCK_4X64, BLOCK_8X32, BLOCK_8X64, // 64
-#else
- BLOCK_INVALID, BLOCK_4X16, BLOCK_INVALID, // 32
- BLOCK_INVALID, BLOCK_8X32, BLOCK_INVALID, // 64
-#endif // CONFIG_FLEX_PARTITION
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 128
-#if CONFIG_BLOCK_256
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 256
-#endif // CONFIG_BLOCK_256
BLOCK_INVALID, BLOCK_INVALID, // 4,16
BLOCK_INVALID, BLOCK_4X8, // 8,32
BLOCK_INVALID, BLOCK_8X16, // 16,64
-#if CONFIG_FLEX_PARTITION
BLOCK_INVALID, BLOCK_INVALID, // 4, 32
BLOCK_INVALID, BLOCK_INVALID, // 8, 64
BLOCK_INVALID, BLOCK_INVALID, // 4, 64
-#endif // CONFIG_FLEX_PARTITION
}, { // PARTITION_VERT_4B
BLOCK_INVALID, // 4
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 8
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 16
-#if CONFIG_FLEX_PARTITION
BLOCK_INVALID, BLOCK_4X16, BLOCK_4X32, // 32
BLOCK_4X64, BLOCK_8X32, BLOCK_8X64, // 64
-#else
- BLOCK_INVALID, BLOCK_4X16, BLOCK_INVALID, // 32
- BLOCK_INVALID, BLOCK_8X32, BLOCK_INVALID, // 64
-#endif // CONFIG_FLEX_PARTITION
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 128
-#if CONFIG_BLOCK_256
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID, // 256
-#endif // CONFIG_BLOCK_256
BLOCK_INVALID, BLOCK_INVALID, // 4,16
BLOCK_INVALID, BLOCK_4X8, // 8,32
BLOCK_INVALID, BLOCK_8X16, // 16,64
-#if CONFIG_FLEX_PARTITION
BLOCK_INVALID, BLOCK_INVALID, // 4, 32
BLOCK_INVALID, BLOCK_INVALID, // 8, 64
BLOCK_INVALID, BLOCK_INVALID, // 4, 64
-#endif // CONFIG_FLEX_PARTITION
}, {
// PARTITION_SPLIT
BLOCK_INVALID, // 4
@@ -438,17 +354,13 @@
BLOCK_INVALID, BLOCK_INVALID, BLOCK_16X16, // 32
BLOCK_INVALID, BLOCK_INVALID, BLOCK_32X32, // 64
BLOCK_INVALID, BLOCK_INVALID, BLOCK_64X64, // 128
-#if CONFIG_BLOCK_256
BLOCK_INVALID, BLOCK_INVALID, BLOCK_128X128, // 256
-#endif // CONFIG_BLOCK_256
BLOCK_INVALID, BLOCK_INVALID, // 4,16
BLOCK_INVALID, BLOCK_INVALID, // 8,32
BLOCK_INVALID, BLOCK_INVALID, // 16,64
-#if CONFIG_FLEX_PARTITION
BLOCK_INVALID, BLOCK_INVALID, // 4, 32
BLOCK_INVALID, BLOCK_INVALID, // 8, 64
BLOCK_INVALID, BLOCK_INVALID, // 4, 64
-#endif // CONFIG_FLEX_PARTITION
},
};
/* clang-format on */
@@ -569,20 +481,20 @@
TX_64X64,
// 64x128, 128x64, 128x128
TX_64X64, TX_64X64, TX_64X64,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
// 128X256,256X128, 256X256
TX_64X64, TX_64X64, TX_64X64,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// 4x16, 16x4, 8x32
TX_4X4, TX_4X4, TX_8X8,
// 32x8, 16x64, 64x16
TX_8X8, TX_16X16, TX_16X16,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
// 4x32, 32x4, 8x64
TX_4X4, TX_4X4, TX_8X8,
// 64x8, 4x64, 64x4
TX_8X8, TX_4X4, TX_4X4,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static const TX_SIZE max_txsize_rect_lookup[BLOCK_SIZES_ALL] = {
@@ -600,24 +512,24 @@
TX_64X64,
// 64x128, 128x64, 128x128
TX_64X64, TX_64X64, TX_64X64,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
// 128X256,256X128, 256X256
TX_64X64, TX_64X64, TX_64X64,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// 4x16, 16x4,
TX_4X16, TX_16X4,
// 8x32, 32x8
TX_8X32, TX_32X8,
// 16x64, 64x16
TX_16X64, TX_64X16,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
// 4x32, 32x4,
TX_4X32, TX_32X4,
// 8x64, 64x8
TX_8X64, TX_64X8,
// 4x64, 64x4
TX_4X64, TX_64X4
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static const TX_TYPE_1D vtx_tab[TX_TYPES] = {
@@ -683,14 +595,14 @@
TX_16X8, // TX_32X8
TX_16X32, // TX_16X64
TX_32X16, // TX_64X16
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
TX_4X16, // TX_4X32
TX_16X4, // TX_32X4
TX_8X32, // TX_8X64
TX_32X8, // TX_64X8
TX_4X32, // TX_4X64
TX_32X4, // TX_64X4
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static const TX_SIZE txsize_horz_map[TX_SIZES_ALL] = {
@@ -713,14 +625,14 @@
TX_32X32, // TX_32X8
TX_16X16, // TX_16X64
TX_64X64, // TX_64X16
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
TX_4X4, // TX_4X32
TX_32X32, // TX_32X4
TX_8X8, // TX_8X64
TX_64X64, // TX_64X8
TX_4X4, // TX_4X64
TX_64X64, // TX_64X4
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static const TX_SIZE txsize_vert_map[TX_SIZES_ALL] = {
@@ -743,14 +655,14 @@
TX_8X8, // TX_32X8
TX_64X64, // TX_16X64
TX_16X16, // TX_64X16
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
TX_32X32, // TX_4X32
TX_4X4, // TX_32X4
TX_64X64, // TX_8X64
TX_8X8, // TX_64X8
TX_64X64, // TX_4X64
TX_4X4, // TX_64X4
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#define TX_SIZE_W_MIN 4
@@ -758,9 +670,9 @@
// Transform block width in pixels
static const int tx_size_wide[TX_SIZES_ALL] = {
4, 8, 16, 32, 64, 4, 8, 8, 16, 16, 32, 32, 64, 4, 16, 8, 32, 16, 64,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
4, 32, 8, 64, 4, 64,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#define TX_SIZE_H_MIN 4
@@ -768,49 +680,49 @@
// Transform block height in pixels
static const int tx_size_high[TX_SIZES_ALL] = {
4, 8, 16, 32, 64, 8, 4, 16, 8, 32, 16, 64, 32, 16, 4, 32, 8, 64, 16,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
32, 4, 64, 8, 64, 4,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
// Transform block width in unit
static const int tx_size_wide_unit[TX_SIZES_ALL] = {
1, 2, 4, 8, 16, 1, 2, 2, 4, 4, 8, 8, 16, 1, 4, 2, 8, 4, 16,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
1, 8, 2, 16, 1, 16,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
// Transform block height in unit
static const int tx_size_high_unit[TX_SIZES_ALL] = {
1, 2, 4, 8, 16, 2, 1, 4, 2, 8, 4, 16, 8, 4, 1, 8, 2, 16, 4,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
8, 1, 16, 2, 16, 1,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
// Transform block width in log2
static const int tx_size_wide_log2[TX_SIZES_ALL] = {
2, 3, 4, 5, 6, 2, 3, 3, 4, 4, 5, 5, 6, 2, 4, 3, 5, 4, 6,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
2, 5, 3, 6, 2, 6,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
// Transform block height in log2
static const int tx_size_high_log2[TX_SIZES_ALL] = {
2, 3, 4, 5, 6, 3, 2, 4, 3, 5, 4, 6, 5, 4, 2, 5, 3, 6, 4,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
5, 2, 6, 3, 6, 2,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static const int tx_size_2d[TX_SIZES_ALL + 1] = {
16, 64, 256, 1024, 4096, 32, 32, 128, 128, 512,
512, 2048, 2048, 64, 64, 256, 256, 1024, 1024,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
128, 128, 512, 512, 256, 256,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static const BLOCK_SIZE txsize_to_bsize[TX_SIZES_ALL] = {
@@ -833,14 +745,14 @@
BLOCK_32X8, // TX_32X8
BLOCK_16X64, // TX_16X64
BLOCK_64X16, // TX_64X16
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
BLOCK_4X32, // TX_4X32
BLOCK_32X4, // TX_32X4
BLOCK_8X64, // TX_8X64
BLOCK_64X8, // TX_64X8
BLOCK_4X64, // TX_4X64
BLOCK_64X4, // TX_64X4
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static const TX_SIZE txsize_sqr_map[TX_SIZES_ALL] = {
@@ -863,14 +775,14 @@
TX_8X8, // TX_32X8
TX_16X16, // TX_16X64
TX_16X16, // TX_64X16
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
TX_4X4, // TX_4X32
TX_4X4, // TX_32X4
TX_8X8, // TX_8X64
TX_8X8, // TX_64X8
TX_4X4, // TX_4X64
TX_4X4, // TX_64X4
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static const TX_SIZE txsize_sqr_up_map[TX_SIZES_ALL] = {
@@ -893,14 +805,14 @@
TX_32X32, // TX_32X8
TX_64X64, // TX_16X64
TX_64X64, // TX_64X16
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
TX_32X32, // TX_4X32
TX_32X32, // TX_32X4
TX_64X64, // TX_8X64
TX_64X64, // TX_64X8
TX_64X64, // TX_4X64
TX_64X64, // TX_64X4
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static const int8_t txsize_log2_minus4[TX_SIZES_ALL] = {
@@ -923,14 +835,14 @@
4, // TX_32X8
5, // TX_16X64
5, // TX_64X16
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
3, // TX_4X32
3, // TX_32X4
4, // TX_8X64
4, // TX_64X8
3, // TX_4X64
3, // TX_64X4
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
/* clang-format off */
@@ -962,32 +874,21 @@
{ { BLOCK_64X128, BLOCK_64X64 }, { BLOCK_INVALID, BLOCK_32X64 } },
{ { BLOCK_128X64, BLOCK_INVALID }, { BLOCK_64X64, BLOCK_64X32 } },
{ { BLOCK_128X128, BLOCK_128X64 }, { BLOCK_64X128, BLOCK_64X64 } },
-#if CONFIG_BLOCK_256
{ { BLOCK_128X256, BLOCK_128X128 }, { BLOCK_INVALID, BLOCK_64X128 } },
{ { BLOCK_256X128, BLOCK_INVALID }, { BLOCK_128X128, BLOCK_128X64 } },
{ { BLOCK_256X256, BLOCK_256X128 }, { BLOCK_128X256, BLOCK_128X128 } },
-#endif // CONFIG_BLOCK_256
{ { BLOCK_4X16, BLOCK_4X8 }, { BLOCK_INVALID, BLOCK_4X8 } },
{ { BLOCK_16X4, BLOCK_INVALID }, { BLOCK_8X4, BLOCK_8X4 } },
-#if CONFIG_FLEX_PARTITION
{ { BLOCK_8X32, BLOCK_8X16 }, { BLOCK_4X32, BLOCK_4X16 } },
{ { BLOCK_32X8, BLOCK_32X4 }, { BLOCK_16X8, BLOCK_16X4 } },
{ { BLOCK_16X64, BLOCK_16X32 }, { BLOCK_8X64, BLOCK_8X32 } },
{ { BLOCK_64X16, BLOCK_64X8 }, { BLOCK_32X16, BLOCK_32X8 } },
-#else
- { { 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 } }
-#endif // CONFIG_FLEX_PARTITION
-#if CONFIG_FLEX_PARTITION
{ { BLOCK_4X32, BLOCK_4X16}, { BLOCK_INVALID, BLOCK_4X16 } },
{ { BLOCK_32X4, BLOCK_INVALID }, { BLOCK_16X4, BLOCK_16X4 } },
{ { BLOCK_8X64, BLOCK_8X32 }, { BLOCK_4X64, BLOCK_4X32 } },
{ { BLOCK_64X8, BLOCK_64X4 }, { BLOCK_32X8, BLOCK_32X4 } },
{ { BLOCK_4X64, BLOCK_4X32 }, { BLOCK_INVALID, BLOCK_4X32 } },
{ { BLOCK_64X4, BLOCK_INVALID}, { BLOCK_32X4, BLOCK_32X4 } },
-#endif // CONFIG_FLEX_PARTITION
};
#else
static const BLOCK_SIZE ss_size_lookup[BLOCK_SIZES_ALL][2][2] = {
@@ -1009,11 +910,6 @@
{ { BLOCK_64X128, BLOCK_64X64 }, { BLOCK_INVALID, BLOCK_32X64 } },
{ { BLOCK_128X64, BLOCK_INVALID }, { BLOCK_64X64, BLOCK_64X32 } },
{ { BLOCK_128X128, BLOCK_128X64 }, { BLOCK_64X128, BLOCK_64X64 } },
-#if CONFIG_BLOCK_256
- { { BLOCK_128X256, BLOCK_128X128 }, { BLOCK_INVALID, BLOCK_64X128 } },
- { { BLOCK_256X128, BLOCK_INVALID }, { BLOCK_128X128, BLOCK_128X64 } },
- { { BLOCK_256X256, BLOCK_256X128 }, { BLOCK_128X256, BLOCK_128X128 } },
-#endif // CONFIG_BLOCK_256
{ { BLOCK_4X16, BLOCK_4X8 }, { BLOCK_INVALID, BLOCK_4X8 } },
{ { BLOCK_16X4, BLOCK_INVALID }, { BLOCK_8X4, BLOCK_8X4 } },
{ { BLOCK_8X32, BLOCK_8X16 }, { BLOCK_INVALID, BLOCK_4X16 } },
@@ -1050,25 +946,25 @@
{ 32 + 16, 32 + 0 }, // 64X128- {0b110000, 0b100000}
{ 32 + 0, 32 + 16 }, // 128X64- {0b100000, 0b110000}
{ 32 + 0, 32 + 0 }, // 128X128-{0b100000, 0b100000}
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ 32 + 0, 0 + 0 }, // 128X256-{0b100000, 0b000000}
{ 0 + 0, 32 + 0 }, // 256X128-{0b000000, 0b100000}
{ 0 + 0, 0 + 0 }, // 256X256-{0b000000, 0b000000}
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ 32 + 31, 32 + 28 }, // 4X16 - {0b111111, 0b111100}
{ 32 + 28, 32 + 31 }, // 16X4 - {0b111100, 0b111111}
{ 32 + 30, 32 + 24 }, // 8X32 - {0b111110, 0b111000}
{ 32 + 24, 32 + 30 }, // 32X8 - {0b111000, 0b111110}
{ 32 + 28, 32 + 16 }, // 16X64 - {0b111100, 0b110000}
{ 32 + 16, 32 + 28 }, // 64X16 - {0b110000, 0b111100}
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ 32 + 31, 32 + 24 }, // 4X32 - {0b111111, 0b111000}
{ 32 + 24, 32 + 31 }, // 32X4 - {0b111000, 0b111111}
{ 32 + 30, 32 + 16 }, // 8X64 - {0b111110, 0b110000}
{ 32 + 16, 32 + 30 }, // 64X8 - {0b110000, 0b111110}
{ 32 + 31, 32 + 16 }, // 4X64 - {0b111110, 0b110000}
{ 32 + 16, 32 + 31 }, // 64X4 - {0b110000, 0b111110}
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
/* clang-format on */
@@ -1097,9 +993,9 @@
// Mapping between mode dependent TX size groups based on allowed TX sizes.
static const int av1_size_class[TX_SIZES_ALL] = { 0, 1, 2, 3, 3, 0, 0, 1, 1, 3,
3, 3, 3, 0, 0, 3, 3, 3, 3,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
3, 3, 3, 3, 3, 3
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static AOM_INLINE bool is_bsize_geq(BLOCK_SIZE bsize1, BLOCK_SIZE bsize2) {
diff --git a/av1/common/entropy.c b/av1/common/entropy.c
index eabe90c..9879ca0 100644
--- a/av1/common/entropy.c
+++ b/av1/common/entropy.c
@@ -386,14 +386,12 @@
RESET_CDF_COUNTER(fc->do_split_cdf[plane_index][i], 2);
}
}
-#if CONFIG_BLOCK_256
for (int plane_index = 0; plane_index < PARTITION_STRUCTURE_NUM;
plane_index++) {
for (int i = 0; i < SQUARE_SPLIT_CONTEXTS; i++) {
RESET_CDF_COUNTER(fc->do_square_split_cdf[plane_index][i], 2);
}
}
-#endif // CONFIG_BLOCK_256
for (int plane_index = 0; plane_index < PARTITION_STRUCTURE_NUM;
plane_index++) {
for (int i = 0; i < PARTITION_CONTEXTS; i++) {
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 576eda7..a204c62 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -430,7 +430,6 @@
#endif // CONFIG_EXTENDED_SDP
#if CONFIG_EXT_RECUR_PARTITIONS
// clang-format off
-#if CONFIG_FLEX_PARTITION
#if CONFIG_PARTITION_CONTEXT_REDUCE
static aom_cdf_prob default_do_split_cdf[PARTITION_STRUCTURE_NUM][PARTITION_CONTEXTS][CDF_SIZE(2)] = {
@@ -2179,7 +2178,6 @@
{ AOM_CDF2( 5306), 37 },
{ AOM_CDF2( 3947), 2 },
{ AOM_CDF2( 506), 78 },
-#if CONFIG_BLOCK_256
// BLOCK_128X256
{ AOM_CDF2(25796), 120 },
{ AOM_CDF2(11229), 0 },
@@ -2195,7 +2193,6 @@
{ AOM_CDF2( 3302), 25 },
{ AOM_CDF2( 3314), 0 },
{ AOM_CDF2( 356), 110 },
-#endif // CONFIG_BLOCK_256
#if CONFIG_CB1TO4_SPLIT
// BLOCK_4X16
{ AOM_CDF2(27089), 75 },
@@ -2311,7 +2308,6 @@
{ AOM_CDF2(15351), 35 },
{ AOM_CDF2(10542), 33 },
{ AOM_CDF2( 2947), 7 },
-#if CONFIG_BLOCK_256
// BLOCK_128X256
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -2327,7 +2323,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#endif // CONFIG_BLOCK_256
#if CONFIG_CB1TO4_SPLIT
// BLOCK_4X16,
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -2447,7 +2442,6 @@
{ AOM_CDF2(10515), 0 },
{ AOM_CDF2(22879), 15 },
{ AOM_CDF2(14385), 12 },
-#if CONFIG_BLOCK_256
// BLOCK_128X256
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -2463,7 +2457,6 @@
{ AOM_CDF2(14351), 0 },
{ AOM_CDF2(23553), 10 },
{ AOM_CDF2(19681), 25 },
-#endif // CONFIG_BLOCK_256
#if CONFIG_CB1TO4_SPLIT
// BLOCK_4X16,
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -2579,7 +2572,6 @@
{ AOM_CDF2( 8131), 0 },
{ AOM_CDF2(19409), 45 },
{ AOM_CDF2( 8887), 35 },
-#if CONFIG_BLOCK_256
// BLOCK_128X256
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -2595,7 +2587,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#endif // CONFIG_BLOCK_256
#if CONFIG_CB1TO4_SPLIT
// BLOCK_4X16,
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -2721,7 +2712,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#if CONFIG_BLOCK_256
// BLOCK_128X256
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -2737,7 +2727,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#endif // CONFIG_BLOCK_256
#if CONFIG_CB1TO4_SPLIT
// BLOCK_4X16,
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -2853,7 +2842,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#if CONFIG_BLOCK_256
// BLOCK_128X256
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -2869,7 +2857,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#endif // CONFIG_BLOCK_256
#if CONFIG_CB1TO4_SPLIT
// BLOCK_4X16,
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -2988,7 +2975,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#if CONFIG_BLOCK_256
// BLOCK_128X256
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -3004,7 +2990,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#endif // CONFIG_BLOCK_256
#if CONFIG_CB1TO4_SPLIT
// BLOCK_4X16,
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -3120,7 +3105,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#if CONFIG_BLOCK_256
// BLOCK_128X256
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -3136,7 +3120,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#endif // CONFIG_BLOCK_256
#if CONFIG_CB1TO4_SPLIT
// BLOCK_4X16,
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -3260,7 +3243,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#if CONFIG_BLOCK_256
// BLOCK_128X256
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -3276,7 +3258,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#endif // CONFIG_BLOCK_256
#if CONFIG_CB1TO4_SPLIT
// BLOCK_4X16,
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -3392,7 +3373,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#if CONFIG_BLOCK_256
// BLOCK_128X256
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -3408,7 +3388,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#endif // CONFIG_BLOCK_256
#if CONFIG_CB1TO4_SPLIT
// BLOCK_4X16,
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -3527,7 +3506,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#if CONFIG_BLOCK_256
// BLOCK_128X256
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -3543,7 +3521,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#endif // CONFIG_BLOCK_256
#if CONFIG_CB1TO4_SPLIT
// BLOCK_4X16,
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -3659,7 +3636,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#if CONFIG_BLOCK_256
// BLOCK_128X256
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -3675,7 +3651,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#endif // CONFIG_BLOCK_256
#if CONFIG_CB1TO4_SPLIT
// BLOCK_4X16,
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -3799,7 +3774,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#if CONFIG_BLOCK_256
// BLOCK_128X256
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -3815,7 +3789,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#endif // CONFIG_BLOCK_256
#if CONFIG_CB1TO4_SPLIT
// BLOCK_4X16,
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -3931,7 +3904,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#if CONFIG_BLOCK_256
// BLOCK_128X256
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -3947,7 +3919,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#endif // CONFIG_BLOCK_256
#if CONFIG_CB1TO4_SPLIT
// BLOCK_4X16,
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -4066,7 +4037,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#if CONFIG_BLOCK_256
// BLOCK_128X256
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -4082,7 +4052,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#endif // CONFIG_BLOCK_256
#if CONFIG_CB1TO4_SPLIT
// BLOCK_4X16,
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -4198,7 +4167,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#if CONFIG_BLOCK_256
// BLOCK_128X256
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -4214,7 +4182,6 @@
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
{ AOM_CDF2(16384), 0 }, // unused entry
-#endif // CONFIG_BLOCK_256
#if CONFIG_CB1TO4_SPLIT
// BLOCK_4X16,
{ AOM_CDF2(16384), 0 }, // unused entry
@@ -4250,743 +4217,9 @@
}
},
};
-#endif
-#else
-static aom_cdf_prob
- default_do_split_cdf[PARTITION_STRUCTURE_NUM][PARTITION_CONTEXTS][CDF_SIZE(2)] = {
- // Luma
- {
- // BLOCK_4X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_4X8,
- { AOM_CDF2(28527) }, { AOM_CDF2(26923) }, { AOM_CDF2(26695) }, { AOM_CDF2(25695) },
- // BLOCK_8X4,
- { AOM_CDF2(27249) }, { AOM_CDF2(22770) }, { AOM_CDF2(23994) }, { AOM_CDF2(19292) },
- // BLOCK_8X8,
- { AOM_CDF2(27557) }, { AOM_CDF2(15343) }, { AOM_CDF2(13996) }, { AOM_CDF2(7413) },
- // BLOCK_8X16,
- { AOM_CDF2(23776) }, { AOM_CDF2(14454) }, { AOM_CDF2(20213) }, { AOM_CDF2(9896) },
- // BLOCK_16X8,
- { AOM_CDF2(21865) }, { AOM_CDF2(9939) }, { AOM_CDF2(10901) }, { AOM_CDF2(3368) },
- // BLOCK_16X16,
- { AOM_CDF2(19347) }, { AOM_CDF2(7058) }, { AOM_CDF2(7824) }, { AOM_CDF2(2139) },
- // BLOCK_16X32,
- { AOM_CDF2(22590) }, { AOM_CDF2(10487) }, { AOM_CDF2(14877) }, { AOM_CDF2(4284) },
- // BLOCK_32X16,
- { AOM_CDF2(19638) }, { AOM_CDF2(7433) }, { AOM_CDF2(7798) }, { AOM_CDF2(1813) },
- // BLOCK_32X32,
- { AOM_CDF2(18776) }, { AOM_CDF2(6875) }, { AOM_CDF2(6813) }, { AOM_CDF2(1415) },
- // BLOCK_32X64,
- { AOM_CDF2(22664) }, { AOM_CDF2(9555) }, { AOM_CDF2(16301) }, { AOM_CDF2(4683) },
- // BLOCK_64X32,
- { AOM_CDF2(18284) }, { AOM_CDF2(5570) }, { AOM_CDF2(5730) }, { AOM_CDF2(908) },
- // BLOCK_64X64,
- { AOM_CDF2(16680) }, { AOM_CDF2(5059) }, { AOM_CDF2(5990) }, { AOM_CDF2(896) },
- // BLOCK_64X128,
- { AOM_CDF2(24701) }, { AOM_CDF2(10170) }, { AOM_CDF2(19707) }, { AOM_CDF2(7091) },
- // BLOCK_128X64,
- { AOM_CDF2(20677) }, { AOM_CDF2(6167) }, { AOM_CDF2(4062) }, { AOM_CDF2(584) },
- // BLOCK_128X128,
- { AOM_CDF2(28847) }, { AOM_CDF2(7433) }, { AOM_CDF2(7570) }, { AOM_CDF2(805) },
-#if CONFIG_BLOCK_256
- // BLOCK_128X256, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X128, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X256, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
- },
- // Chroma
- {
- // BLOCK_4X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_4X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X16, retrain needed
- { AOM_CDF2(32720) }, { AOM_CDF2(16384) }, { AOM_CDF2(32423) }, { AOM_CDF2(16384) },
- // BLOCK_16X8, retrain needed
- { AOM_CDF2(32743) }, { AOM_CDF2(32631) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X16,
- { AOM_CDF2(17784) }, { AOM_CDF2(9632) }, { AOM_CDF2(10908) }, { AOM_CDF2(7843) },
- // BLOCK_16X32,
- { AOM_CDF2(19233) }, { AOM_CDF2(10479) }, { AOM_CDF2(9686) }, { AOM_CDF2(5107) },
- // BLOCK_32X16,
- { AOM_CDF2(18156) }, { AOM_CDF2(8184) }, { AOM_CDF2(6864) }, { AOM_CDF2(4292) },
- // BLOCK_32X32,
- { AOM_CDF2(24431) }, { AOM_CDF2(8446) }, { AOM_CDF2(6798) }, { AOM_CDF2(2459) },
- // BLOCK_32X64,
- { AOM_CDF2(13435) }, { AOM_CDF2(7751) }, { AOM_CDF2(4051) }, { AOM_CDF2(1356) },
- // BLOCK_64X32,
- { AOM_CDF2(10445) }, { AOM_CDF2(2487) }, { AOM_CDF2(5362) }, { AOM_CDF2(628) },
- // BLOCK_64X64,
- { AOM_CDF2(12734) }, { AOM_CDF2(4586) }, { AOM_CDF2(5171) }, { AOM_CDF2(753) },
- // BLOCK_64X128,
- { AOM_CDF2(22833) }, { AOM_CDF2(9141) }, { AOM_CDF2(11416) }, { AOM_CDF2(4149) },
- // BLOCK_128X64,
- { AOM_CDF2(22207) }, { AOM_CDF2(6060) }, { AOM_CDF2(4607) }, { AOM_CDF2(559) },
- // BLOCK_128X128,
- { AOM_CDF2(26187) }, { AOM_CDF2(14749) }, { AOM_CDF2(15794) }, { AOM_CDF2(6386) },
-#if CONFIG_BLOCK_256
- // BLOCK_128X256, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X128, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X256, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
- }
- };
+#endif // CONFIG_PARTITION_CONTEXT_REDUCE
static aom_cdf_prob
- default_rect_type_cdf[PARTITION_STRUCTURE_NUM][PARTITION_CONTEXTS][CDF_SIZE(2)] = {
- // Luma
- {
- // BLOCK_4X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_4X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X8, unused
- { AOM_CDF2(18215) }, { AOM_CDF2(15102) }, { AOM_CDF2(23103) }, { AOM_CDF2(21380) },
- // BLOCK_8X16,
- { AOM_CDF2(24490) }, { AOM_CDF2(17656) }, { AOM_CDF2(26427) }, { AOM_CDF2(23028) },
- // BLOCK_16X8,
- { AOM_CDF2(4452) }, { AOM_CDF2(1480) }, { AOM_CDF2(9575) }, { AOM_CDF2(2691) },
- // BLOCK_16X16,
- { AOM_CDF2(19853) }, { AOM_CDF2(14253) }, { AOM_CDF2(26393) }, { AOM_CDF2(23901) },
- // BLOCK_16X32,
- { AOM_CDF2(22073) }, { AOM_CDF2(20595) }, { AOM_CDF2(28180) }, { AOM_CDF2(29690) },
- // BLOCK_32X16,
- { AOM_CDF2(6576) }, { AOM_CDF2(1589) }, { AOM_CDF2(8535) }, { AOM_CDF2(1338) },
- // BLOCK_32X32,
- { AOM_CDF2(19747) }, { AOM_CDF2(15904) }, { AOM_CDF2(26956) }, { AOM_CDF2(25248) },
- // BLOCK_32X64,
- { AOM_CDF2(21040) }, { AOM_CDF2(21219) }, { AOM_CDF2(26181) }, { AOM_CDF2(29019) },
- // BLOCK_64X32,
- { AOM_CDF2(6432) }, { AOM_CDF2(1296) }, { AOM_CDF2(7144) }, { AOM_CDF2(687) },
- // BLOCK_64X64,
- { AOM_CDF2(19505) }, { AOM_CDF2(17612) }, { AOM_CDF2(27204) }, { AOM_CDF2(28008) },
- // BLOCK_64X128,
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X64,
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X128,
- { AOM_CDF2(21467) }, { AOM_CDF2(22207) }, { AOM_CDF2(28266) }, { AOM_CDF2(29969) },
-#if CONFIG_BLOCK_256
- // BLOCK_128X256, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X128, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X256, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
- },
- // Chroma
- {
- // BLOCK_4X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_4X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X16,
- { AOM_CDF2(16531) }, { AOM_CDF2(11789) }, { AOM_CDF2(20592) }, { AOM_CDF2(15329) },
- // BLOCK_16X32,
- { AOM_CDF2(21073) }, { AOM_CDF2(17148) }, { AOM_CDF2(27743) }, { AOM_CDF2(25870) },
- // BLOCK_32X16,
- { AOM_CDF2(13244) }, { AOM_CDF2(4967) }, { AOM_CDF2(21860) }, { AOM_CDF2(7649) },
- // BLOCK_32X32,
- { AOM_CDF2(17959) }, { AOM_CDF2(13659) }, { AOM_CDF2(24447) }, { AOM_CDF2(19760) },
- // BLOCK_32X64,
- { AOM_CDF2(26421) }, { AOM_CDF2(23677) }, { AOM_CDF2(31250) }, { AOM_CDF2(31466) },
- // BLOCK_64X32,
- { AOM_CDF2(3731) }, { AOM_CDF2(826) }, { AOM_CDF2(7904) }, { AOM_CDF2(642) },
- // BLOCK_64X64,
- { AOM_CDF2(17951) }, { AOM_CDF2(17880) }, { AOM_CDF2(20631) }, { AOM_CDF2(22658) },
- // BLOCK_64X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X128,
- { AOM_CDF2(17160) }, { AOM_CDF2(18950) }, { AOM_CDF2(20526) }, { AOM_CDF2(19920) },
-#if CONFIG_BLOCK_256
- // BLOCK_128X256, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X128, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X256, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
- }
- };
-
-// Note: For the partition CDFs below, most entries are unused. An optimized
-// implementation could create smaller arrays with only used values + some
-// mapping tables.
-static aom_cdf_prob default_do_ext_partition_cdf
- [PARTITION_STRUCTURE_NUM][NUM_RECT_PARTS][PARTITION_CONTEXTS]
- [CDF_SIZE(2)] = {
- // Luma
- {
- // HORZ
- {
- // BLOCK_4X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_4X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X16,
- { AOM_CDF2(31431) }, { AOM_CDF2(28631) }, { AOM_CDF2(28264) }, { AOM_CDF2(22772) },
- // BLOCK_16X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X16,
- { AOM_CDF2(32229) }, { AOM_CDF2(32177) }, { AOM_CDF2(32041) }, { AOM_CDF2(32239) },
- // BLOCK_16X32,
- { AOM_CDF2(30235) }, { AOM_CDF2(29216) }, { AOM_CDF2(28940) }, { AOM_CDF2(28425) },
- // BLOCK_32X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X32,
- { AOM_CDF2(31856) }, { AOM_CDF2(32221) }, { AOM_CDF2(32078) }, { AOM_CDF2(32531) },
- // BLOCK_32X64,
- { AOM_CDF2(29793) }, { AOM_CDF2(28859) }, { AOM_CDF2(27612) }, { AOM_CDF2(26995) },
- // BLOCK_64X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_64X64,
- { AOM_CDF2(31947) }, { AOM_CDF2(32331) }, { AOM_CDF2(32231) }, { AOM_CDF2(32630) },
- // BLOCK_64X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#if CONFIG_BLOCK_256
- // BLOCK_128X256, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X128, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X256, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
- },
- // VERT
- {
- // BLOCK_4X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_4X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X8,
- { AOM_CDF2(31993) }, { AOM_CDF2(31499) }, { AOM_CDF2(30112) }, { AOM_CDF2(29847) },
- // BLOCK_16X16,
- { AOM_CDF2(31543) }, { AOM_CDF2(30831) }, { AOM_CDF2(30796) }, { AOM_CDF2(30213) },
- // BLOCK_16X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X16,
- { AOM_CDF2(31693) }, { AOM_CDF2(31310) }, { AOM_CDF2(31562) }, { AOM_CDF2(31459) },
- // BLOCK_32X32,
- { AOM_CDF2(30404) }, { AOM_CDF2(30494) }, { AOM_CDF2(30546) }, { AOM_CDF2(31186) },
- // BLOCK_32X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_64X32,
- { AOM_CDF2(31838) }, { AOM_CDF2(31473) }, { AOM_CDF2(31846) }, { AOM_CDF2(31910) },
- // BLOCK_64X64,
- { AOM_CDF2(30182) }, { AOM_CDF2(30117) }, { AOM_CDF2(29719) }, { AOM_CDF2(30496) },
- // BLOCK_64X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#if CONFIG_BLOCK_256
- // BLOCK_128X256, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X128, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X256, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
- }
- },
- // Chroma
- {
- // HORZ
- {
- // BLOCK_4X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_4X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X32,
- { AOM_CDF2(23667) }, { AOM_CDF2(21769) }, { AOM_CDF2(21699) }, { AOM_CDF2(19832) },
- // BLOCK_32X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X32,
- { AOM_CDF2(26650) }, { AOM_CDF2(28260) }, { AOM_CDF2(28916) }, { AOM_CDF2(30069) },
- // BLOCK_32X64,
- { AOM_CDF2(26134) }, { AOM_CDF2(21051) }, { AOM_CDF2(24942) }, { AOM_CDF2(22392) },
- // BLOCK_64X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_64X64,
- { AOM_CDF2(26499) }, { AOM_CDF2(29974) }, { AOM_CDF2(28563) }, { AOM_CDF2(31986) },
- // BLOCK_64X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#if CONFIG_BLOCK_256
- // BLOCK_128X256, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X128, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X256, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
- },
- // VERT
- {
- // BLOCK_4X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_4X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X16,
- { AOM_CDF2(24091) }, { AOM_CDF2(24391) }, { AOM_CDF2(24297) }, { AOM_CDF2(23695) },
- // BLOCK_32X32,
- { AOM_CDF2(26453) }, { AOM_CDF2(27396) }, { AOM_CDF2(28057) }, { AOM_CDF2(29378) },
- // BLOCK_32X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_64X32,
- { AOM_CDF2(28326) }, { AOM_CDF2(28001) }, { AOM_CDF2(25922) }, { AOM_CDF2(27497) },
- // BLOCK_64X64,
- { AOM_CDF2(25310) }, { AOM_CDF2(26350) }, { AOM_CDF2(28623) }, { AOM_CDF2(31046) },
- // BLOCK_64X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#if CONFIG_BLOCK_256
- // BLOCK_128X256, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X128, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X256, retrain needed
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
- }
- }
- };
-
-static aom_cdf_prob default_do_uneven_4way_partition_cdf
- [PARTITION_STRUCTURE_NUM][NUM_RECT_PARTS][PARTITION_CONTEXTS]
- [CDF_SIZE(2)] = {
- // Luma
- {
- // HORZ
- {
- // BLOCK_4X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_4X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X32,
- { AOM_CDF2(23888) }, { AOM_CDF2(26675) }, { AOM_CDF2(18213) }, { AOM_CDF2(21839) },
- // BLOCK_32X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X64,
- { AOM_CDF2(18156) }, { AOM_CDF2(22434) }, { AOM_CDF2(17065) }, { AOM_CDF2(23048) },
- // BLOCK_64X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_64X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_64X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#if CONFIG_BLOCK_256
- // BLOCK_128X256, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X256, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
- },
- // VERT
- {
- // BLOCK_4X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_4X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X16,
- { AOM_CDF2(18858) }, { AOM_CDF2(14975) }, { AOM_CDF2(21057) }, { AOM_CDF2(19369) },
- // BLOCK_32X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_64X32,
- { AOM_CDF2(12384) }, { AOM_CDF2(11622) }, { AOM_CDF2(17504) }, { AOM_CDF2(17608) },
- // BLOCK_64X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_64X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#if CONFIG_BLOCK_256
- // BLOCK_128X256, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X256, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
- }
- },
- // Chroma
- {
- // HORZ
- {
- // BLOCK_4X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_4X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X64,
- { AOM_CDF2(16705) }, { AOM_CDF2(20904) }, { AOM_CDF2(18601) }, { AOM_CDF2(22088) },
- // BLOCK_64X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_64X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_64X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#if CONFIG_BLOCK_256
- // BLOCK_128X256, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X256, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
- },
- // VERT
- {
- // BLOCK_4X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_4X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_64X32,
- { AOM_CDF2(15452) }, { AOM_CDF2(15654) }, { AOM_CDF2(20986) }, { AOM_CDF2(20924) },
- // BLOCK_64X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_64X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#if CONFIG_BLOCK_256
- // BLOCK_128X256, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X256, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
- }
- },
- };
-
-static aom_cdf_prob default_uneven_4way_partition_type_cdf
- [PARTITION_STRUCTURE_NUM][NUM_RECT_PARTS][PARTITION_CONTEXTS]
- [CDF_SIZE(NUM_UNEVEN_4WAY_PARTS)] = {
- // Luma
- {
- // HORZ
- {
- // BLOCK_4X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_4X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X32,
- { AOM_CDF2(20372) }, { AOM_CDF2(19885) }, { AOM_CDF2(20532) }, { AOM_CDF2(18382) },
- // BLOCK_32X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X64,
- { AOM_CDF2(20219) }, { AOM_CDF2(19289) }, { AOM_CDF2(18815) }, { AOM_CDF2(21548) },
- // BLOCK_64X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_64X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_64X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#if CONFIG_BLOCK_256
- // BLOCK_128X256, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X256, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
- },
- // VERT
- {
- // BLOCK_4X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_4X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X16,
- { AOM_CDF2(18025) }, { AOM_CDF2(18978) }, { AOM_CDF2(18146) }, { AOM_CDF2(20127) },
- // BLOCK_32X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_64X32,
- { AOM_CDF2(17700) }, { AOM_CDF2(17721) }, { AOM_CDF2(18585) }, { AOM_CDF2(17912) },
- // BLOCK_64X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_64X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#if CONFIG_BLOCK_256
- // BLOCK_128X256, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X256, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
- }
- },
- // Chroma
- {
- // HORZ
- {
- // BLOCK_4X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_4X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X64,
- { AOM_CDF2(17990) }, { AOM_CDF2(23831) }, { AOM_CDF2(17318) }, { AOM_CDF2(18155) },
- // BLOCK_64X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_64X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_64X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#if CONFIG_BLOCK_256
- // BLOCK_128X256, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X256, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
- },
- // VERT
- {
- // BLOCK_4X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_4X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X4, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_8X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X8, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_16X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X16, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X32, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_32X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_64X32,
- { AOM_CDF2(15888) }, { AOM_CDF2(18079) }, { AOM_CDF2(21845) }, { AOM_CDF2(18507) },
- // BLOCK_64X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_64X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X64, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_128X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#if CONFIG_BLOCK_256
- // BLOCK_128X256, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X128, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
- // BLOCK_256X256, unused
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
- }
- },
- };
-#endif // CONFIG_FLEX_PARTITION
-
-#if CONFIG_BLOCK_256
-static aom_cdf_prob
default_do_square_split_cdf[PARTITION_STRUCTURE_NUM][SQUARE_SPLIT_CONTEXTS][CDF_SIZE(2)] = {
// Luma
{
@@ -5015,7 +4248,6 @@
{ AOM_CDF2(16384), 0 },
},
};
-#endif // CONFIG_BLOCK_256
// clang-format on
#else
@@ -6069,16 +5301,16 @@
{ AOM_CDF2(27530) }, { AOM_CDF2(29564) }, { AOM_CDF2(29444) },
{ AOM_CDF2(26872) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) },
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#endif // CONFIG_D149_CTX_MODELING_OPT
@@ -6093,16 +5325,16 @@
{ AOM_CDF2(9770) }, { AOM_CDF2(9100) }, { AOM_CDF2(8233) },
{ AOM_CDF2(6172) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(11820) }, { AOM_CDF2(7701) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) },
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#endif // CONFIG_D149_CTX_MODELING_OPT
@@ -6137,16 +5369,16 @@
{ 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_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) },
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static const aom_cdf_prob
@@ -6167,25 +5399,25 @@
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static const aom_cdf_prob
default_wedge_angle_1_cdf[BLOCK_SIZES_ALL][CDF_SIZE(H_WEDGE_ANGLES)] = {
@@ -6205,25 +5437,25 @@
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938, 26214, 29491) },
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static const aom_cdf_prob
@@ -6236,18 +5468,18 @@
{ AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
{ AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
{ AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
{ AOM_CDF4(8192, 16384, 24576) },
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
{ AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
{ AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
{ AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
{ AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static const aom_cdf_prob
default_wedge_dist_cdf2[BLOCK_SIZES_ALL][CDF_SIZE(NUM_WEDGE_DIST - 1)] = {
@@ -6259,18 +5491,18 @@
{ AOM_CDF3(10923, 21845) }, { AOM_CDF3(10923, 21845) },
{ AOM_CDF3(10923, 21845) }, { AOM_CDF3(10923, 21845) },
{ AOM_CDF3(10923, 21845) }, { AOM_CDF3(10923, 21845) },
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF3(10923, 21845) }, { AOM_CDF3(10923, 21845) },
{ AOM_CDF3(10923, 21845) },
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF3(10923, 21845) }, { AOM_CDF3(10923, 21845) },
{ AOM_CDF3(10923, 21845) }, { AOM_CDF3(10923, 21845) },
{ AOM_CDF3(10923, 21845) }, { AOM_CDF3(10923, 21845) },
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF3(10923, 21845) }, { AOM_CDF3(10923, 21845) },
{ AOM_CDF3(10923, 21845) }, { AOM_CDF3(10923, 21845) },
{ AOM_CDF3(10923, 21845) }, { AOM_CDF3(10923, 21845) },
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#endif // CONFIG_D149_CTX_MODELING_OPT
#else
@@ -6307,14 +5539,14 @@
18432, 20480, 22528, 24576, 26624, 28672, 30720) },
{ AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
18432, 20480, 22528, 24576, 26624, 28672, 30720) },
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
18432, 20480, 22528, 24576, 26624, 28672, 30720) },
{ AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
18432, 20480, 22528, 24576, 26624, 28672, 30720) },
{ AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
18432, 20480, 22528, 24576, 26624, 28672, 30720) },
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
18432, 20480, 22528, 24576, 26624, 28672, 30720) },
{ AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
@@ -6340,16 +5572,16 @@
{ AOM_CDF2(25377) }, { AOM_CDF2(14285) }, { AOM_CDF2(20066) },
{ AOM_CDF2(29912) }, { AOM_CDF2(25066) }, { AOM_CDF2(27617) },
{ AOM_CDF2(31583) }, { AOM_CDF2(31269) }, { AOM_CDF2(32311) },
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(32717) }, { AOM_CDF2(31269) }, { AOM_CDF2(32311) },
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(32717) }, { AOM_CDF2(21846) }, { AOM_CDF2(21846) },
{ AOM_CDF2(30177) }, { AOM_CDF2(28425) }, { AOM_CDF2(30147) },
{ AOM_CDF2(31307) },
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(24000) }, { AOM_CDF2(24000) }, { AOM_CDF2(24000) },
{ AOM_CDF2(24000) }, { AOM_CDF2(24000) }, { AOM_CDF2(24000) },
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#endif // CONFIG_D149_CTX_MODELING_OPT
@@ -6365,16 +5597,16 @@
{ AOM_CDF2(28283), 7 }, { AOM_CDF2(17490), 7 }, { AOM_CDF2(22156), 7 },
{ AOM_CDF2(29137), 7 }, { AOM_CDF2(26381), 25 }, { AOM_CDF2(25945), 36 },
{ AOM_CDF2(29190), 37 }, { AOM_CDF2(30434), 70 }, { AOM_CDF2(30786), 60 },
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(31582), 70 }, { AOM_CDF2(30434), 50 }, { AOM_CDF2(30786), 50 },
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(31582), 50 }, { AOM_CDF2(16384), 0 }, { AOM_CDF2(16384), 0 },
{ AOM_CDF2(30177), 5 }, { AOM_CDF2(30093), 7 }, { AOM_CDF2(31776), 31 },
{ AOM_CDF2(31514), 37 },
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(24000), 0 }, { AOM_CDF2(24000), 0 }, { AOM_CDF2(24000), 2 },
{ AOM_CDF2(24000), 30 }, { AOM_CDF2(24000), 0 }, { AOM_CDF2(24000), 0 },
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#endif // CONFIG_D149_CTX_MODELING_OPT && !NO_D149_FOR_WARPED_CAUSAL
@@ -6390,16 +5622,16 @@
{ AOM_CDF2(28283) }, { AOM_CDF2(17490) }, { AOM_CDF2(22156) },
{ AOM_CDF2(29137) }, { AOM_CDF2(26381) }, { AOM_CDF2(25945) },
{ AOM_CDF2(29190) }, { AOM_CDF2(30434) }, { AOM_CDF2(30786) },
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(31582) }, { AOM_CDF2(30434) }, { AOM_CDF2(30786) },
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(31582) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(30177) }, { AOM_CDF2(30093) }, { AOM_CDF2(31776) },
{ AOM_CDF2(31514) },
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(24000) }, { AOM_CDF2(24000) }, { AOM_CDF2(24000) },
{ AOM_CDF2(24000) }, { AOM_CDF2(24000) }, { AOM_CDF2(24000) },
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#endif // CONFIG_D149_CTX_MODELING_OPT
@@ -6415,16 +5647,16 @@
{ AOM_CDF2(9806) }, { AOM_CDF2(7405) }, { AOM_CDF2(7949) },
{ AOM_CDF2(14870) }, { AOM_CDF2(18438) }, { AOM_CDF2(16459) },
{ AOM_CDF2(19468) }, { AOM_CDF2(24415) }, { AOM_CDF2(22864) },
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(23527) }, { AOM_CDF2(24415) }, { AOM_CDF2(22864) },
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(23527) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(19610) }, { AOM_CDF2(16215) }, { AOM_CDF2(25420) },
{ AOM_CDF2(25105) },
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(24000) }, { AOM_CDF2(24000) }, { AOM_CDF2(24000) },
{ AOM_CDF2(24000) }, { AOM_CDF2(24000) }, { AOM_CDF2(24000) },
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#endif // CONFIG_D149_CTX_MODELING_OPT
@@ -6462,16 +5694,16 @@
{ 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_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) },
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#endif // CONFIG_D149_CTX_MODELING_OPT
@@ -6582,10 +5814,10 @@
{ AOM_CDF3(20360, 28062) }, { AOM_CDF3(21679, 26830) },
{ AOM_CDF3(29516, 30701) }, { AOM_CDF3(28898, 30397) },
{ AOM_CDF3(30878, 31335) }, { AOM_CDF3(32507, 32558) },
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF3(28898, 30397) }, { AOM_CDF3(30878, 31335) },
{ AOM_CDF3(32507, 32558) },
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF3(10923, 21845) }, { AOM_CDF3(10923, 21845) },
{ AOM_CDF3(28799, 31390) }, { AOM_CDF3(26431, 30774) },
{ AOM_CDF3(28973, 31594) }, { AOM_CDF3(29742, 31203) } };
@@ -6601,16 +5833,16 @@
{ AOM_CDF2(17432) }, { AOM_CDF2(14423) }, { AOM_CDF2(15142) },
{ AOM_CDF2(25817) }, { AOM_CDF2(22823) }, { AOM_CDF2(22083) },
{ AOM_CDF2(30128) }, { AOM_CDF2(31014) }, { AOM_CDF2(31560) },
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(32638) }, { AOM_CDF2(31014) }, { AOM_CDF2(31560) },
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(32638) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(23664) }, { AOM_CDF2(20901) }, { AOM_CDF2(24008) },
{ AOM_CDF2(26879) },
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(24000) }, { AOM_CDF2(24000) }, { AOM_CDF2(24000) },
{ AOM_CDF2(24000) }, { AOM_CDF2(24000) }, { AOM_CDF2(24000) },
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#endif // CONFIG_D149_CTX_MODELING_OPT
#endif // CONFIG_EXTENDED_WARP_PREDICTION
@@ -7627,7 +6859,7 @@
#if CONFIG_NEW_TX_PARTITION
#if CONFIG_TX_PARTITION_CTX
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
#if CONFIG_IMPROVEIDTX_CTXS
static const aom_cdf_prob
default_txfm_do_partition_cdf[FSC_MODES][2][TXFM_SPLIT_GROUP]
@@ -7862,7 +7094,7 @@
{ AOM_CDF3(28304, 30575) },
{ AOM_CDF3(21051, 26911) },
{ AOM_CDF3(11702, 22867) } } };
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#else
static const aom_cdf_prob default_inter_4way_txfm_partition_cdf
[2][TXFM_PARTITION_INTER_CONTEXTS][CDF_SIZE(4)] = {
@@ -8062,16 +7294,16 @@
{ AOM_CDF2(12408) }, { AOM_CDF2(14301) }, { AOM_CDF2(12756) },
{ AOM_CDF2(22343) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(16384) }, { AOM_CDF2(12770) }, { AOM_CDF2(10368) },
{ AOM_CDF2(20229) }, { AOM_CDF2(18101) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) },
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#endif // CONFIG_D149_CTX_MODELING_OPT
@@ -8270,7 +7502,7 @@
#if CONFIG_NEW_TX_PARTITION
#if !CONFIG_TX_PARTITION_CTX
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
static const aom_cdf_prob
default_intra_4way_txfm_partition_cdf[2][TX_SIZE_CONTEXTS][CDF_SIZE(4)] = {
{ { AOM_CDF4(23833, 29543, 30199) },
@@ -8297,7 +7529,7 @@
static const aom_cdf_prob default_intra_2way_txfm_partition_cdf[CDF_SIZE(2)] = {
AOM_CDF2(30531)
};
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#endif // !CONFIG_TX_PARTITION_CTX
#else // CONFIG_NEW_TX_PARTITION
#if CONFIG_NEW_CONTEXT_MODELING
@@ -8880,9 +8112,7 @@
#endif // CONFIG_EXTENDED_SDP
#if CONFIG_EXT_RECUR_PARTITIONS
av1_copy(fc->do_split_cdf, default_do_split_cdf);
-#if CONFIG_BLOCK_256
av1_copy(fc->do_square_split_cdf, default_do_square_split_cdf);
-#endif // CONFIG_BLOCK_256
av1_copy(fc->rect_type_cdf, default_rect_type_cdf);
av1_copy(fc->do_ext_partition_cdf, default_do_ext_partition_cdf);
av1_copy(fc->do_uneven_4way_partition_cdf,
diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h
index bd6f013..4e34c93 100644
--- a/av1/common/entropymode.h
+++ b/av1/common/entropymode.h
@@ -493,10 +493,8 @@
#if CONFIG_EXT_RECUR_PARTITIONS
aom_cdf_prob do_split_cdf[PARTITION_STRUCTURE_NUM][PARTITION_CONTEXTS]
[CDF_SIZE(2)];
-#if CONFIG_BLOCK_256
aom_cdf_prob do_square_split_cdf[PARTITION_STRUCTURE_NUM]
[SQUARE_SPLIT_CONTEXTS][CDF_SIZE(2)];
-#endif // CONFIG_BLOCK_256
aom_cdf_prob rect_type_cdf[PARTITION_STRUCTURE_NUM][PARTITION_CONTEXTS]
[CDF_SIZE(2)];
#if CONFIG_EXTENDED_SDP
diff --git a/av1/common/enums.h b/av1/common/enums.h
index 96120c6..b3015bf 100644
--- a/av1/common/enums.h
+++ b/av1/common/enums.h
@@ -120,11 +120,11 @@
#define JOINT_AMVD_SCALE_FACTOR_CNT 3
// Max superblock size
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
#define MAX_SB_SIZE_LOG2 8
#else
#define MAX_SB_SIZE_LOG2 7
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#define MAX_SB_SIZE (1 << MAX_SB_SIZE_LOG2)
#define MAX_SB_SQUARE (MAX_SB_SIZE * MAX_SB_SIZE)
#define BLOCK_128_MI_SIZE_LOG2 5
@@ -171,7 +171,7 @@
// Mask to extract MI offset within max MIB
#define MAX_MIB_MASK (MAX_MIB_SIZE - 1)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
// The largest block size where we need to construct chroma blocks separately
// from luma blocks is 64x32. With the four way partition, we can get 64x4
// block sizes. So we only need to track results for 16 mi units.
@@ -187,7 +187,7 @@
#define SUB_8_BITMASK_T uint8_t
#define SUB_8_BITMASK_SIZE (8)
#define SUB_8_BITMASK_ON (UINT8_MAX)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// Maximum number of tile rows and tile columns
#define MAX_TILE_ROWS 64
@@ -288,31 +288,31 @@
BLOCK_64X128,
BLOCK_128X64,
BLOCK_128X128,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
BLOCK_128X256,
BLOCK_256X128,
BLOCK_256X256,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
BLOCK_4X16,
BLOCK_16X4,
BLOCK_8X32,
BLOCK_32X8,
BLOCK_16X64,
BLOCK_64X16,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
BLOCK_4X32,
BLOCK_32X4,
BLOCK_8X64,
BLOCK_64X8,
BLOCK_4X64,
BLOCK_64X4,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
BLOCK_SIZES_ALL,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
BLOCK_MAX = BLOCK_256X256,
#else
BLOCK_MAX = BLOCK_128X128,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#if CONFIG_CB1TO4_SPLIT
BLOCK_SIZES = BLOCK_4X32,
#else
@@ -369,13 +369,13 @@
} UENUM1BYTE(REGION_TYPE);
#endif // CONFIG_EXTENDED_SDP
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
// 4X4, 8X8, 16X16, 32X32, 64X64, 128X128, 256X256
#define SQR_BLOCK_SIZES 7
#else
// 4X4, 8X8, 16X16, 32X32, 64X64, 128X128
#define SQR_BLOCK_SIZES 6
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// Partition types. R: Recursive
//
@@ -529,14 +529,14 @@
TX_32X8, // 32x8 transform
TX_16X64, // 16x64 transform
TX_64X16, // 64x16 transform
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
TX_4X32, // 4x32 transform
TX_32X4, // 32x4 transform
TX_8X64, // 8x64 transform
TX_64X8, // 64x8 transform
TX_4X64, // 4x64 transform
TX_64X4, // 64x4 transform
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
TX_SIZES_ALL, // Includes rectangular transforms
TX_SIZES = TX_4X8, // Does NOT include rectangular transforms
TX_SIZES_LARGEST = TX_64X64,
@@ -1170,12 +1170,12 @@
#if CONFIG_NEW_TX_PARTITION
#if CONFIG_TX_PARTITION_CTX
// Group size from mapping block size to tx partition context
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
#define TXFM_SPLIT_GROUP 9
#define TXFM_PARTITION_GROUP 17
#else
#define TXFM_PARTITION_GROUP 8
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#else
#define TXFM_PARTITION_INTER_CONTEXTS ((TX_SIZES - TX_8X8) * 6 - 3)
#endif // CONFIG_TX_PARTITION_CTX
diff --git a/av1/common/idct.c b/av1/common/idct.c
index 74eb5ae..f21169d 100644
--- a/av1/common/idct.c
+++ b/av1/common/idct.c
@@ -358,7 +358,7 @@
bd);
}
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
void av1_highbd_inv_txfm_add_4x32_c(const tran_low_t *input, uint16_t *dest,
int stride, const TxfmParam *txfm_param) {
const int32_t *src = cast_to_int32(input);
@@ -418,7 +418,7 @@
#endif // CONFIG_INTER_DDT
txfm_param->bd);
}
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
static void init_txfm_param(const MACROBLOCKD *xd, int plane, TX_SIZE tx_size,
TX_TYPE tx_type, int eob, int reduced_tx_set,
@@ -546,7 +546,7 @@
case TX_32X8:
av1_highbd_inv_txfm_add_32x8_c(input, dest, stride, txfm_param);
break;
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
case TX_4X32:
av1_highbd_inv_txfm_add_4x32_c(input, dest, stride, txfm_param);
break;
@@ -565,7 +565,7 @@
case TX_64X4:
av1_highbd_inv_txfm_add_64x4_c(input, dest, stride, txfm_param);
break;
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
default: assert(0 && "Invalid transform size"); break;
}
}
diff --git a/av1/common/loopfiltermask.c b/av1/common/loopfiltermask.c
index 519f164..4b758f6 100644
--- a/av1/common/loopfiltermask.c
+++ b/av1/common/loopfiltermask.c
@@ -81,40 +81,40 @@
#if CONFIG_LPF_MASK
static const int mask_id_table_tx_4x4[BLOCK_SIZES_ALL] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
-1, -1, -1,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
13, 14, 15, 16, 17, 18
};
static const int mask_id_table_tx_8x8[BLOCK_SIZES_ALL] = {
-1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
-1, -1, -1,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
-1, -1, 10, 11, 12, 13
};
static const int mask_id_table_tx_16x16[BLOCK_SIZES_ALL] = {
-1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, -1, -1, -1,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
-1, -1, -1,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
-1, -1, -1, -1, 7, 8
};
static const int mask_id_table_tx_32x32[BLOCK_SIZES_ALL] = {
-1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, -1, -1, -1,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
-1, -1, -1,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
-1, -1, -1, -1, -1, -1
};
static const int mask_id_table_vert_border[BLOCK_SIZES_ALL] = {
0, 47, 49, 19, 51, 53, 33, 55, 57, 42, 59, 60, 46, -1, -1, -1,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
-1, -1, -1,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
61, 62, 63, 64, 65, 66
};
diff --git a/av1/common/mvref_common.h b/av1/common/mvref_common.h
index ff9ea97..2be9677 100644
--- a/av1/common/mvref_common.h
+++ b/av1/common/mvref_common.h
@@ -53,9 +53,9 @@
int tmvp_sample_step
#endif // CONFIG_TMVP_MEM_OPT
) {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
(void)mib_size_log2;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
int mi_size_log2 = INT_MIN;
if (sb_size <= 64
@@ -65,11 +65,11 @@
) {
mi_size_log2 = mi_size_high_log2[BLOCK_64X64];
} else {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
mi_size_log2 = mi_size_high_log2[BLOCK_128X128];
#else
mi_size_log2 = mib_size_log2;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
}
return mi_size_log2 + MI_SIZE_LOG2;
}
diff --git a/av1/common/quant_common.c b/av1/common/quant_common.c
index 9c3b200..8a8babe 100644
--- a/av1/common/quant_common.c
+++ b/av1/common/quant_common.c
@@ -274,7 +274,7 @@
: quant_params->gqmatrix[NUM_QM_LEVELS - 1][0][qm_tx_size];
}
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
#define QM_TOTAL_SIZE \
(4 * 4 + 8 * 8 + 16 * 16 + 32 * 32 + \
2 * (4 * 8 + 8 * 16 + 16 * 32 + 4 * 16 + 8 * 32 + 4 * 32))
@@ -282,7 +282,7 @@
#define QM_TOTAL_SIZE \
(4 * 4 + 8 * 8 + 16 * 16 + 32 * 32 + \
2 * (4 * 8 + 8 * 16 + 16 * 32 + 4 * 16 + 8 * 32))
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// We only use wt_matrix_ref[q] and iwt_matrix_ref[q]
// for q = 0, ..., NUM_QM_LEVELS - 2.
static const qm_val_t wt_matrix_ref[NUM_QM_LEVELS - 1][2][QM_TOTAL_SIZE];
@@ -561,7 +561,7 @@
152, 152, 152, 178, 178, 178, 178, 190, 190, 190, 190, 91, 91, 91, 91,
86, 86, 86, 86, 91, 91, 91, 91, 110, 110, 110, 110, 128, 128, 128, 128,
152, 152, 152, 152, 178, 178, 178, 178, 190, 190, 190, 190,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 42, 75, 91, 32, 42, 75, 91, 32, 42, 75, 91, 32, 42, 75, 91, 33, 42,
69, 86, 33, 42, 69, 86, 33, 42, 69, 86, 33, 42, 69, 86, 37, 58, 84, 91,
@@ -580,7 +580,7 @@
142, 142, 142, 142, 145, 145, 145, 145, 146, 146, 146, 146, 91, 91, 91,
91, 86, 86, 86, 86, 91, 91, 91, 91, 110, 110, 110, 110, 128, 128, 128,
128, 152, 152, 152, 152, 178, 178, 178, 178, 190, 190, 190, 190
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -796,7 +796,7 @@
102, 102, 102, 102, 105, 105, 105, 105, 66, 66, 66, 66, 61, 61, 61, 61,
64, 64, 64, 64, 73, 73, 73, 73, 82, 82, 82, 82, 92, 92, 92, 92, 102,
102, 102, 102, 105, 105, 105, 105,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 42, 69, 88, 32, 42, 69, 88, 32, 42, 69, 88, 32, 42, 69, 88, 33, 42,
64, 83, 33, 42, 64, 83, 33, 42, 64, 83, 33, 42, 64, 83, 36, 56, 77, 88,
@@ -815,7 +815,7 @@
90, 90, 87, 87, 87, 87, 66, 66, 66, 66, 61, 61, 61, 61, 64, 64, 64, 64,
73, 73, 73, 73, 82, 82, 82, 82, 92, 92, 92, 92, 102, 102, 102, 102,
105, 105, 105, 105
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -1040,7 +1040,7 @@
167, 167, 177, 177, 177, 177, 88, 88, 88, 88, 83, 83, 83, 83, 88, 88,
88, 88, 105, 105, 105, 105, 122, 122, 122, 122, 144, 144, 144, 144,
167, 167, 167, 167, 177, 177, 177, 177,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
31, 47, 60, 66, 31, 47, 60, 66, 31, 47, 60, 66, 31, 47, 60, 66, 40, 45,
54, 61, 40, 45, 54, 61, 40, 45, 54, 61, 40, 45, 54, 61, 46, 56, 64, 64,
@@ -1059,7 +1059,7 @@
130, 136, 136, 136, 136, 136, 136, 136, 136, 88, 88, 88, 88, 83, 83,
83, 83, 88, 88, 88, 88, 105, 105, 105, 105, 122, 122, 122, 122, 144,
144, 144, 144, 167, 167, 167, 167, 177, 177, 177, 177
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -1271,7 +1271,7 @@
99, 99, 99, 99, 102, 102, 102, 102, 65, 65, 65, 65, 61, 61, 61, 61, 63,
63, 63, 63, 72, 72, 72, 72, 81, 81, 81, 81, 90, 90, 90, 90, 99, 99, 99,
99, 102, 102, 102, 102,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
31, 47, 57, 65, 31, 47, 57, 65, 31, 47, 57, 65, 31, 47, 57, 65, 40, 45,
52, 61, 40, 45, 52, 61, 40, 45, 52, 61, 40, 45, 52, 61, 46, 55, 61, 63,
@@ -1290,7 +1290,7 @@
88, 88, 85, 85, 85, 85, 65, 65, 65, 65, 61, 61, 61, 61, 63, 63, 63, 63,
72, 72, 72, 72, 81, 81, 81, 81, 90, 90, 90, 90, 99, 99, 99, 99, 102,
102, 102, 102
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -1515,7 +1515,7 @@
165, 165, 165, 86, 86, 86, 86, 80, 80, 80, 80, 85, 85, 85, 85, 101,
101, 101, 101, 117, 117, 117, 117, 136, 136, 136, 136, 157, 157, 157,
157, 165, 165, 165, 165,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 42, 69, 88, 32, 42, 69, 88, 32, 42, 69, 88, 32, 42, 69, 88, 33, 42,
64, 83, 33, 42, 64, 83, 33, 42, 64, 83, 33, 42, 64, 83, 36, 56, 77, 88,
@@ -1534,7 +1534,7 @@
129, 129, 129, 129, 127, 127, 127, 127, 86, 86, 86, 86, 80, 80, 80, 80,
85, 85, 85, 85, 101, 101, 101, 101, 117, 117, 117, 117, 136, 136, 136,
136, 157, 157, 157, 157, 165, 165, 165, 165
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -1748,7 +1748,7 @@
97, 97, 97, 97, 99, 99, 99, 99, 64, 64, 64, 64, 60, 60, 60, 60, 62, 62,
62, 62, 71, 71, 71, 71, 79, 79, 79, 79, 88, 88, 88, 88, 97, 97, 97, 97,
99, 99, 99, 99,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 38, 62, 86, 32, 38, 62, 86, 32, 38, 62, 86, 32, 38, 62, 86, 32, 40,
58, 80, 32, 40, 58, 80, 32, 40, 58, 80, 32, 40, 58, 80, 34, 51, 68, 85,
@@ -1767,7 +1767,7 @@
85, 85, 82, 82, 82, 82, 64, 64, 64, 64, 60, 60, 60, 60, 62, 62, 62, 62,
71, 71, 71, 71, 79, 79, 79, 79, 88, 88, 88, 88, 97, 97, 97, 97, 99, 99,
99, 99
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -1983,7 +1983,7 @@
85, 85, 85, 105, 105, 105, 105, 142, 142, 142, 142, 69, 69, 69, 69, 75,
75, 75, 75, 95, 95, 95, 95, 125, 125, 125, 125, 84, 84, 84, 84, 85, 85,
85, 85, 105, 105, 105, 105, 142, 142, 142, 142,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
31, 47, 57, 65, 31, 47, 57, 65, 31, 47, 57, 65, 31, 47, 57, 65, 40, 45,
52, 61, 40, 45, 52, 61, 40, 45, 52, 61, 40, 45, 52, 61, 46, 55, 61, 63,
@@ -2002,7 +2002,7 @@
83, 83, 109, 109, 109, 109, 69, 69, 69, 69, 75, 75, 75, 75, 95, 95, 95,
95, 125, 125, 125, 125, 84, 84, 84, 84, 85, 85, 85, 85, 105, 105, 105,
105, 142, 142, 142, 142
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -2212,7 +2212,7 @@
72, 72, 72, 72, 89, 89, 89, 89, 56, 56, 56, 56, 58, 58, 58, 58, 67, 67,
67, 67, 80, 80, 80, 80, 60, 60, 60, 60, 60, 60, 60, 60, 72, 72, 72, 72,
89, 89, 89, 89,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
31, 47, 54, 64, 31, 47, 54, 64, 31, 47, 54, 64, 31, 47, 54, 64, 38, 46,
50, 60, 38, 46, 50, 60, 38, 46, 50, 60, 38, 46, 50, 60, 46, 53, 57, 62,
@@ -2231,7 +2231,7 @@
63, 63, 73, 73, 73, 73, 56, 56, 56, 56, 58, 58, 58, 58, 67, 67, 67, 67,
80, 80, 80, 80, 60, 60, 60, 60, 60, 60, 60, 60, 72, 72, 72, 72, 89, 89,
89, 89
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -2449,7 +2449,7 @@
78, 95, 95, 95, 95, 129, 129, 129, 129, 64, 64, 64, 64, 67, 67, 67, 67,
85, 85, 85, 85, 112, 112, 112, 112, 78, 78, 78, 78, 78, 78, 78, 78, 95,
95, 95, 95, 129, 129, 129, 129,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 38, 62, 86, 32, 38, 62, 86, 32, 38, 62, 86, 32, 38, 62, 86, 32, 40,
58, 80, 32, 40, 58, 80, 32, 40, 58, 80, 32, 40, 58, 80, 34, 51, 68, 85,
@@ -2468,7 +2468,7 @@
73, 73, 96, 96, 96, 96, 64, 64, 64, 64, 67, 67, 67, 67, 85, 85, 85, 85,
112, 112, 112, 112, 78, 78, 78, 78, 78, 78, 78, 78, 95, 95, 95, 95,
129, 129, 129, 129
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -2679,7 +2679,7 @@
66, 66, 66, 66, 84, 84, 84, 84, 54, 54, 54, 54, 55, 55, 55, 55, 62, 62,
62, 62, 76, 76, 76, 76, 57, 57, 57, 57, 58, 58, 58, 58, 66, 66, 66, 66,
84, 84, 84, 84,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 29, 32, 37, 32, 29, 32, 37, 32, 29, 32, 37, 32, 29, 32, 37, 45, 55,
69, 84, 45, 55, 69, 84, 45, 55, 69, 84, 45, 55, 69, 84, 31, 34, 40, 47,
@@ -2698,7 +2698,7 @@
57, 57, 68, 68, 68, 68, 54, 54, 54, 54, 55, 55, 55, 55, 62, 62, 62, 62,
76, 76, 76, 76, 57, 57, 57, 57, 58, 58, 58, 58, 66, 66, 66, 66, 84, 84,
84, 84
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -2912,7 +2912,7 @@
71, 87, 87, 87, 87, 119, 119, 119, 119, 59, 59, 59, 59, 61, 61, 61, 61,
75, 75, 75, 75, 102, 102, 102, 102, 72, 72, 72, 72, 71, 71, 71, 71, 87,
87, 87, 87, 119, 119, 119, 119,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
31, 47, 54, 64, 31, 47, 54, 64, 31, 47, 54, 64, 31, 47, 54, 64, 38, 46,
50, 60, 38, 46, 50, 60, 38, 46, 50, 60, 38, 46, 50, 60, 46, 53, 57, 62,
@@ -2931,7 +2931,7 @@
66, 66, 89, 89, 89, 89, 59, 59, 59, 59, 61, 61, 61, 61, 75, 75, 75, 75,
102, 102, 102, 102, 72, 72, 72, 72, 71, 71, 71, 71, 87, 87, 87, 87,
119, 119, 119, 119
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -3141,7 +3141,7 @@
63, 63, 63, 63, 80, 80, 80, 80, 54, 54, 54, 54, 53, 53, 53, 53, 60, 60,
60, 60, 73, 73, 73, 73, 56, 56, 56, 56, 54, 54, 54, 54, 63, 63, 63, 63,
80, 80, 80, 80,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 33, 38, 43, 32, 33, 38, 43, 32, 33, 38, 43, 32, 33, 38, 43, 48, 52,
56, 60, 48, 52, 56, 60, 48, 52, 56, 60, 48, 52, 56, 60, 38, 39, 44, 49,
@@ -3160,7 +3160,7 @@
56, 56, 65, 65, 65, 65, 54, 54, 54, 54, 53, 53, 53, 53, 60, 60, 60, 60,
73, 73, 73, 73, 56, 56, 56, 56, 54, 54, 54, 54, 63, 63, 63, 63, 80, 80,
80, 80
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -3374,7 +3374,7 @@
77, 77, 77, 77, 103, 103, 103, 103, 54, 54, 54, 54, 54, 54, 54, 54, 67,
67, 67, 67, 89, 89, 89, 89, 65, 65, 65, 65, 62, 62, 62, 62, 77, 77, 77,
77, 103, 103, 103, 103,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 29, 32, 37, 32, 29, 32, 37, 32, 29, 32, 37, 32, 29, 32, 37, 45, 55,
69, 84, 45, 55, 69, 84, 45, 55, 69, 84, 45, 55, 69, 84, 31, 34, 40, 47,
@@ -3393,7 +3393,7 @@
58, 58, 77, 77, 77, 77, 54, 54, 54, 54, 54, 54, 54, 54, 67, 67, 67, 67,
89, 89, 89, 89, 65, 65, 65, 65, 62, 62, 62, 62, 77, 77, 77, 77, 103,
103, 103, 103
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -3603,7 +3603,7 @@
61, 61, 61, 61, 76, 76, 76, 76, 52, 52, 52, 52, 51, 51, 51, 51, 57, 57,
57, 57, 70, 70, 70, 70, 54, 54, 54, 54, 52, 52, 52, 52, 61, 61, 61, 61,
76, 76, 76, 76,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 29, 31, 35, 32, 29, 31, 35, 32, 29, 31, 35, 32, 29, 31, 35, 42, 51,
64, 78, 42, 51, 64, 78, 42, 51, 64, 78, 42, 51, 64, 78, 30, 30, 36, 43,
@@ -3622,7 +3622,7 @@
53, 53, 62, 62, 62, 62, 52, 52, 52, 52, 51, 51, 51, 51, 57, 57, 57, 57,
70, 70, 70, 70, 54, 54, 54, 54, 52, 52, 52, 52, 61, 61, 61, 61, 76, 76,
76, 76
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -3835,7 +3835,7 @@
65, 65, 65, 65, 87, 87, 87, 87, 48, 48, 48, 48, 48, 48, 48, 48, 59, 59,
59, 59, 77, 77, 77, 77, 57, 57, 57, 57, 53, 53, 53, 53, 65, 65, 65, 65,
87, 87, 87, 87,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 33, 38, 43, 32, 33, 38, 43, 32, 33, 38, 43, 32, 33, 38, 43, 48, 52,
56, 60, 48, 52, 56, 60, 48, 52, 56, 60, 48, 52, 56, 60, 38, 39, 44, 49,
@@ -3854,7 +3854,7 @@
52, 52, 67, 67, 67, 67, 48, 48, 48, 48, 48, 48, 48, 48, 59, 59, 59, 59,
77, 77, 77, 77, 57, 57, 57, 57, 53, 53, 53, 53, 65, 65, 65, 65, 87, 87,
87, 87
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -4064,7 +4064,7 @@
56, 56, 56, 56, 68, 68, 68, 68, 49, 49, 49, 49, 48, 48, 48, 48, 53, 53,
53, 53, 62, 62, 62, 62, 52, 52, 52, 52, 50, 50, 50, 50, 56, 56, 56, 56,
68, 68, 68, 68,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 32, 37, 41, 32, 32, 37, 41, 32, 32, 37, 41, 32, 32, 37, 41, 46, 49,
54, 57, 46, 49, 54, 57, 46, 49, 54, 57, 46, 49, 54, 57, 38, 39, 42, 45,
@@ -4083,7 +4083,7 @@
49, 49, 56, 56, 56, 56, 49, 49, 49, 49, 48, 48, 48, 48, 53, 53, 53, 53,
62, 62, 62, 62, 52, 52, 52, 52, 50, 50, 50, 50, 56, 56, 56, 56, 68, 68,
68, 68
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -4295,7 +4295,7 @@
56, 56, 56, 56, 72, 72, 72, 72, 44, 44, 44, 44, 43, 43, 43, 43, 51, 51,
51, 51, 63, 63, 63, 63, 51, 51, 51, 51, 47, 47, 47, 47, 56, 56, 56, 56,
72, 72, 72, 72,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 29, 31, 35, 32, 29, 31, 35, 32, 29, 31, 35, 32, 29, 31, 35, 42, 51,
64, 78, 42, 51, 64, 78, 42, 51, 64, 78, 42, 51, 64, 78, 30, 30, 36, 43,
@@ -4314,7 +4314,7 @@
45, 45, 55, 55, 55, 55, 44, 44, 44, 44, 43, 43, 43, 43, 51, 51, 51, 51,
63, 63, 63, 63, 51, 51, 51, 51, 47, 47, 47, 47, 56, 56, 56, 56, 72, 72,
72, 72
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -4524,7 +4524,7 @@
48, 48, 48, 48, 59, 59, 59, 59, 47, 47, 47, 47, 44, 44, 44, 44, 47, 47,
47, 47, 53, 53, 53, 53, 50, 50, 50, 50, 45, 45, 45, 45, 48, 48, 48, 48,
59, 59, 59, 59,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 30, 31, 34, 32, 30, 31, 34, 32, 30, 31, 34, 32, 30, 31, 34, 40, 48,
59, 72, 40, 48, 59, 72, 40, 48, 59, 72, 40, 48, 59, 72, 30, 30, 34, 38,
@@ -4543,7 +4543,7 @@
46, 46, 49, 49, 49, 49, 47, 47, 47, 47, 44, 44, 44, 44, 47, 47, 47, 47,
53, 53, 53, 53, 50, 50, 50, 50, 45, 45, 45, 45, 48, 48, 48, 48, 59, 59,
59, 59
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -4755,7 +4755,7 @@
45, 45, 45, 45, 58, 58, 58, 58, 40, 40, 40, 40, 37, 37, 37, 37, 42, 42,
42, 42, 53, 53, 53, 53, 44, 44, 44, 44, 39, 39, 39, 39, 45, 45, 45, 45,
58, 58, 58, 58,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 32, 37, 41, 32, 32, 37, 41, 32, 32, 37, 41, 32, 32, 37, 41, 46, 49,
54, 57, 46, 49, 54, 57, 46, 49, 54, 57, 46, 49, 54, 57, 38, 39, 42, 45,
@@ -4774,7 +4774,7 @@
38, 38, 48, 48, 48, 48, 40, 40, 40, 40, 37, 37, 37, 37, 42, 42, 42, 42,
53, 53, 53, 53, 44, 44, 44, 44, 39, 39, 39, 39, 45, 45, 45, 45, 58, 58,
58, 58
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -4984,7 +4984,7 @@
46, 46, 46, 46, 55, 55, 55, 55, 45, 45, 45, 45, 43, 43, 43, 43, 46, 46,
46, 46, 52, 52, 52, 52, 47, 47, 47, 47, 42, 42, 42, 42, 46, 46, 46, 46,
55, 55, 55, 55,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 32, 38, 42, 32, 32, 38, 42, 32, 32, 38, 42, 32, 32, 38, 42, 47, 50,
54, 56, 47, 50, 54, 56, 47, 50, 54, 56, 47, 50, 54, 56, 38, 39, 42, 44,
@@ -5003,7 +5003,7 @@
45, 45, 48, 48, 48, 48, 45, 45, 45, 45, 43, 43, 43, 43, 46, 46, 46, 46,
52, 52, 52, 52, 47, 47, 47, 47, 42, 42, 42, 42, 46, 46, 46, 46, 55, 55,
55, 55
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -5215,7 +5215,7 @@
38, 38, 38, 38, 49, 49, 49, 49, 35, 35, 35, 35, 31, 31, 31, 31, 36, 36,
36, 36, 44, 44, 44, 44, 38, 38, 38, 38, 33, 33, 33, 33, 38, 38, 38, 38,
49, 49, 49, 49,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 30, 31, 34, 32, 30, 31, 34, 32, 30, 31, 34, 32, 30, 31, 34, 40, 48,
59, 72, 40, 48, 59, 72, 40, 48, 59, 72, 40, 48, 59, 72, 30, 30, 34, 38,
@@ -5234,7 +5234,7 @@
34, 34, 40, 40, 40, 40, 35, 35, 35, 35, 31, 31, 31, 31, 36, 36, 36, 36,
44, 44, 44, 44, 38, 38, 38, 38, 33, 33, 33, 33, 38, 38, 38, 38, 49, 49,
49, 49
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -5444,7 +5444,7 @@
43, 43, 43, 43, 48, 48, 48, 48, 43, 43, 43, 43, 42, 42, 42, 42, 43, 43,
43, 43, 46, 46, 46, 46, 47, 47, 47, 47, 42, 42, 42, 42, 43, 43, 43, 43,
48, 48, 48, 48,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 31, 31, 33, 32, 31, 31, 33, 32, 31, 31, 33, 32, 31, 31, 33, 38, 44,
54, 65, 38, 44, 54, 65, 38, 44, 54, 65, 38, 44, 54, 65, 30, 30, 32, 35,
@@ -5463,7 +5463,7 @@
42, 42, 42, 42, 42, 42, 43, 43, 43, 43, 42, 42, 42, 42, 43, 43, 43, 43,
46, 46, 46, 46, 47, 47, 47, 47, 42, 42, 42, 42, 43, 43, 43, 43, 48, 48,
48, 48
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -5675,7 +5675,7 @@
33, 33, 33, 33, 39, 39, 39, 39, 32, 32, 32, 32, 29, 29, 29, 29, 32, 32,
32, 32, 36, 36, 36, 36, 33, 33, 33, 33, 29, 29, 29, 29, 33, 33, 33, 33,
39, 39, 39, 39,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 32, 38, 42, 32, 32, 38, 42, 32, 32, 38, 42, 32, 32, 38, 42, 47, 50,
54, 56, 47, 50, 54, 56, 47, 50, 54, 56, 47, 50, 54, 56, 38, 39, 42, 44,
@@ -5694,7 +5694,7 @@
30, 30, 33, 33, 33, 33, 32, 32, 32, 32, 29, 29, 29, 29, 32, 32, 32, 32,
36, 36, 36, 36, 33, 33, 33, 33, 29, 29, 29, 29, 33, 33, 33, 33, 39, 39,
39, 39
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -5904,7 +5904,7 @@
44, 44, 44, 44, 47, 47, 47, 47, 41, 41, 41, 41, 39, 39, 39, 39, 43, 43,
43, 43, 44, 44, 44, 44, 46, 46, 46, 46, 42, 42, 42, 42, 44, 44, 44, 44,
47, 47, 47, 47,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 31, 37, 41, 32, 31, 37, 41, 32, 31, 37, 41, 32, 31, 37, 41, 45, 48,
52, 54, 45, 48, 52, 54, 45, 48, 52, 54, 45, 48, 52, 54, 37, 38, 42, 43,
@@ -5923,7 +5923,7 @@
42, 42, 44, 44, 44, 44, 41, 41, 41, 41, 39, 39, 39, 39, 43, 43, 43, 43,
44, 44, 44, 44, 46, 46, 46, 46, 42, 42, 42, 42, 44, 44, 44, 44, 47, 47,
47, 47
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -6135,7 +6135,7 @@
31, 31, 31, 31, 35, 35, 35, 35, 32, 32, 32, 32, 29, 29, 29, 29, 30, 30,
30, 30, 33, 33, 33, 33, 33, 33, 33, 33, 30, 30, 30, 30, 31, 31, 31, 31,
35, 35, 35, 35,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 31, 31, 33, 32, 31, 31, 33, 32, 31, 31, 33, 32, 31, 31, 33, 38, 44,
54, 65, 38, 44, 54, 65, 38, 44, 54, 65, 38, 44, 54, 65, 30, 30, 32, 35,
@@ -6154,7 +6154,7 @@
29, 29, 31, 31, 31, 31, 32, 32, 32, 32, 29, 29, 29, 29, 30, 30, 30, 30,
33, 33, 33, 33, 33, 33, 33, 33, 30, 30, 30, 30, 31, 31, 31, 31, 35, 35,
35, 35
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -6364,7 +6364,7 @@
38, 38, 38, 38, 40, 40, 40, 40, 35, 35, 35, 35, 34, 34, 34, 34, 37, 37,
37, 37, 38, 38, 38, 38, 38, 38, 38, 38, 36, 36, 36, 36, 38, 38, 38, 38,
40, 40, 40, 40,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 30, 30, 32, 32, 30, 30, 32, 32, 30, 30, 32, 32, 30, 30, 32, 35, 41,
48, 57, 35, 41, 48, 57, 35, 41, 48, 57, 35, 41, 48, 57, 30, 28, 30, 33,
@@ -6383,7 +6383,7 @@
35, 35, 37, 37, 37, 37, 35, 35, 35, 35, 34, 34, 34, 34, 37, 37, 37, 37,
38, 38, 38, 38, 38, 38, 38, 38, 36, 36, 36, 36, 38, 38, 38, 38, 40, 40,
40, 40
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -6595,7 +6595,7 @@
33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33,
33, 33, 33, 33,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 31, 37, 41, 32, 31, 37, 41, 32, 31, 37, 41, 32, 31, 37, 41, 45, 48,
52, 54, 45, 48, 52, 54, 45, 48, 52, 54, 45, 48, 52, 54, 37, 38, 42, 43,
@@ -6614,7 +6614,7 @@
32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
33, 33
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -6824,7 +6824,7 @@
40, 40, 40, 40, 40, 40, 40, 40, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35,
35, 35, 36, 36, 36, 36, 36, 36, 36, 36, 37, 37, 37, 37, 40, 40, 40, 40,
40, 40, 40, 40,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 29, 34, 39, 32, 29, 34, 39, 32, 29, 34, 39, 32, 29, 34, 39, 43, 46,
49, 52, 43, 46, 49, 52, 43, 46, 49, 52, 43, 46, 49, 52, 36, 37, 40, 42,
@@ -6843,7 +6843,7 @@
36, 36, 36, 36, 36, 36, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35, 35,
36, 36, 36, 36, 36, 36, 36, 36, 37, 37, 37, 37, 40, 40, 40, 40, 40, 40,
40, 40
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -7055,7 +7055,7 @@
32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32,
32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
32, 32, 32, 32,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 30, 30, 32, 32, 30, 30, 32, 32, 30, 30, 32, 32, 30, 30, 32, 35, 41,
48, 57, 35, 41, 48, 57, 35, 41, 48, 57, 35, 41, 48, 57, 30, 28, 30, 33,
@@ -7074,7 +7074,7 @@
32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32,
32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
32, 32
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -7284,7 +7284,7 @@
32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32,
32, 32, 32, 32,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 31, 31, 32, 32, 31, 31, 32, 32, 31, 31, 32, 32, 31, 31, 32, 34, 38,
44, 51, 34, 38, 44, 51, 34, 38, 44, 51, 34, 38, 44, 51, 30, 28, 29, 32,
@@ -7303,7 +7303,7 @@
32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32,
32, 32
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
};
@@ -7500,7 +7500,7 @@
11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 9, 9, 9, 9, 8, 8, 8, 8, 6,
6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 11, 11, 11, 11, 11, 11, 11, 11, 11,
11, 11, 11, 9, 9, 9, 9, 8, 8, 8, 8, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 24, 13, 11, 32, 24, 13, 11, 32, 24, 13, 11, 32, 24, 13, 11, 31, 24,
14, 11, 31, 24, 14, 11, 31, 24, 14, 11, 31, 24, 14, 11, 27, 17, 12, 11,
@@ -7517,7 +7517,7 @@
12, 12, 9, 9, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 11,
11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 9, 9, 9, 9, 8, 8, 8, 8, 6,
6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -7721,7 +7721,7 @@
10, 10, 10, 10, 9, 9, 9, 9, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16,
16, 14, 14, 14, 14, 12, 12, 12, 12, 11, 11, 11, 11, 10, 10, 10, 10, 9,
9, 9, 9,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 24, 14, 11, 32, 24, 14, 11, 32, 24, 14, 11, 32, 24, 14, 11, 31, 24,
16, 12, 31, 24, 16, 12, 31, 24, 16, 12, 31, 24, 16, 12, 28, 18, 13, 11,
@@ -7739,7 +7739,7 @@
11, 11, 11, 11, 11, 11, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
14, 14, 14, 14, 12, 12, 12, 12, 11, 11, 11, 11, 10, 10, 10, 10, 9, 9,
9, 9
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -7942,7 +7942,7 @@
8, 8, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6, 5, 5, 5, 5, 11, 11, 11, 11, 12, 12,
12, 12, 11, 11, 11, 11, 9, 9, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6,
5, 5, 5, 5,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 21, 17, 15, 33, 21, 17, 15, 33, 21, 17, 15, 33, 21, 17, 15, 25, 22,
18, 16, 25, 22, 18, 16, 25, 22, 18, 16, 25, 22, 18, 16, 22, 18, 16, 16,
@@ -7960,7 +7960,7 @@
13, 13, 13, 11, 11, 11, 11, 9, 9, 9, 9, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 11, 11, 11, 11, 12, 12, 12, 12, 11, 11, 11, 11, 9, 9, 9, 9, 8, 8,
8, 8, 7, 7, 7, 7, 6, 6, 6, 6, 5, 5, 5, 5
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -8170,7 +8170,7 @@
10, 10, 10, 10, 10, 10, 10, 10, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16,
16, 16, 14, 14, 14, 14, 12, 12, 12, 12, 11, 11, 11, 11, 10, 10, 10, 10,
10, 10, 10, 10,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 21, 17, 15, 33, 21, 17, 15, 33, 21, 17, 15, 33, 21, 17, 15, 25, 22,
19, 16, 25, 22, 19, 16, 25, 22, 19, 16, 25, 22, 19, 16, 22, 18, 16, 16,
@@ -8189,7 +8189,7 @@
11, 11, 12, 12, 12, 12, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
14, 14, 14, 14, 12, 12, 12, 12, 11, 11, 11, 11, 10, 10, 10, 10, 10, 10,
10, 10
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -8390,7 +8390,7 @@
10, 10, 10, 10, 8, 8, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 11, 11,
11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 10, 10, 10, 8, 8, 8, 8, 7,
7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 24, 14, 11, 32, 24, 14, 11, 32, 24, 14, 11, 32, 24, 14, 11, 31, 24,
16, 12, 31, 24, 16, 12, 31, 24, 16, 12, 31, 24, 16, 12, 28, 18, 13, 11,
@@ -8407,7 +8407,7 @@
15, 15, 15, 15, 12, 12, 12, 12, 10, 10, 10, 10, 8, 8, 8, 8, 7, 7, 7, 7,
8, 8, 8, 8, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 10, 10,
10, 8, 8, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -8614,7 +8614,7 @@
10, 10, 10, 10, 10, 10, 10, 10, 16, 16, 16, 16, 17, 17, 17, 17, 16, 16,
16, 16, 14, 14, 14, 14, 12, 12, 12, 12, 11, 11, 11, 11, 10, 10, 10, 10,
10, 10, 10, 10,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 26, 16, 11, 32, 26, 16, 11, 32, 26, 16, 11, 32, 26, 16, 11, 32, 25,
17, 12, 32, 25, 17, 12, 32, 25, 17, 12, 32, 25, 17, 12, 30, 20, 15, 12,
@@ -8632,7 +8632,7 @@
12, 12, 12, 12, 12, 12, 16, 16, 16, 16, 17, 17, 17, 17, 16, 16, 16, 16,
14, 14, 14, 14, 12, 12, 12, 12, 11, 11, 11, 11, 10, 10, 10, 10, 10, 10,
10, 10
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -8838,7 +8838,7 @@
10, 10, 10, 10, 8, 8, 8, 8, 12, 12, 12, 12, 12, 12, 12, 12, 9, 9, 9, 9,
7, 7, 7, 7, 14, 14, 14, 14, 13, 13, 13, 13, 10, 10, 10, 10, 8, 8, 8, 8,
12, 12, 12, 12, 12, 12, 12, 12, 9, 9, 9, 9, 7, 7, 7, 7,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 21, 17, 15, 33, 21, 17, 15, 33, 21, 17, 15, 33, 21, 17, 15, 25, 22,
19, 16, 25, 22, 19, 16, 25, 22, 19, 16, 25, 22, 19, 16, 22, 18, 16, 16,
@@ -8856,7 +8856,7 @@
13, 13, 13, 13, 10, 10, 10, 10, 18, 18, 18, 18, 15, 15, 15, 15, 12, 12,
12, 12, 9, 9, 9, 9, 14, 14, 14, 14, 13, 13, 13, 13, 10, 10, 10, 10, 8,
8, 8, 8, 12, 12, 12, 12, 12, 12, 12, 12, 9, 9, 9, 9, 7, 7, 7, 7
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -9066,7 +9066,7 @@
14, 14, 14, 14, 11, 11, 11, 11, 18, 18, 18, 18, 17, 17, 17, 17, 15, 15,
15, 15, 12, 12, 12, 12, 17, 17, 17, 17, 17, 17, 17, 17, 14, 14, 14, 14,
11, 11, 11, 11,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 21, 18, 16, 33, 21, 18, 16, 33, 21, 18, 16, 33, 21, 18, 16, 26, 22,
20, 17, 26, 22, 20, 17, 26, 22, 20, 17, 26, 22, 20, 17, 22, 19, 17, 16,
@@ -9085,7 +9085,7 @@
16, 16, 14, 14, 14, 14, 18, 18, 18, 18, 17, 17, 17, 17, 15, 15, 15, 15,
12, 12, 12, 12, 17, 17, 17, 17, 17, 17, 17, 17, 14, 14, 14, 14, 11, 11,
11, 11
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -9290,7 +9290,7 @@
15, 15, 12, 12, 12, 12, 9, 9, 9, 9, 13, 13, 13, 13, 13, 13, 13, 13, 10,
10, 10, 10, 7, 7, 7, 7, 16, 16, 16, 16, 15, 15, 15, 15, 12, 12, 12, 12,
9, 9, 9, 9, 13, 13, 13, 13, 13, 13, 13, 13, 10, 10, 10, 10, 7, 7, 7, 7,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 26, 16, 11, 32, 26, 16, 11, 32, 26, 16, 11, 32, 26, 16, 11, 32, 25,
17, 12, 32, 25, 17, 12, 32, 25, 17, 12, 32, 25, 17, 12, 30, 20, 15, 12,
@@ -9307,7 +9307,7 @@
15, 15, 15, 15, 11, 11, 11, 11, 20, 20, 20, 20, 18, 18, 18, 18, 14, 14,
14, 14, 10, 10, 10, 10, 16, 16, 16, 16, 15, 15, 15, 15, 12, 12, 12, 12,
9, 9, 9, 9, 13, 13, 13, 13, 13, 13, 13, 13, 10, 10, 10, 10, 7, 7, 7, 7
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -9514,7 +9514,7 @@
15, 15, 15, 15, 12, 12, 12, 12, 18, 18, 18, 18, 18, 18, 18, 18, 16, 16,
16, 16, 13, 13, 13, 13, 17, 17, 17, 17, 17, 17, 17, 17, 15, 15, 15, 15,
12, 12, 12, 12,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 35, 32, 27, 32, 35, 32, 27, 32, 35, 32, 27, 32, 35, 32, 27, 22, 18,
14, 12, 22, 18, 14, 12, 22, 18, 14, 12, 22, 18, 14, 12, 33, 30, 25, 21,
@@ -9532,7 +9532,7 @@
17, 17, 15, 15, 15, 15, 18, 18, 18, 18, 18, 18, 18, 18, 16, 16, 16, 16,
13, 13, 13, 13, 17, 17, 17, 17, 17, 17, 17, 17, 15, 15, 15, 15, 12, 12,
12, 12
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -9744,7 +9744,7 @@
11, 11, 11, 11, 8, 8, 8, 8, 17, 17, 17, 17, 16, 16, 16, 16, 13, 13, 13,
13, 10, 10, 10, 10, 14, 14, 14, 14, 14, 14, 14, 14, 11, 11, 11, 11, 8,
8, 8, 8,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 21, 18, 16, 33, 21, 18, 16, 33, 21, 18, 16, 33, 21, 18, 16, 26, 22,
20, 17, 26, 22, 20, 17, 26, 22, 20, 17, 26, 22, 20, 17, 22, 19, 17, 16,
@@ -9763,7 +9763,7 @@
15, 15, 11, 11, 11, 11, 17, 17, 17, 17, 16, 16, 16, 16, 13, 13, 13, 13,
10, 10, 10, 10, 14, 14, 14, 14, 14, 14, 14, 14, 11, 11, 11, 11, 8, 8,
8, 8
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -9973,7 +9973,7 @@
16, 16, 16, 16, 12, 12, 12, 12, 18, 18, 18, 18, 19, 19, 19, 19, 17, 17,
17, 17, 14, 14, 14, 14, 18, 18, 18, 18, 18, 18, 18, 18, 16, 16, 16, 16,
12, 12, 12, 12,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 31, 26, 23, 32, 31, 26, 23, 32, 31, 26, 23, 32, 31, 26, 23, 21, 19,
18, 17, 21, 19, 18, 17, 21, 19, 18, 17, 21, 19, 18, 17, 26, 26, 23, 20,
@@ -9992,7 +9992,7 @@
18, 18, 15, 15, 15, 15, 18, 18, 18, 18, 19, 19, 19, 19, 17, 17, 17, 17,
14, 14, 14, 14, 18, 18, 18, 18, 18, 18, 18, 18, 16, 16, 16, 16, 12, 12,
12, 12
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -10201,7 +10201,7 @@
13, 13, 13, 13, 9, 9, 9, 9, 18, 18, 18, 18, 18, 18, 18, 18, 15, 15, 15,
15, 11, 11, 11, 11, 15, 15, 15, 15, 16, 16, 16, 16, 13, 13, 13, 13, 9,
9, 9, 9,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 35, 32, 27, 32, 35, 32, 27, 32, 35, 32, 27, 32, 35, 32, 27, 22, 18,
14, 12, 22, 18, 14, 12, 22, 18, 14, 12, 22, 18, 14, 12, 33, 30, 25, 21,
@@ -10219,7 +10219,7 @@
17, 17, 13, 13, 13, 13, 18, 18, 18, 18, 18, 18, 18, 18, 15, 15, 15, 15,
11, 11, 11, 11, 15, 15, 15, 15, 16, 16, 16, 16, 13, 13, 13, 13, 9, 9,
9, 9
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -10427,7 +10427,7 @@
16, 16, 16, 16, 13, 13, 13, 13, 19, 19, 19, 19, 20, 20, 20, 20, 17, 17,
17, 17, 14, 14, 14, 14, 18, 18, 18, 18, 19, 19, 19, 19, 16, 16, 16, 16,
13, 13, 13, 13,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 35, 33, 29, 32, 35, 33, 29, 32, 35, 33, 29, 32, 35, 33, 29, 24, 20,
16, 13, 24, 20, 16, 13, 24, 20, 16, 13, 24, 20, 16, 13, 34, 34, 28, 23,
@@ -10445,7 +10445,7 @@
19, 19, 16, 16, 16, 16, 19, 19, 19, 19, 20, 20, 20, 20, 17, 17, 17, 17,
14, 14, 14, 14, 18, 18, 18, 18, 19, 19, 19, 19, 16, 16, 16, 16, 13, 13,
13, 13
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -10657,7 +10657,7 @@
15, 15, 15, 15, 11, 11, 11, 11, 21, 21, 21, 21, 21, 21, 21, 21, 17, 17,
17, 17, 13, 13, 13, 13, 17, 17, 17, 17, 19, 19, 19, 19, 15, 15, 15, 15,
11, 11, 11, 11,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 31, 26, 23, 32, 31, 26, 23, 32, 31, 26, 23, 32, 31, 26, 23, 21, 19,
18, 17, 21, 19, 18, 17, 21, 19, 18, 17, 21, 19, 18, 17, 26, 26, 23, 20,
@@ -10676,7 +10676,7 @@
19, 19, 15, 15, 15, 15, 21, 21, 21, 21, 21, 21, 21, 21, 17, 17, 17, 17,
13, 13, 13, 13, 17, 17, 17, 17, 19, 19, 19, 19, 15, 15, 15, 15, 11, 11,
11, 11
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -10886,7 +10886,7 @@
18, 18, 18, 18, 15, 15, 15, 15, 20, 20, 20, 20, 21, 21, 21, 21, 19, 19,
19, 19, 16, 16, 16, 16, 19, 19, 19, 19, 20, 20, 20, 20, 18, 18, 18, 18,
15, 15, 15, 15,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 32, 27, 24, 32, 32, 27, 24, 32, 32, 27, 24, 32, 32, 27, 24, 22, 20,
18, 17, 22, 20, 18, 17, 22, 20, 18, 17, 22, 20, 18, 17, 26, 26, 24, 22,
@@ -10905,7 +10905,7 @@
20, 20, 18, 18, 18, 18, 20, 20, 20, 20, 21, 21, 21, 21, 19, 19, 19, 19,
16, 16, 16, 16, 19, 19, 19, 19, 20, 20, 20, 20, 18, 18, 18, 18, 15, 15,
15, 15
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -11115,7 +11115,7 @@
18, 18, 18, 18, 14, 14, 14, 14, 23, 23, 23, 23, 23, 23, 23, 23, 20, 20,
20, 20, 16, 16, 16, 16, 20, 20, 20, 20, 21, 21, 21, 21, 18, 18, 18, 18,
14, 14, 14, 14,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 35, 33, 29, 32, 35, 33, 29, 32, 35, 33, 29, 32, 35, 33, 29, 24, 20,
16, 13, 24, 20, 16, 13, 24, 20, 16, 13, 24, 20, 16, 13, 34, 34, 28, 23,
@@ -11133,7 +11133,7 @@
22, 22, 18, 18, 18, 18, 23, 23, 23, 23, 23, 23, 23, 23, 20, 20, 20, 20,
16, 16, 16, 16, 20, 20, 20, 20, 21, 21, 21, 21, 18, 18, 18, 18, 14, 14,
14, 14
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -11343,7 +11343,7 @@
21, 21, 21, 21, 17, 17, 17, 17, 21, 21, 21, 21, 23, 23, 23, 23, 21, 21,
21, 21, 19, 19, 19, 19, 20, 20, 20, 20, 22, 22, 22, 22, 21, 21, 21, 21,
17, 17, 17, 17,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 34, 33, 30, 32, 34, 33, 30, 32, 34, 33, 30, 32, 34, 33, 30, 25, 21,
17, 14, 25, 21, 17, 14, 25, 21, 17, 14, 25, 21, 17, 14, 34, 34, 30, 26,
@@ -11362,7 +11362,7 @@
22, 22, 20, 20, 20, 20, 21, 21, 21, 21, 23, 23, 23, 23, 21, 21, 21, 21,
19, 19, 19, 19, 20, 20, 20, 20, 22, 22, 22, 22, 21, 21, 21, 21, 17, 17,
17, 17
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -11574,7 +11574,7 @@
22, 22, 22, 22, 17, 17, 17, 17, 25, 25, 25, 25, 27, 27, 27, 27, 24, 24,
24, 24, 19, 19, 19, 19, 23, 23, 23, 23, 26, 26, 26, 26, 22, 22, 22, 22,
17, 17, 17, 17,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 32, 27, 24, 32, 32, 27, 24, 32, 32, 27, 24, 32, 32, 27, 24, 22, 20,
18, 17, 22, 20, 18, 17, 22, 20, 18, 17, 22, 20, 18, 17, 26, 26, 24, 22,
@@ -11593,7 +11593,7 @@
26, 26, 21, 21, 21, 21, 25, 25, 25, 25, 27, 27, 27, 27, 24, 24, 24, 24,
19, 19, 19, 19, 23, 23, 23, 23, 26, 26, 26, 26, 22, 22, 22, 22, 17, 17,
17, 17
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -11803,7 +11803,7 @@
22, 22, 22, 22, 18, 18, 18, 18, 22, 22, 22, 22, 23, 23, 23, 23, 22, 22,
22, 22, 19, 19, 19, 19, 21, 21, 21, 21, 24, 24, 24, 24, 22, 22, 22, 22,
18, 18, 18, 18,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 32, 26, 24, 32, 32, 26, 24, 32, 32, 26, 24, 32, 32, 26, 24, 21, 20,
18, 18, 21, 20, 18, 18, 21, 20, 18, 18, 21, 20, 18, 18, 26, 26, 24, 23,
@@ -11822,7 +11822,7 @@
22, 22, 21, 21, 21, 21, 22, 22, 22, 22, 23, 23, 23, 23, 22, 22, 22, 22,
19, 19, 19, 19, 21, 21, 21, 21, 24, 24, 24, 24, 22, 22, 22, 22, 18, 18,
18, 18
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -12034,7 +12034,7 @@
26, 26, 26, 26, 20, 20, 20, 20, 29, 29, 29, 29, 33, 33, 33, 33, 28, 28,
28, 28, 23, 23, 23, 23, 26, 26, 26, 26, 31, 31, 31, 31, 26, 26, 26, 26,
20, 20, 20, 20,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 34, 33, 30, 32, 34, 33, 30, 32, 34, 33, 30, 32, 34, 33, 30, 25, 21,
17, 14, 25, 21, 17, 14, 25, 21, 17, 14, 25, 21, 17, 14, 34, 34, 30, 26,
@@ -12053,7 +12053,7 @@
30, 30, 25, 25, 25, 25, 29, 29, 29, 29, 33, 33, 33, 33, 28, 28, 28, 28,
23, 23, 23, 23, 26, 26, 26, 26, 31, 31, 31, 31, 26, 26, 26, 26, 20, 20,
20, 20
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -12263,7 +12263,7 @@
23, 23, 23, 23, 21, 21, 21, 21, 23, 23, 23, 23, 24, 24, 24, 24, 23, 23,
23, 23, 22, 22, 22, 22, 21, 21, 21, 21, 24, 24, 24, 24, 23, 23, 23, 23,
21, 21, 21, 21,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 33, 33, 31, 32, 33, 33, 31, 32, 33, 33, 31, 32, 33, 33, 31, 26, 23,
18, 15, 26, 23, 18, 15, 26, 23, 18, 15, 26, 23, 18, 15, 34, 34, 32, 29,
@@ -12282,7 +12282,7 @@
24, 24, 24, 24, 24, 24, 23, 23, 23, 23, 24, 24, 24, 24, 23, 23, 23, 23,
22, 22, 22, 22, 21, 21, 21, 21, 24, 24, 24, 24, 23, 23, 23, 23, 21, 21,
21, 21
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -12494,7 +12494,7 @@
31, 31, 31, 31, 26, 26, 26, 26, 32, 32, 32, 32, 35, 35, 35, 35, 32, 32,
32, 32, 28, 28, 28, 28, 31, 31, 31, 31, 35, 35, 35, 35, 31, 31, 31, 31,
26, 26, 26, 26,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 32, 26, 24, 32, 32, 26, 24, 32, 32, 26, 24, 32, 32, 26, 24, 21, 20,
18, 18, 21, 20, 18, 18, 21, 20, 18, 18, 21, 20, 18, 18, 26, 26, 24, 23,
@@ -12513,7 +12513,7 @@
34, 34, 31, 31, 31, 31, 32, 32, 32, 32, 35, 35, 35, 35, 32, 32, 32, 32,
28, 28, 28, 28, 31, 31, 31, 31, 35, 35, 35, 35, 31, 31, 31, 31, 26, 26,
26, 26
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -12723,7 +12723,7 @@
23, 23, 23, 23, 21, 21, 21, 21, 24, 24, 24, 24, 26, 26, 26, 26, 23, 23,
23, 23, 23, 23, 23, 23, 22, 22, 22, 22, 24, 24, 24, 24, 23, 23, 23, 23,
21, 21, 21, 21,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 33, 27, 24, 32, 33, 27, 24, 32, 33, 27, 24, 32, 33, 27, 24, 22, 21,
19, 18, 22, 21, 19, 18, 22, 21, 19, 18, 22, 21, 19, 18, 27, 26, 24, 23,
@@ -12742,7 +12742,7 @@
24, 24, 23, 23, 23, 23, 24, 24, 24, 24, 26, 26, 26, 26, 23, 23, 23, 23,
23, 23, 23, 23, 22, 22, 22, 22, 24, 24, 24, 24, 23, 23, 23, 23, 21, 21,
21, 21
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -12954,7 +12954,7 @@
33, 33, 33, 33, 29, 29, 29, 29, 32, 32, 32, 32, 35, 35, 35, 35, 34, 34,
34, 34, 31, 31, 31, 31, 31, 31, 31, 31, 34, 34, 34, 34, 33, 33, 33, 33,
29, 29, 29, 29,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 33, 33, 31, 32, 33, 33, 31, 32, 33, 33, 31, 32, 33, 33, 31, 26, 23,
18, 15, 26, 23, 18, 15, 26, 23, 18, 15, 26, 23, 18, 15, 34, 34, 32, 29,
@@ -12973,7 +12973,7 @@
35, 35, 33, 33, 33, 33, 32, 32, 32, 32, 35, 35, 35, 35, 34, 34, 34, 34,
31, 31, 31, 31, 31, 31, 31, 31, 34, 34, 34, 34, 33, 33, 33, 33, 29, 29,
29, 29
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -13183,7 +13183,7 @@
26, 26, 26, 26, 25, 25, 25, 25, 29, 29, 29, 29, 30, 30, 30, 30, 27, 27,
27, 27, 26, 26, 26, 26, 26, 26, 26, 26, 28, 28, 28, 28, 26, 26, 26, 26,
25, 25, 25, 25,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 34, 34, 32, 32, 34, 34, 32, 32, 34, 34, 32, 32, 34, 34, 32, 29, 24,
21, 17, 29, 24, 21, 17, 29, 24, 21, 17, 29, 24, 21, 17, 34, 36, 34, 31,
@@ -13202,7 +13202,7 @@
29, 29, 27, 27, 27, 27, 29, 29, 29, 29, 30, 30, 30, 30, 27, 27, 27, 27,
26, 26, 26, 26, 26, 26, 26, 26, 28, 28, 28, 28, 26, 26, 26, 26, 25, 25,
25, 25
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -13414,7 +13414,7 @@
31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31,
31, 31, 31, 31,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 33, 27, 24, 32, 33, 27, 24, 32, 33, 27, 24, 32, 33, 27, 24, 22, 21,
19, 18, 22, 21, 19, 18, 22, 21, 19, 18, 22, 21, 19, 18, 27, 26, 24, 23,
@@ -13433,7 +13433,7 @@
32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
31, 31
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -13643,7 +13643,7 @@
25, 25, 25, 25, 25, 25, 25, 25, 30, 30, 30, 30, 29, 29, 29, 29, 29, 29,
29, 29, 28, 28, 28, 28, 28, 28, 28, 28, 27, 27, 27, 27, 25, 25, 25, 25,
25, 25, 25, 25,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 35, 30, 26, 32, 35, 30, 26, 32, 35, 30, 26, 32, 35, 30, 26, 23, 22,
20, 19, 23, 22, 20, 19, 23, 22, 20, 19, 23, 22, 20, 19, 28, 27, 25, 24,
@@ -13662,7 +13662,7 @@
28, 28, 28, 28, 28, 28, 30, 30, 30, 30, 29, 29, 29, 29, 29, 29, 29, 29,
28, 28, 28, 28, 28, 28, 28, 28, 27, 27, 27, 27, 25, 25, 25, 25, 25, 25,
25, 25
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -13874,7 +13874,7 @@
32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32,
32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
32, 32, 32, 32,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 34, 34, 32, 32, 34, 34, 32, 32, 34, 34, 32, 32, 34, 34, 32, 29, 24,
21, 17, 29, 24, 21, 17, 29, 24, 21, 17, 29, 24, 21, 17, 34, 36, 34, 31,
@@ -13893,7 +13893,7 @@
32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32,
32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
32, 32
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{/* Chroma */
/* Size 4x4 */
@@ -14103,7 +14103,7 @@
32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32,
32, 32, 32, 32,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 33, 33, 32, 32, 33, 33, 32, 32, 33, 33, 32, 32, 33, 33, 32, 30, 26,
23, 20, 30, 26, 23, 20, 30, 26, 23, 20, 30, 26, 23, 20, 34, 36, 35, 32,
@@ -14122,7 +14122,7 @@
32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32,
32, 32
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
};
@@ -14372,7 +14372,7 @@
162, 165, 167, 173, 174, 177, 183, 185, 182, 179, 99, 94, 93, 90, 89,
89, 88, 87, 90, 93, 97, 99, 105, 107, 115, 116, 124, 127, 135, 139, 146,
152, 159, 166, 171, 182, 186, 191, 193, 201, 203, 204,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 45, 76, 96, 32, 43, 72, 91, 32, 42, 69, 90, 32, 42, 69, 87, 33, 43,
68, 86, 34, 44, 67, 86, 36, 48, 71, 84, 36, 51, 74, 86, 37, 54, 76, 88,
@@ -14391,7 +14391,7 @@
138, 139, 142, 143, 140, 141, 146, 150, 148, 147, 146, 96, 91, 90, 87,
86, 86, 84, 86, 88, 92, 96, 99, 105, 107, 114, 118, 123, 129, 135, 140,
148, 153, 161, 166, 169, 178, 180, 184, 188, 193, 193, 192,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -14603,7 +14603,7 @@
99, 102, 101, 102, 103, 103, 101, 99, 71, 67, 66, 64, 63, 62, 62, 61,
62, 64, 66, 67, 70, 71, 75, 76, 79, 81, 84, 86, 89, 91, 94, 97, 98, 102,
104, 106, 106, 109, 109, 108,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
35, 50, 62, 70, 35, 49, 59, 66, 35, 47, 56, 65, 37, 47, 55, 63, 38, 47,
55, 62, 42, 47, 54, 61, 45, 50, 57, 61, 46, 52, 58, 61, 49, 54, 60, 62,
@@ -14622,7 +14622,7 @@
88, 89, 89, 88, 87, 86, 70, 66, 65, 63, 62, 61, 61, 61, 62, 65, 66, 68,
71, 72, 76, 78, 80, 83, 86, 88, 91, 93, 96, 98, 99, 102, 103, 104, 105,
106, 105, 104,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -14850,7 +14850,7 @@
163, 166, 171, 173, 169, 166, 96, 91, 90, 87, 87, 86, 85, 84, 87, 90,
94, 96, 101, 102, 110, 111, 118, 121, 129, 132, 138, 144, 150, 156, 161,
171, 174, 179, 181, 188, 188, 190,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 42, 72, 93, 32, 40, 69, 89, 32, 40, 66, 87, 32, 40,
65, 85, 33, 41, 65, 84, 34, 42, 64, 83, 34, 44, 66, 82,
@@ -14873,7 +14873,7 @@
81, 105, 44, 68, 92, 105, 66, 98, 132, 137, 82, 109, 152, 179,
35, 56, 84, 109, 46, 71, 93, 106, 68, 104, 135, 136, 83, 113,
156, 178,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -15084,7 +15084,7 @@
97, 99, 98, 99, 100, 100, 98, 96, 70, 66, 65, 63, 63, 62, 61, 60, 61,
63, 65, 66, 69, 70, 74, 74, 78, 79, 82, 84, 87, 89, 91, 94, 96, 100,
101, 103, 103, 105, 105, 105,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
34, 49, 60, 69, 34, 48, 57, 65, 34, 46, 55, 64, 35, 46,
55, 62, 37, 47, 54, 62, 41, 47, 52, 61, 43, 48, 53, 60,
@@ -15107,7 +15107,7 @@
62, 71, 48, 59, 67, 68, 53, 73, 88, 84, 60, 75, 93, 102,
44, 52, 63, 72, 50, 60, 67, 68, 55, 76, 88, 83, 60, 76,
95, 101,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -15331,7 +15331,7 @@
155, 160, 161, 158, 155, 93, 88, 88, 84, 84, 83, 82, 81, 84, 86, 90, 92,
97, 98, 105, 106, 113, 115, 122, 125, 131, 136, 141, 147, 151, 160, 163,
168, 169, 175, 175, 176,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 40, 69, 91, 32, 39, 65, 86, 32, 38, 64, 85, 32, 38,
63, 82, 33, 39, 62, 81, 33, 40, 62, 80, 33, 40, 61, 79,
@@ -15354,7 +15354,7 @@
77, 99, 40, 62, 86, 98, 61, 89, 123, 128, 79, 105, 143, 167,
35, 52, 78, 102, 45, 66, 87, 99, 65, 95, 124, 127, 80, 108,
147, 166,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -15565,7 +15565,7 @@
94, 96, 96, 96, 97, 97, 95, 93, 69, 65, 65, 62, 62, 61, 60, 59, 61, 62,
64, 65, 68, 68, 72, 73, 76, 77, 81, 82, 85, 87, 89, 92, 93, 97, 98, 100,
100, 102, 102, 101,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 49, 59, 68, 33, 47, 56, 64, 34, 46, 54, 64, 33, 46,
53, 61, 37, 47, 53, 61, 39, 46, 52, 60, 41, 46, 51, 59,
@@ -15588,7 +15588,7 @@
61, 69, 46, 57, 65, 66, 51, 68, 84, 82, 59, 73, 91, 99,
44, 50, 61, 70, 50, 58, 65, 66, 54, 72, 84, 80, 59, 75,
93, 97,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -15811,7 +15811,7 @@
144, 90, 86, 85, 82, 81, 80, 79, 78, 81, 83, 87, 88, 93, 94, 101, 101,
108, 110, 116, 119, 124, 129, 134, 139, 142, 150, 153, 157, 157, 163,
163, 163,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 40, 59, 86, 32, 39, 57, 82, 32, 38, 56, 81, 32, 38,
54, 78, 32, 39, 54, 77, 33, 39, 55, 77, 33, 40, 54, 75,
@@ -15834,7 +15834,7 @@
71, 93, 40, 60, 80, 92, 54, 80, 107, 120, 75, 99, 133, 155,
33, 47, 75, 95, 42, 61, 84, 92, 56, 81, 111, 118, 76, 100,
138, 154,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -16045,7 +16045,7 @@
91, 91, 93, 93, 94, 94, 92, 90, 68, 64, 64, 61, 61, 60, 59, 58, 60, 61,
63, 64, 67, 67, 71, 71, 74, 75, 79, 80, 83, 85, 87, 89, 91, 94, 95, 97,
97, 99, 98, 98,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 47, 55, 66, 33, 46, 52, 63, 33, 46, 51, 62, 33, 45,
50, 60, 35, 46, 49, 59, 36, 46, 49, 59, 40, 46, 49, 57,
@@ -16068,7 +16068,7 @@
58, 67, 46, 56, 62, 64, 49, 65, 77, 79, 57, 71, 87, 95,
41, 48, 60, 67, 48, 56, 63, 64, 50, 66, 79, 78, 57, 71,
90, 94,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -16287,7 +16287,7 @@
87, 83, 82, 79, 79, 78, 77, 75, 78, 80, 84, 85, 89, 90, 96, 97, 103,
105, 111, 113, 118, 122, 126, 131, 134, 141, 143, 147, 147, 152, 151,
152,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 37, 58, 83, 32, 36, 56, 79, 32, 36, 55, 78, 32, 36,
53, 76, 32, 36, 53, 75, 33, 37, 54, 75, 33, 38, 53, 73,
@@ -16310,7 +16310,7 @@
63, 87, 38, 53, 69, 85, 53, 74, 98, 111, 73, 93, 123, 144,
33, 45, 68, 89, 39, 54, 73, 86, 53, 77, 103, 110, 72, 95,
128, 143,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -16520,7 +16520,7 @@
86, 89, 89, 90, 91, 91, 89, 87, 67, 63, 63, 60, 60, 59, 58, 57, 59, 60,
62, 63, 65, 66, 69, 70, 73, 74, 77, 78, 81, 83, 85, 87, 88, 92, 92, 94,
94, 96, 95, 95,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 45, 54, 65, 32, 44, 52, 62, 32, 44, 52, 61, 32, 44,
50, 59, 33, 45, 49, 59, 35, 45, 49, 58, 37, 46, 49, 57,
@@ -16543,7 +16543,7 @@
55, 65, 46, 52, 57, 62, 49, 63, 73, 77, 57, 68, 84, 92,
39, 48, 57, 65, 47, 53, 59, 62, 48, 64, 75, 75, 56, 70,
86, 91,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -16759,7 +16759,7 @@
105, 105, 111, 111, 118, 118, 121, 121, 124, 79, 75, 75, 72, 72, 71, 71,
69, 69, 73, 73, 78, 78, 84, 84, 90, 90, 96, 96, 103, 103, 110, 110, 118,
118, 125, 125, 133, 133, 136, 136, 141,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 34, 49, 72, 32, 34, 47, 69, 32, 34, 47, 69, 32, 34,
45, 66, 32, 34, 45, 66, 32, 35, 46, 65, 32, 35, 46, 65,
@@ -16782,7 +16782,7 @@
56, 79, 35, 45, 59, 77, 46, 62, 81, 99, 65, 79, 104, 129,
33, 43, 63, 83, 37, 48, 63, 80, 46, 67, 86, 103, 64, 85,
112, 133,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -16992,7 +16992,7 @@
76, 79, 79, 82, 82, 83, 83, 84, 63, 60, 60, 57, 57, 56, 56, 54, 54, 57,
57, 60, 60, 64, 64, 67, 67, 71, 71, 75, 75, 78, 78, 82, 82, 85, 85, 89,
89, 90, 90, 92,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 43, 51, 60, 31, 43, 49, 57, 31, 43, 49, 57, 31, 43,
47, 55, 31, 43, 47, 55, 35, 45, 47, 54, 35, 45, 47, 54,
@@ -17015,7 +17015,7 @@
52, 62, 45, 50, 52, 59, 47, 57, 65, 72, 54, 62, 76, 87,
39, 47, 55, 63, 47, 50, 53, 60, 46, 60, 67, 73, 52, 66,
79, 88,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -17230,7 +17230,7 @@
94, 95, 98, 102, 103, 108, 108, 115, 115, 73, 70, 69, 67, 66, 66, 65,
65, 64, 64, 69, 69, 73, 74, 77, 79, 81, 85, 86, 91, 91, 98, 99, 103,
105, 108, 112, 114, 119, 119, 127, 127,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 34, 49, 68, 32, 34, 47, 65, 32, 34, 47, 64, 32, 34,
46, 63, 32, 34, 45, 62, 32, 34, 45, 62, 32, 35, 46, 61,
@@ -17253,7 +17253,7 @@
51, 76, 35, 45, 55, 75, 46, 60, 77, 97, 61, 73, 95, 121,
32, 38, 55, 76, 36, 45, 57, 75, 46, 62, 80, 97, 61, 75,
99, 121,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -17463,7 +17463,7 @@
72, 74, 75, 76, 77, 78, 80, 80, 61, 58, 57, 56, 55, 54, 54, 53, 52, 53,
56, 56, 58, 59, 61, 62, 63, 66, 66, 69, 69, 72, 73, 75, 76, 78, 79, 80,
82, 83, 86, 86,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 43, 51, 59, 31, 43, 49, 56, 31, 43, 49, 55, 31, 43,
47, 54, 31, 43, 47, 53, 33, 44, 47, 53, 35, 45, 47, 52,
@@ -17486,7 +17486,7 @@
50, 60, 45, 50, 51, 58, 47, 56, 64, 71, 52, 60, 72, 83,
36, 47, 51, 60, 46, 50, 52, 58, 46, 57, 65, 71, 52, 61,
73, 83,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -17699,7 +17699,7 @@
82, 82, 86, 87, 89, 92, 92, 96, 65, 63, 62, 61, 59, 59, 59, 59, 58, 58,
58, 62, 63, 65, 68, 68, 72, 73, 76, 79, 79, 84, 85, 88, 92, 92, 97, 98,
100, 105, 105, 109,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 34, 42, 59, 32, 34, 40, 58, 32, 34, 40, 57, 32, 33,
39, 56, 32, 34, 39, 54, 32, 34, 39, 54, 32, 35, 40, 54,
@@ -17722,7 +17722,7 @@
47, 63, 35, 42, 50, 62, 40, 52, 64, 76, 54, 64, 81, 99,
32, 35, 48, 67, 35, 42, 51, 66, 40, 52, 65, 80, 55, 64,
83, 103,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -17932,7 +17932,7 @@
66, 66, 68, 68, 69, 70, 70, 72, 57, 55, 54, 53, 52, 52, 51, 51, 51, 50,
50, 52, 53, 54, 57, 57, 59, 60, 61, 64, 64, 66, 67, 68, 71, 71, 73, 73,
74, 76, 76, 78,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 41, 49, 55, 31, 42, 47, 53, 31, 42, 47, 52, 32, 42,
46, 51, 31, 42, 45, 50, 31, 42, 45, 50, 34, 44, 46, 49,
@@ -17955,7 +17955,7 @@
48, 55, 44, 50, 49, 53, 46, 53, 58, 62, 49, 56, 66, 73,
35, 48, 49, 57, 45, 50, 50, 55, 46, 53, 58, 63, 49, 56,
67, 75,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -18167,7 +18167,7 @@
69, 70, 71, 74, 75, 76, 79, 79, 53, 52, 51, 51, 49, 49, 49, 49, 50, 49,
49, 49, 51, 54, 54, 57, 60, 60, 63, 65, 65, 69, 71, 72, 75, 76, 77, 81,
82, 83, 87, 87,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 32, 40, 50, 32, 33, 39, 49, 32, 33, 39, 48, 32, 33,
39, 48, 32, 33, 38, 47, 32, 33, 38, 47, 32, 33, 38, 47,
@@ -18190,7 +18190,7 @@
43, 56, 33, 37, 44, 55, 38, 45, 58, 69, 47, 52, 69, 83,
32, 35, 43, 56, 34, 38, 44, 55, 39, 48, 59, 69, 47, 55,
69, 83,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -18400,7 +18400,7 @@
61, 61, 61, 63, 63, 63, 65, 65, 52, 50, 50, 50, 48, 48, 48, 47, 47, 47,
47, 47, 48, 50, 50, 52, 54, 54, 56, 57, 57, 60, 61, 61, 63, 64, 64, 66,
66, 67, 68, 68,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 37, 49, 51, 31, 38, 48, 50, 31, 39, 47, 49, 31, 39,
47, 49, 31, 39, 46, 47, 31, 40, 46, 47, 32, 40, 46, 47,
@@ -18423,7 +18423,7 @@
47, 52, 40, 47, 46, 50, 46, 50, 56, 59, 47, 50, 60, 67,
34, 45, 47, 52, 42, 48, 47, 50, 46, 51, 56, 59, 47, 52,
61, 67,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -18635,7 +18635,7 @@
60, 63, 63, 64, 66, 67, 67, 69, 47, 46, 45, 45, 45, 44, 44, 44, 44, 45,
45, 45, 45, 45, 47, 50, 50, 51, 55, 56, 56, 58, 60, 60, 62, 66, 66, 67,
69, 70, 70, 73,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 32, 36, 46, 32, 32, 35, 45, 32, 32, 35, 44, 32, 32,
35, 44, 32, 32, 35, 43, 32, 33, 34, 43, 32, 33, 34, 43,
@@ -18658,7 +18658,7 @@
38, 47, 33, 35, 40, 46, 34, 40, 49, 55, 43, 46, 59, 69,
32, 34, 38, 49, 33, 36, 40, 48, 35, 42, 49, 57, 43, 49,
59, 71,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -18868,7 +18868,7 @@
57, 58, 58, 58, 59, 59, 59, 60, 50, 49, 48, 48, 47, 46, 46, 46, 46, 46,
46, 46, 46, 46, 47, 50, 50, 50, 53, 54, 54, 55, 56, 56, 57, 59, 59, 60,
61, 61, 61, 62,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 35, 47, 50, 31, 36, 46, 49, 31, 36, 46, 48, 31, 36,
46, 48, 32, 37, 46, 47, 31, 38, 45, 46, 31, 38, 45, 46,
@@ -18891,7 +18891,7 @@
47, 48, 38, 45, 47, 46, 45, 48, 52, 53, 46, 47, 56, 60,
32, 43, 47, 49, 38, 46, 47, 47, 46, 50, 52, 53, 46, 50,
56, 61,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -19103,7 +19103,7 @@
48, 49, 50, 50, 50, 52, 53, 53, 44, 43, 42, 42, 42, 41, 41, 41, 41, 41,
42, 42, 42, 42, 42, 42, 42, 45, 48, 48, 48, 50, 54, 54, 54, 56, 58, 58,
58, 60, 63, 63,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 32, 34, 40, 31, 32, 34, 39, 32, 32, 34, 39, 32, 32,
34, 39, 32, 32, 34, 39, 32, 32, 34, 38, 32, 33, 34, 38,
@@ -19126,7 +19126,7 @@
35, 43, 33, 34, 36, 42, 34, 37, 43, 48, 38, 40, 51, 58,
32, 33, 35, 43, 33, 34, 36, 42, 34, 37, 43, 48, 38, 40,
51, 58,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -19336,7 +19336,7 @@
53, 53, 53, 53, 53, 53, 53, 53, 49, 48, 47, 47, 47, 46, 45, 45, 45, 45,
46, 46, 46, 45, 45, 45, 45, 47, 49, 49, 49, 51, 53, 53, 53, 54, 56, 56,
56, 57, 58, 58,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 34, 43, 49, 31, 34, 42, 48, 31, 35, 43, 47, 31, 35,
43, 47, 31, 35, 43, 47, 32, 36, 43, 46, 31, 36, 43, 46,
@@ -19359,7 +19359,7 @@
48, 47, 36, 44, 47, 46, 43, 47, 51, 50, 46, 46, 53, 56,
31, 39, 48, 47, 36, 44, 47, 46, 43, 47, 51, 50, 46, 46,
53, 56,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -19571,7 +19571,7 @@
41, 41, 43, 45, 46, 46, 46, 46, 36, 35, 35, 35, 35, 35, 35, 35, 34, 34,
34, 35, 36, 36, 36, 36, 37, 38, 38, 38, 38, 40, 41, 42, 42, 42, 44, 47,
48, 48, 48, 49,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 31, 32, 36, 31, 32, 32, 35, 32, 32, 32, 35, 32, 32,
32, 35, 32, 32, 32, 35, 32, 32, 32, 35, 32, 32, 32, 35,
@@ -19594,7 +19594,7 @@
33, 36, 32, 33, 34, 35, 32, 34, 36, 38, 35, 36, 41, 47,
32, 32, 34, 37, 32, 33, 35, 37, 32, 34, 37, 39, 35, 36,
42, 48,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -19804,7 +19804,7 @@
49, 49, 50, 51, 52, 52, 52, 52, 48, 48, 47, 47, 47, 47, 46, 46, 46, 46,
46, 46, 47, 47, 47, 47, 47, 47, 47, 47, 47, 48, 49, 50, 50, 50, 51, 52,
53, 53, 53, 53,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 32, 37, 47, 31, 32, 37, 47, 31, 33, 38, 46, 31, 33,
38, 46, 31, 33, 38, 46, 31, 33, 38, 46, 31, 33, 39, 46,
@@ -19827,7 +19827,7 @@
42, 48, 33, 37, 43, 47, 39, 43, 47, 48, 46, 47, 49, 53,
31, 34, 42, 48, 33, 37, 44, 47, 39, 43, 47, 47, 45, 47,
50, 53,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -20039,7 +20039,7 @@
35, 35, 35, 35, 36, 36, 37, 37, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33,
33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 35, 35, 36, 36, 36, 36, 36,
36, 37, 38, 38,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 31, 32, 32, 31, 31, 32, 33, 31, 32, 32, 33, 32, 32,
32, 33, 32, 32, 32, 33, 32, 32, 32, 33, 32, 32, 32, 33,
@@ -20062,7 +20062,7 @@
32, 34, 32, 32, 32, 34, 32, 33, 34, 36, 33, 33, 35, 38,
32, 32, 32, 34, 32, 32, 33, 34, 32, 33, 34, 36, 33, 34,
36, 38,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -20272,7 +20272,7 @@
47, 47, 47, 47, 47, 47, 47, 47, 38, 39, 39, 40, 40, 40, 40, 40, 40, 40,
41, 41, 41, 41, 41, 42, 43, 44, 44, 44, 44, 45, 46, 47, 47, 47, 47, 47,
47, 47, 48, 48,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 31, 35, 38, 31, 31, 35, 38, 31, 31, 36, 39, 31, 31,
36, 39, 31, 31, 36, 39, 31, 31, 36, 39, 31, 31, 36, 39,
@@ -20295,7 +20295,7 @@
36, 42, 31, 33, 38, 43, 36, 38, 43, 46, 39, 41, 46, 48,
31, 33, 37, 42, 31, 34, 39, 43, 36, 39, 45, 46, 39, 42,
47, 48,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -20507,7 +20507,7 @@
33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34,
34, 34, 34, 34,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 31, 31, 32, 31, 31, 31, 32, 31, 31, 31, 32, 31, 32,
32, 32, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
@@ -20530,7 +20530,7 @@
32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34,
32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
33, 34,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -20740,7 +20740,7 @@
37, 38, 38, 38, 38, 38, 38, 39, 35, 35, 36, 36, 36, 37, 37, 37, 37, 37,
37, 37, 37, 37, 38, 38, 38, 38, 38, 38, 38, 38, 39, 40, 40, 41, 41, 41,
41, 41, 41, 42,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 31, 31, 34, 31, 31, 31, 34, 31, 31, 31, 35, 31, 31,
31, 35, 31, 31, 31, 35, 31, 31, 31, 36, 31, 31, 31, 36,
@@ -20763,7 +20763,7 @@
32, 34, 31, 32, 33, 36, 31, 32, 33, 36, 36, 36, 38, 40,
31, 31, 33, 35, 31, 32, 34, 36, 31, 32, 34, 36, 36, 37,
39, 41,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -20975,7 +20975,7 @@
32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32,
32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
32, 32, 32, 32,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32,
@@ -20998,7 +20998,7 @@
31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
32, 32,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -21208,7 +21208,7 @@
32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32,
32, 32, 32, 32,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
@@ -21231,7 +21231,7 @@
31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 31, 31, 31, 32,
31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 31, 31,
32, 32,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
};
@@ -21430,7 +21430,7 @@
7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 10, 11, 11, 11, 12, 12, 12, 12,
11, 11, 11, 10, 10, 10, 9, 9, 8, 8, 8, 7, 7, 7, 6, 6, 6, 6, 6, 5, 5, 5,
5, 5,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 24, 14, 11, 33, 25, 15, 12, 32, 26, 15, 12, 32, 25,
15, 12, 31, 24, 15, 12, 31, 24, 16, 12, 29, 22, 15, 13,
@@ -21453,7 +21453,7 @@
12, 10, 22, 14, 11, 10, 15, 10, 8, 8, 13, 9, 6, 6,
29, 18, 12, 9, 21, 14, 11, 10, 14, 10, 8, 8, 12, 9,
6, 3,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -21663,7 +21663,7 @@
10, 10, 10, 10, 10, 10, 10, 10, 14, 15, 16, 16, 16, 17, 17, 17, 17, 16,
16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 10,
10, 9, 9, 9,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
30, 21, 17, 15, 30, 21, 18, 16, 30, 22, 19, 16, 29, 22,
19, 17, 28, 22, 19, 17, 25, 22, 19, 17, 23, 20, 18, 17,
@@ -21686,7 +21686,7 @@
16, 14, 20, 17, 15, 15, 18, 14, 12, 12, 17, 14, 11, 10,
23, 20, 16, 14, 20, 17, 15, 15, 18, 13, 12, 12, 17, 13,
11, 10,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -21885,7 +21885,7 @@
9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 11, 11, 11, 12,
12, 12, 12, 12, 12, 11, 11, 11, 10, 10, 9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 6,
6, 6, 6, 6, 5, 5, 5,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 25, 15, 11, 33, 26, 16, 12, 33, 26, 16, 12, 32, 26,
16, 12, 31, 26, 16, 13, 31, 25, 17, 13, 31, 24, 16, 13,
@@ -21908,7 +21908,7 @@
13, 10, 24, 16, 11, 10, 16, 11, 8, 8, 13, 9, 7, 6,
29, 19, 13, 10, 22, 15, 11, 10, 15, 10, 8, 8, 12, 9,
7, 6,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -22118,7 +22118,7 @@
11, 10, 10, 10, 10, 10, 10, 11, 15, 16, 16, 16, 16, 17, 17, 17, 17, 16,
16, 16, 15, 15, 14, 14, 13, 13, 12, 12, 12, 12, 11, 11, 11, 10, 10, 10,
10, 10, 10, 10,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
31, 21, 17, 15, 31, 22, 18, 16, 31, 22, 19, 16, 30, 22,
19, 17, 28, 22, 19, 17, 26, 22, 20, 17, 24, 22, 20, 18,
@@ -22141,7 +22141,7 @@
17, 15, 22, 18, 16, 15, 20, 14, 12, 13, 18, 14, 11, 10,
23, 20, 16, 15, 20, 18, 15, 15, 19, 14, 12, 13, 17, 14,
11, 11,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -22341,7 +22341,7 @@
10, 10, 9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 7, 11, 12, 12,
12, 12, 12, 12, 13, 12, 12, 11, 11, 11, 10, 10, 10, 9, 9, 8, 8, 8, 8, 7,
7, 7, 6, 6, 6, 6, 6, 6, 6,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 26, 16, 12, 33, 27, 17, 12, 33, 27, 17, 13, 33, 28,
17, 13, 32, 26, 17, 13, 31, 26, 17, 13, 31, 26, 18, 13,
@@ -22364,7 +22364,7 @@
14, 11, 26, 17, 12, 11, 18, 12, 9, 8, 13, 10, 7, 6,
30, 20, 13, 11, 23, 16, 12, 11, 16, 11, 9, 9, 13, 10,
7, 7,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -22574,7 +22574,7 @@
11, 11, 11, 11, 11, 11, 11, 11, 15, 16, 16, 17, 17, 17, 17, 17, 17, 17,
16, 16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 12, 12, 11, 11, 11, 10, 10,
10, 10, 10, 10,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
31, 21, 18, 15, 31, 22, 19, 16, 31, 22, 19, 17, 31, 23,
20, 17, 29, 22, 20, 17, 27, 23, 20, 18, 26, 23, 20, 18,
@@ -22597,7 +22597,7 @@
17, 15, 23, 18, 16, 16, 20, 15, 13, 13, 18, 14, 12, 11,
24, 21, 17, 15, 21, 18, 16, 16, 19, 15, 12, 13, 17, 14,
11, 11,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -22797,7 +22797,7 @@
13, 12, 12, 11, 11, 10, 10, 9, 9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7,
11, 12, 12, 12, 13, 13, 13, 13, 13, 12, 12, 12, 11, 11, 10, 10, 9, 9, 9,
9, 8, 8, 8, 7, 7, 7, 7, 7, 7, 6, 6, 6,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 26, 18, 12, 33, 27, 19, 13, 33, 28, 19, 13, 33, 28,
19, 13, 32, 27, 19, 14, 32, 26, 19, 14, 31, 26, 20, 14,
@@ -22820,7 +22820,7 @@
15, 12, 26, 18, 13, 12, 20, 13, 10, 9, 14, 11, 8, 7,
31, 22, 14, 11, 25, 17, 12, 12, 19, 13, 10, 9, 14, 10,
8, 7,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -23030,7 +23030,7 @@
11, 11, 11, 11, 11, 11, 11, 11, 15, 16, 16, 17, 17, 17, 17, 18, 17, 17,
16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 12, 12, 12, 12, 11, 11, 11, 11,
11, 10, 10, 10,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 22, 19, 16, 32, 23, 20, 17, 32, 23, 20, 17, 32, 23,
21, 18, 30, 23, 21, 18, 29, 22, 21, 18, 26, 23, 21, 18,
@@ -23053,7 +23053,7 @@
18, 16, 23, 19, 17, 16, 21, 16, 14, 13, 18, 14, 12, 11,
25, 21, 17, 16, 22, 19, 16, 16, 21, 16, 13, 13, 18, 14,
12, 11,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -23256,7 +23256,7 @@
14, 14, 13, 13, 12, 12, 11, 11, 11, 10, 10, 9, 9, 9, 9, 8, 8, 8, 8, 8,
7, 7, 7, 8, 12, 12, 12, 13, 13, 13, 13, 14, 13, 13, 12, 12, 12, 11, 11,
11, 10, 10, 9, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 29, 18, 13, 33, 29, 19, 13, 33, 29, 19, 13, 33, 29,
20, 14, 33, 29, 20, 14, 32, 28, 19, 14, 32, 27, 20, 14,
@@ -23279,7 +23279,7 @@
17, 12, 27, 20, 15, 12, 20, 14, 11, 10, 14, 11, 9, 7,
32, 23, 15, 12, 27, 19, 14, 12, 20, 13, 10, 10, 15, 11,
8, 8,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -23489,7 +23489,7 @@
12, 12, 12, 11, 11, 11, 12, 12, 15, 16, 16, 17, 17, 17, 18, 18, 17, 17,
17, 16, 16, 16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 12, 12, 11, 11, 11,
11, 11, 11, 11,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
32, 24, 19, 16, 32, 24, 20, 17, 32, 24, 20, 17, 33, 24,
21, 18, 31, 23, 21, 18, 30, 23, 21, 18, 28, 22, 21, 19,
@@ -23512,7 +23512,7 @@
19, 16, 22, 20, 18, 17, 21, 17, 14, 14, 19, 15, 12, 12,
27, 22, 18, 16, 22, 20, 18, 17, 21, 17, 14, 14, 19, 15,
12, 12,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -23717,7 +23717,7 @@
17, 18, 18, 16, 16, 15, 15, 14, 14, 13, 13, 12, 12, 11, 11, 10, 10, 10,
10, 9, 9, 9, 9, 8, 8, 8, 13, 14, 14, 14, 14, 14, 14, 15, 15, 14, 14, 13,
13, 12, 12, 11, 11, 11, 11, 10, 10, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 7,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 30, 21, 15, 33, 31, 22, 16, 33, 31, 22, 16, 33, 31,
23, 16, 33, 31, 23, 16, 32, 29, 22, 16, 32, 29, 22, 16,
@@ -23740,7 +23740,7 @@
19, 13, 29, 23, 18, 14, 22, 17, 13, 11, 16, 13, 10, 8,
32, 24, 17, 13, 28, 22, 17, 13, 23, 15, 12, 10, 17, 12,
10, 8,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -23950,7 +23950,7 @@
13, 13, 13, 12, 12, 12, 12, 12, 16, 17, 17, 18, 18, 18, 18, 19, 19, 18,
18, 17, 17, 16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 12, 12, 12, 12, 12,
12, 11, 11, 11,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 25, 21, 17, 33, 25, 21, 18, 33, 25, 21, 18, 33, 24,
22, 19, 33, 24, 22, 19, 30, 23, 22, 19, 30, 23, 22, 19,
@@ -23973,7 +23973,7 @@
20, 17, 23, 21, 20, 18, 22, 18, 16, 15, 19, 17, 14, 12,
27, 22, 19, 17, 22, 21, 19, 17, 23, 18, 16, 14, 20, 16,
13, 12,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -24185,7 +24185,7 @@
11, 10, 10, 10, 9, 9, 9, 9, 14, 15, 15, 15, 16, 16, 16, 16, 16, 16, 15,
15, 14, 14, 13, 13, 13, 12, 12, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9, 9,
8, 8,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 30, 21, 16, 33, 31, 22, 16, 33, 31, 22, 16, 33, 31,
23, 17, 33, 31, 23, 17, 33, 30, 23, 17, 32, 29, 22, 17,
@@ -24208,7 +24208,7 @@
20, 14, 29, 24, 19, 14, 22, 17, 13, 11, 17, 14, 11, 9,
32, 27, 19, 14, 29, 23, 19, 14, 23, 17, 13, 11, 17, 14,
11, 9,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -24418,7 +24418,7 @@
14, 14, 14, 13, 13, 13, 13, 13, 17, 18, 18, 18, 19, 19, 19, 19, 20, 19,
18, 18, 18, 17, 17, 17, 16, 16, 16, 15, 15, 14, 14, 14, 13, 13, 13, 13,
12, 12, 12, 12,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 25, 21, 18, 33, 25, 21, 19, 33, 25, 21, 19, 33, 24,
22, 19, 33, 24, 22, 20, 31, 24, 22, 20, 30, 23, 22, 20,
@@ -24441,7 +24441,7 @@
21, 17, 23, 21, 21, 18, 22, 19, 17, 15, 20, 18, 15, 13,
29, 22, 20, 17, 23, 21, 20, 18, 23, 18, 16, 15, 20, 17,
14, 13,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -24653,7 +24653,7 @@
12, 12, 12, 12, 12, 11, 11, 11, 16, 16, 17, 17, 17, 17, 17, 17, 18, 18,
18, 17, 16, 16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 12, 11, 11, 11, 10,
10, 10, 10, 9,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 31, 25, 18, 33, 31, 26, 18, 33, 31, 26, 19, 33, 31,
27, 19, 33, 31, 27, 19, 33, 31, 27, 19, 33, 30, 26, 19,
@@ -24676,7 +24676,7 @@
22, 17, 30, 25, 21, 17, 26, 20, 16, 14, 19, 16, 13, 11,
32, 29, 21, 16, 29, 25, 21, 16, 26, 20, 16, 13, 19, 16,
13, 10,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -24886,7 +24886,7 @@
16, 16, 15, 15, 15, 15, 15, 14, 18, 19, 19, 19, 20, 20, 20, 20, 20, 20,
20, 20, 19, 19, 18, 18, 17, 17, 17, 16, 16, 16, 15, 15, 14, 14, 14, 14,
14, 13, 13, 13,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 26, 21, 19, 33, 25, 22, 20, 33, 25, 22, 20, 33, 25,
22, 20, 33, 25, 23, 21, 33, 25, 23, 21, 30, 23, 23, 21,
@@ -24909,7 +24909,7 @@
21, 19, 23, 21, 21, 20, 23, 19, 18, 17, 21, 19, 16, 14,
30, 22, 21, 18, 23, 21, 21, 19, 22, 19, 18, 17, 21, 19,
16, 14,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -25121,7 +25121,7 @@
15, 15, 14, 14, 14, 13, 13, 13, 19, 20, 20, 20, 21, 21, 21, 21, 20, 21,
21, 21, 20, 19, 19, 18, 17, 17, 16, 16, 16, 15, 14, 14, 14, 13, 13, 13,
12, 12, 12, 12,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 32, 26, 21, 33, 32, 27, 21, 33, 32, 27, 22, 33, 32,
27, 22, 33, 32, 27, 22, 33, 32, 28, 22, 33, 31, 27, 22,
@@ -25144,7 +25144,7 @@
24, 19, 31, 28, 24, 19, 27, 23, 18, 15, 22, 20, 15, 13,
32, 30, 24, 19, 31, 27, 24, 19, 26, 22, 18, 15, 22, 19,
15, 13,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -25354,7 +25354,7 @@
17, 17, 17, 16, 16, 16, 16, 16, 20, 20, 20, 20, 21, 21, 21, 22, 22, 22,
22, 22, 21, 20, 20, 20, 19, 19, 18, 18, 18, 17, 17, 17, 16, 16, 16, 16,
16, 15, 15, 15,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 28, 21, 20, 33, 27, 22, 21, 33, 27, 22, 21, 33, 27,
22, 21, 33, 27, 23, 22, 33, 26, 23, 22, 32, 26, 23, 22,
@@ -25377,7 +25377,7 @@
22, 20, 26, 22, 23, 21, 23, 21, 19, 18, 22, 20, 17, 16,
30, 23, 22, 20, 25, 22, 22, 21, 23, 20, 19, 18, 22, 20,
17, 16,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -25589,7 +25589,7 @@
17, 16, 16, 16, 16, 15, 15, 15, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
23, 23, 23, 23, 22, 20, 20, 20, 19, 18, 18, 18, 17, 17, 17, 16, 16, 15,
15, 15, 15, 14,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 33, 29, 23, 33, 32, 29, 23, 33, 32, 29, 24, 33, 32,
29, 24, 33, 32, 30, 24, 33, 32, 30, 24, 33, 32, 30, 24,
@@ -25612,7 +25612,7 @@
27, 22, 32, 29, 26, 23, 30, 26, 21, 19, 24, 23, 18, 15,
33, 30, 27, 21, 32, 29, 26, 21, 30, 25, 21, 18, 24, 21,
18, 15,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -25822,7 +25822,7 @@
18, 18, 18, 18, 17, 17, 17, 17, 20, 21, 21, 21, 22, 22, 22, 22, 22, 22,
22, 22, 22, 22, 22, 20, 20, 20, 19, 19, 19, 19, 18, 18, 18, 17, 17, 17,
17, 17, 17, 17,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 30, 22, 21, 33, 29, 23, 21, 33, 29, 23, 22, 33, 29,
23, 22, 33, 28, 23, 22, 33, 28, 23, 23, 33, 28, 23, 23,
@@ -25845,7 +25845,7 @@
22, 21, 28, 23, 22, 22, 23, 21, 20, 20, 23, 22, 18, 17,
32, 24, 22, 21, 28, 23, 22, 22, 23, 21, 20, 20, 23, 21,
18, 17,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -26057,7 +26057,7 @@
21, 21, 20, 20, 20, 20, 19, 19, 23, 24, 24, 24, 24, 25, 25, 25, 25, 25,
24, 24, 24, 24, 24, 24, 24, 23, 21, 21, 21, 20, 19, 19, 19, 18, 18, 18,
18, 17, 16, 16,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 33, 30, 26, 33, 33, 31, 27, 33, 32, 31, 27, 33, 32,
31, 27, 33, 32, 31, 27, 33, 32, 31, 27, 33, 32, 31, 28,
@@ -26080,7 +26080,7 @@
29, 24, 32, 30, 29, 25, 31, 28, 24, 22, 28, 26, 20, 18,
33, 32, 29, 24, 32, 30, 29, 25, 31, 28, 24, 22, 28, 26,
20, 18,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -26290,7 +26290,7 @@
19, 19, 19, 19, 19, 19, 19, 19, 21, 21, 22, 22, 22, 22, 23, 23, 23, 23,
22, 22, 22, 23, 23, 23, 23, 22, 21, 21, 21, 20, 19, 19, 19, 19, 18, 18,
18, 18, 18, 18,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 31, 25, 21, 33, 31, 25, 22, 33, 30, 25, 22, 33, 30,
25, 22, 33, 30, 25, 22, 33, 29, 24, 22, 33, 29, 24, 23,
@@ -26313,7 +26313,7 @@
22, 22, 29, 24, 22, 23, 24, 22, 20, 21, 23, 23, 19, 19,
33, 27, 22, 22, 29, 24, 22, 23, 24, 22, 20, 21, 23, 23,
19, 19,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -26525,7 +26525,7 @@
25, 25, 24, 23, 22, 22, 22, 22, 28, 29, 29, 29, 29, 29, 29, 29, 30, 30,
30, 29, 28, 28, 28, 28, 28, 27, 27, 27, 27, 26, 25, 24, 24, 24, 23, 22,
21, 21, 21, 21,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 33, 32, 29, 33, 33, 32, 29, 33, 32, 32, 29, 33, 32,
32, 29, 33, 32, 32, 29, 33, 32, 32, 29, 33, 32, 32, 30,
@@ -26548,7 +26548,7 @@
31, 29, 32, 32, 30, 29, 32, 30, 28, 27, 30, 28, 26, 22,
33, 32, 30, 28, 32, 32, 30, 28, 32, 30, 28, 26, 30, 28,
25, 22,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -26758,7 +26758,7 @@
21, 21, 20, 20, 20, 20, 20, 20, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 20, 20, 20, 20, 20,
19, 19, 19, 19,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 32, 28, 22, 33, 32, 28, 22, 33, 32, 27, 23, 33, 32,
27, 23, 33, 32, 27, 23, 33, 32, 27, 23, 33, 31, 26, 23,
@@ -26781,7 +26781,7 @@
25, 22, 31, 28, 24, 22, 26, 24, 22, 21, 23, 22, 21, 20,
34, 30, 24, 22, 31, 28, 24, 22, 26, 24, 22, 22, 23, 22,
21, 20,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -26993,7 +26993,7 @@
29, 29, 29, 29, 28, 28, 28, 28, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31,
31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 29, 29, 28, 28, 28, 28, 28,
28, 28, 27, 27,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 33, 33, 32, 33, 33, 32, 32, 33, 32, 32, 32, 33, 32,
32, 32, 33, 32, 32, 32, 33, 32, 32, 32, 33, 32, 32, 32,
@@ -27016,7 +27016,7 @@
32, 30, 32, 32, 32, 30, 32, 32, 30, 29, 32, 31, 29, 28,
33, 33, 32, 30, 32, 32, 31, 30, 32, 31, 30, 29, 32, 31,
29, 28,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -27226,7 +27226,7 @@
22, 22, 22, 22, 22, 22, 22, 22, 27, 26, 26, 26, 26, 26, 26, 26, 26, 26,
25, 25, 25, 25, 25, 24, 24, 23, 23, 23, 23, 23, 22, 22, 22, 22, 22, 22,
22, 22, 21, 21,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 33, 30, 28, 33, 33, 30, 27, 33, 33, 29, 27, 33, 33,
29, 27, 33, 33, 29, 27, 33, 33, 29, 27, 33, 33, 29, 27,
@@ -27249,7 +27249,7 @@
29, 24, 33, 31, 27, 24, 29, 28, 24, 23, 27, 26, 23, 22,
33, 32, 28, 24, 33, 30, 26, 24, 29, 27, 23, 23, 27, 25,
22, 22,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -27461,7 +27461,7 @@
31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30,
30, 30, 30, 30,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 33, 33, 33, 33, 33, 33, 32, 33, 33, 33, 32, 33, 32,
32, 32, 33, 32, 32, 32, 33, 32, 32, 32, 33, 32, 32, 32,
@@ -27484,7 +27484,7 @@
33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
31, 31,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -27694,7 +27694,7 @@
28, 27, 27, 27, 27, 27, 27, 26, 29, 29, 28, 28, 28, 28, 28, 28, 28, 28,
28, 28, 28, 28, 27, 27, 27, 27, 27, 27, 27, 27, 26, 26, 26, 25, 25, 25,
25, 25, 25, 24,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 33, 33, 30, 33, 33, 33, 30, 33, 33, 33, 30, 33, 33,
33, 30, 33, 33, 33, 29, 33, 33, 33, 29, 33, 33, 33, 29,
@@ -27717,7 +27717,7 @@
33, 31, 33, 33, 31, 29, 33, 32, 31, 28, 29, 29, 27, 26,
33, 34, 32, 30, 33, 32, 30, 28, 33, 32, 30, 28, 29, 28,
27, 25,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
{
@@ -27929,7 +27929,7 @@
32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32,
32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
32, 32, 32, 32,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32,
@@ -27952,7 +27952,7 @@
33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32,
32, 32,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{ /* Chroma */
/* Size 4x4 */
@@ -28162,7 +28162,7 @@
32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32,
32, 32, 32, 32,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
/* Size 4x32 */
33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
@@ -28185,7 +28185,7 @@
33, 34, 33, 33, 33, 33, 33, 33, 33, 32, 33, 33, 33, 32,
33, 33, 33, 34, 33, 33, 33, 33, 33, 33, 33, 32, 33, 33,
32, 32,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
},
};
diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index 930c5e2..49f86d8 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -322,23 +322,23 @@
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, // not used
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, // not used
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, // not used
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, // not used
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, // not used
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, // not used
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, },
{ 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, },
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, // not used
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, // not used
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, // not used
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, // not used
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, // not used
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, // not used
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, // not used
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, // not used
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
/* clang-format on */
#endif // !CONFIG_WEDGE_MOD_EXT
@@ -479,11 +479,11 @@
{ 0, NULL, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL, NULL },
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ 0, NULL, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL, NULL },
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ MAX_WEDGE_TYPES, wedge_codebook_16, NULL, wedge_masks[BLOCK_8X32],
wedge_tmvp_decisions[BLOCK_8X32] },
{ MAX_WEDGE_TYPES, wedge_codebook_16, NULL, wedge_masks[BLOCK_32X8],
@@ -492,7 +492,7 @@
wedge_tmvp_decisions[BLOCK_16X64] },
{ MAX_WEDGE_TYPES, wedge_codebook_16, NULL, wedge_masks[BLOCK_64X16],
wedge_tmvp_decisions[BLOCK_64X16] },
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ 0, NULL, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL, NULL },
{ MAX_WEDGE_TYPES, wedge_codebook_16, NULL, wedge_masks[BLOCK_8X64],
@@ -501,7 +501,7 @@
wedge_tmvp_decisions[BLOCK_64X8] },
{ 0, NULL, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL, NULL },
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#else
const wedge_params_type av1_wedge_params_lookup[BLOCK_SIZES_ALL] = {
@@ -523,23 +523,23 @@
{ 0, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL },
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ 0, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL },
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ MAX_WEDGE_TYPES, wedge_codebook_16, NULL, wedge_masks[BLOCK_8X32] },
{ MAX_WEDGE_TYPES, wedge_codebook_16, NULL, wedge_masks[BLOCK_32X8] },
{ MAX_WEDGE_TYPES, wedge_codebook_16, NULL, wedge_masks[BLOCK_16X64] },
{ MAX_WEDGE_TYPES, wedge_codebook_16, NULL, wedge_masks[BLOCK_64X16] },
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ 0, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL },
{ MAX_WEDGE_TYPES, wedge_codebook_16, NULL, wedge_masks[BLOCK_8X64] },
{ MAX_WEDGE_TYPES, wedge_codebook_16, NULL, wedge_masks[BLOCK_64X8] },
{ 0, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL },
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#endif // CONFIG_WEDGE_TMVP
#else
@@ -571,25 +571,25 @@
{ 0, NULL, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL, NULL },
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ 0, NULL, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL, NULL },
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ MAX_WEDGE_TYPES, wedge_codebook_16_hgtw, wedge_signflip_lookup[BLOCK_8X32],
wedge_masks[BLOCK_8X32], wedge_tmvp_decisions[BLOCK_8X32] },
{ MAX_WEDGE_TYPES, wedge_codebook_16_hltw, wedge_signflip_lookup[BLOCK_32X8],
wedge_masks[BLOCK_32X8], wedge_tmvp_decisions[BLOCK_32X8] },
{ 0, NULL, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL, NULL },
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ 0, NULL, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL, NULL },
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#else
const wedge_params_type av1_wedge_params_lookup[BLOCK_SIZES_ALL] = {
@@ -618,25 +618,25 @@
{ 0, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL },
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
{ 0, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL },
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
{ MAX_WEDGE_TYPES, wedge_codebook_16_hgtw, wedge_signflip_lookup[BLOCK_8X32],
wedge_masks[BLOCK_8X32] },
{ MAX_WEDGE_TYPES, wedge_codebook_16_hltw, wedge_signflip_lookup[BLOCK_32X8],
wedge_masks[BLOCK_32X8] },
{ 0, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL },
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ 0, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL },
{ 0, NULL, NULL, NULL },
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#endif // CONFIG_WEDGE_TMVP
#endif
@@ -992,13 +992,13 @@
static uint8_t ii_size_scales[BLOCK_SIZES_ALL] = {
32, 16, 16, 16, 8, 8, 8, 4,
4, 4, 2, 2, 2, 1, 1, 1,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
0, 0, 0, // unused
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
8, 8, 4, 4, 2, 2,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
4, 4, 2, 2, 2, 2,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
/* clang-format on */
diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c
index 3a3fa07..43ff655 100644
--- a/av1/common/reconintra.c
+++ b/av1/common/reconintra.c
@@ -100,7 +100,6 @@
if (row_off > 0) { // Just need to check if enough pixels on the right.
const int plane_bw_unit_64 = mi_size_wide[BLOCK_64X64] >> ss_x;
if (block_size_wide[bsize] > block_size_wide[BLOCK_64X64]) {
-#if CONFIG_BLOCK_256
// Special case: For 256 and 128 blocks, if the tx unit's top right center
// is aligned with 64x64 boundary and we are not at the right most column,
// then the tx unit does in fact have pixels available at its top-right
@@ -111,15 +110,6 @@
row_off % plane_bh_unit_64 == 0) {
return 1;
}
-#else
- // Special case: For 128x128 blocks, the transform unit whose
- // top-right corner is at the center of the block does in fact have
- // pixels available at its top-right corner.
- if (row_off == mi_size_high[BLOCK_64X64] >> ss_y &&
- col_off + top_right_count_unit == mi_size_wide[BLOCK_64X64] >> ss_x) {
- return 1;
- }
-#endif // CONFIG_BLOCK_256
const int col_off_64 = col_off % plane_bw_unit_64;
return col_off_64 + top_right_count_unit < plane_bw_unit_64;
}
@@ -260,10 +250,6 @@
has_tr_32x64, has_tr_64x32, has_tr_64x64,
// 64x128, 128x64, 128x128
has_tr_64x128, has_tr_128x64, has_tr_128x128,
-#if CONFIG_BLOCK_256
- // 128X256, 256X128, 256X256,
- NULL, NULL, NULL,
-#endif // CONFIG_BLOCK_256
// 4x16, 16x4, 8x32
has_tr_4x16, has_tr_16x4, has_tr_8x32,
// 32x8, 16x64, 64x16
@@ -293,31 +279,15 @@
// 4X4
NULL,
// 4X8, 8X4, 8X8
- has_tr_4x8,
- NULL,
- has_tr_vert_8x8,
+ has_tr_4x8, NULL, has_tr_vert_8x8,
// 8X16, 16X8, 16X16
- has_tr_8x16,
- NULL,
- has_tr_vert_16x16,
+ has_tr_8x16, NULL, has_tr_vert_16x16,
// 16X32, 32X16, 32X32
- has_tr_16x32,
- NULL,
- has_tr_vert_32x32,
+ has_tr_16x32, NULL, has_tr_vert_32x32,
// 32X64, 64X32, 64X64
- has_tr_32x64,
- NULL,
- has_tr_vert_64x64,
+ has_tr_32x64, NULL, has_tr_vert_64x64,
// 64x128, 128x64, 128x128
- has_tr_64x128,
- NULL,
- has_tr_128x128
-#if CONFIG_BLOCK_256
- // 128X256, 256X128, 256X256,
- NULL,
- NULL,
- NULL,
-#endif // CONFIG_BLOCK_256
+ has_tr_64x128, NULL, has_tr_128x128
};
static const uint8_t *get_has_tr_table(PARTITION_TYPE partition,
@@ -515,7 +485,7 @@
static void init_intra_predictors_internal(void) {
assert(NELEMENTS(mode_to_angle_map) == INTRA_MODES);
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
#define INIT_RECTANGULAR(p, type) \
p[TX_4X8] = aom_##type##_predictor_4x8; \
p[TX_8X4] = aom_##type##_predictor_8x4; \
@@ -553,7 +523,7 @@
p[TX_32X8] = aom_##type##_predictor_32x8; \
p[TX_16X64] = aom_##type##_predictor_16x64; \
p[TX_64X16] = aom_##type##_predictor_64x16;
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#define INIT_NO_4X4(p, type) \
p[TX_8X8] = aom_##type##_predictor_8x8; \
diff --git a/av1/common/reconintra.h b/av1/common/reconintra.h
index ac9ceca..b066ede 100644
--- a/av1/common/reconintra.h
+++ b/av1/common/reconintra.h
@@ -428,9 +428,9 @@
TX_4X4, TX_8X8, TX_16X16, TX_32X32, TX_64X64, TX_8X4, TX_4X8,
TX_16X8, TX_8X16, TX_32X16, TX_16X32, TX_64X32, TX_32X64, TX_16X4,
TX_4X16, TX_32X8, TX_8X32, TX_64X16, TX_16X64,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
TX_32X4, TX_4X32, TX_64X8, TX_8X64, TX_64X4, TX_4X64,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#if CONFIG_EXT_RECUR_PARTITIONS
diff --git a/av1/common/scan.c b/av1/common/scan.c
index 758b32f..0024079 100644
--- a/av1/common/scan.c
+++ b/av1/common/scan.c
@@ -99,7 +99,7 @@
12, 28, 44, 60, 13, 29, 45, 61, 14, 30, 46, 62, 15, 31, 47, 63,
};
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
DECLARE_ALIGNED(16, static const int16_t, default_scan_4x32[128]) = {
0, 4, 1, 8, 5, 2, 12, 9, 6, 3, 16, 13, 10, 7, 20,
17, 14, 11, 24, 21, 18, 15, 28, 25, 22, 19, 32, 29, 26, 23,
@@ -168,7 +168,7 @@
24, 56, 88, 120, 25, 57, 89, 121, 26, 58, 90, 122, 27, 59, 91, 123,
28, 60, 92, 124, 29, 61, 93, 125, 30, 62, 94, 126, 31, 63, 95, 127,
};
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
DECLARE_ALIGNED(16, static const int16_t, default_scan_8x32[256]) = {
0, 8, 1, 16, 9, 2, 24, 17, 10, 3, 32, 25, 18, 11, 4,
@@ -989,7 +989,7 @@
3, 7, 11, 15, 19, 23, 27, 31, 35, 39, 43, 47, 51, 55, 59, 63,
};
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_4x32[128]) = {
0, 2, 5, 9, 1, 4, 8, 13, 3, 7, 12, 17, 6, 11, 16,
21, 10, 15, 20, 25, 14, 19, 24, 29, 18, 23, 28, 33, 22, 27,
@@ -1058,7 +1058,7 @@
3, 7, 11, 15, 19, 23, 27, 31, 35, 39, 43, 47, 51, 55, 59, 63,
67, 71, 75, 79, 83, 87, 91, 95, 99, 103, 107, 111, 115, 119, 123, 127,
};
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_8x32[256]) = {
0, 2, 5, 9, 14, 20, 27, 35, 1, 4, 8, 13, 19, 26, 34,
@@ -2182,7 +2182,7 @@
{ mrow_scan_32x16, av1_mrow_iscan_32x16 },
{ mcol_scan_32x16, av1_mcol_iscan_32x16 },
},
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{
// TX_4X32
{ default_scan_4x32, av1_default_iscan_4x32 },
@@ -2305,5 +2305,5 @@
{ mrow_scan_32x4, av1_mrow_iscan_32x4 },
{ mcol_scan_32x4, av1_mcol_iscan_32x4 },
},
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
diff --git a/av1/common/txb_common.c b/av1/common/txb_common.c
index 25f98be..852ed50 100644
--- a/av1/common/txb_common.c
+++ b/av1/common/txb_common.c
@@ -348,7 +348,7 @@
21, 21, 21, 21, 21, 21, 21, 21, 21,
};
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
const int8_t av1_nz_map_ctx_offset_4x32[128] = {
0, 11, 11, 11, 11, 11, 11, 11, 6, 6, 21, 21, 6, 21, 21, 21, 21, 21, 21,
21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
@@ -368,7 +368,7 @@
21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
};
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
const int8_t *av1_nz_map_ctx_offset[TX_SIZES_ALL] = {
av1_nz_map_ctx_offset_4x4, // TX_4x4
@@ -390,14 +390,14 @@
av1_nz_map_ctx_offset_32x8, // TX_32x8
av1_nz_map_ctx_offset_16x32, // TX_16x64
av1_nz_map_ctx_offset_64x32, // TX_64x16
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
av1_nz_map_ctx_offset_4x32, // TX_4x32
av1_nz_map_ctx_offset_32x4, // TX_32x4
av1_nz_map_ctx_offset_8x32, // TX_8x64
av1_nz_map_ctx_offset_32x8, // TX_64x8
av1_nz_map_ctx_offset_4x32, // TX_4x64
av1_nz_map_ctx_offset_32x4, // TX_64x4
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
const int16_t av1_eob_group_start[12] = { 0, 1, 2, 3, 5, 9,
diff --git a/av1/common/x86/av1_inv_txfm_ssse3.h b/av1/common/x86/av1_inv_txfm_ssse3.h
index c509393..dff1f0d 100644
--- a/av1/common/x86/av1_inv_txfm_ssse3.h
+++ b/av1/common/x86/av1_inv_txfm_ssse3.h
@@ -122,14 +122,14 @@
av1_eob_to_eobxy_32x8_default,
av1_eob_to_eobxy_16x32_default,
av1_eob_to_eobxy_32x16_default,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
NULL,
NULL,
av1_eob_to_eobxy_8x32_default,
av1_eob_to_eobxy_32x8_default,
NULL,
NULL,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static const int highbd_txfm_all_1d_zeros_idx[32] = {
@@ -140,9 +140,9 @@
// Transform block width in log2 for eob (size of 64 map to 32)
static const int tx_size_wide_log2_eob[TX_SIZES_ALL] = {
2, 3, 4, 5, 5, 2, 3, 3, 4, 4, 5, 5, 5, 2, 4, 3, 5, 4, 5,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
2, 5, 3, 5, 2, 5,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static INLINE void get_eobx_eoby_scan_default(int *eobx, int *eoby,
diff --git a/av1/common/x86/av1_txfm_sse2.h b/av1/common/x86/av1_txfm_sse2.h
index 38aaa68..f85f5e5 100644
--- a/av1/common/x86/av1_txfm_sse2.h
+++ b/av1/common/x86/av1_txfm_sse2.h
@@ -384,7 +384,7 @@
#endif // CONFIG_INTER_DDT
int bd);
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
void av1_lowbd_fwd_txfm2d_4x32_sse2(const int16_t *input, int32_t *output,
int stride, TX_TYPE tx_type,
#if CONFIG_INTER_DDT
@@ -426,7 +426,7 @@
int use_ddt,
#endif // CONFIG_INTER_DDT
int bd);
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
typedef void (*transform_1d_sse2)(const __m128i *input, __m128i *output,
int8_t cos_bit);
diff --git a/av1/common/x86/cfl_avx2.c b/av1/common/x86/cfl_avx2.c
index 0e3d2b3..861b849 100644
--- a/av1/common/x86/cfl_avx2.c
+++ b/av1/common/x86/cfl_avx2.c
@@ -17,7 +17,7 @@
#include "av1/common/x86/cfl_simd.h"
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
#define CFL_GET_SUBSAMPLE_FUNCTION_AVX2(sub, bd) \
CFL_SUBSAMPLE(avx2, sub, bd, 32, 32) \
CFL_SUBSAMPLE(avx2, sub, bd, 32, 16) \
@@ -84,7 +84,7 @@
}; \
return subfn_##sub[tx_size]; \
}
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
/**
* Adds 4 pixels (in a 2x2 grid) and multiplies them by 2. Resulting in a more
@@ -234,9 +234,9 @@
CFL_PREDICT_X(avx2, 32, 8, hbd)
CFL_PREDICT_X(avx2, 32, 16, hbd)
CFL_PREDICT_X(avx2, 32, 32, hbd)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
CFL_PREDICT_X(avx2, 32, 4, hbd)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
cfl_predict_hbd_fn cfl_get_predict_hbd_fn_avx2(TX_SIZE tx_size) {
static const cfl_predict_hbd_fn pred[TX_SIZES_ALL] = {
@@ -259,14 +259,14 @@
cfl_predict_hbd_32x8_avx2, /* 32x8 */
NULL, /* 16x64 (invalid CFL size) */
NULL, /* 64x16 (invalid CFL size) */
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
cfl_predict_hbd_4x32_ssse3, /* 4x32 */
cfl_predict_hbd_32x4_avx2, /* 32x4 */
NULL, /* 8x64 (invalid CFL size) */
NULL, /* 64x8 (invalid CFL size) */
NULL, /* 4x64 (invalid CFL size) */
NULL, /* 64x4 (invalid CFL size) */
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
// Modulo TX_SIZES_ALL to ensure that an attacker won't be able to index the
// function pointer array out of bounds.
@@ -360,9 +360,9 @@
CFL_SUB_AVG_X(avx2, 32, 8, 128, 8)
CFL_SUB_AVG_X(avx2, 32, 16, 256, 9)
CFL_SUB_AVG_X(avx2, 32, 32, 512, 10)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
CFL_SUB_AVG_X(avx2, 32, 4, 64, 7)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// Based on the observation that for small blocks AVX2 does not outperform
// SSE2, we call the SSE2 code for block widths 4 and 8.
@@ -387,14 +387,14 @@
cfl_subtract_average_32x8_avx2, /* 32x8 */
NULL, /* 16x64 (invalid CFL size) */
NULL, /* 64x16 (invalid CFL size) */
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
cfl_subtract_average_4x32_sse2, /* 4x32 */
cfl_subtract_average_32x4_avx2, /* 32x4 */
NULL, /* 8x64 (invalid CFL size) */
NULL, /* 64x8 (invalid CFL size) */
NULL, /* 4x64 (invalid CFL size) */
NULL, /* 64x4 (invalid CFL size) */
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
// Modulo TX_SIZES_ALL to ensure that an attacker won't be able to
// index the function pointer array out of bounds.
diff --git a/av1/common/x86/cfl_simd.h b/av1/common/x86/cfl_simd.h
index ed98b8b..0914aea 100644
--- a/av1/common/x86/cfl_simd.h
+++ b/av1/common/x86/cfl_simd.h
@@ -21,10 +21,10 @@
uint16_t *output_q3);
void cfl_subsample_hbd_420_4x16_ssse3(const uint16_t *cfl_type,
int input_stride, uint16_t *output_q3);
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
void cfl_subsample_hbd_420_4x32_ssse3(const uint16_t *cfl_type,
int input_stride, uint16_t *output_q3);
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// SSSE3 version is optimal for with == 8, we reuse it in AVX2
void cfl_subsample_hbd_420_8x4_ssse3(const uint16_t *cfl_type, int input_stride,
@@ -52,10 +52,10 @@
uint16_t *output_q3);
void cfl_subsample_hbd_422_4x16_ssse3(const uint16_t *cfl_type,
int input_stride, uint16_t *output_q3);
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
void cfl_subsample_hbd_422_4x32_ssse3(const uint16_t *cfl_type,
int input_stride, uint16_t *output_q3);
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// SSSE3 version is optimal for with == 8, we reuse it in AVX2
void cfl_subsample_hbd_422_8x4_ssse3(const uint16_t *cfl_type, int input_stride,
@@ -83,10 +83,10 @@
uint16_t *output_q3);
void cfl_subsample_hbd_444_4x16_ssse3(const uint16_t *cfl_type,
int input_stride, uint16_t *output_q3);
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
void cfl_subsample_hbd_444_4x32_ssse3(const uint16_t *cfl_type,
int input_stride, uint16_t *output_q3);
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// SSSE3 version is optimal for with == 8, we reuse it in AVX2
void cfl_subsample_hbd_444_8x4_ssse3(const uint16_t *cfl_type, int input_stride,
@@ -112,9 +112,9 @@
void cfl_subtract_average_4x4_sse2(const uint16_t *src, int16_t *dst);
void cfl_subtract_average_4x8_sse2(const uint16_t *src, int16_t *dst);
void cfl_subtract_average_4x16_sse2(const uint16_t *src, int16_t *dst);
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
void cfl_subtract_average_4x32_sse2(const uint16_t *src, int16_t *dst);
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// SSE2 version is optimal for with == 8, we reuse them in AVX2
void cfl_subtract_average_8x4_sse2(const uint16_t *src, int16_t *dst);
@@ -128,10 +128,10 @@
int dst_stride, int alpha_q3, int bd);
void cfl_predict_hbd_4x16_ssse3(const int16_t *pred_buf_q3, uint16_t *dst,
int dst_stride, int alpha_q3, int bd);
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
void cfl_predict_hbd_4x32_ssse3(const int16_t *pred_buf_q3, uint16_t *dst,
int dst_stride, int alpha_q3, int bd);
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
void cfl_predict_hbd_8x4_ssse3(const int16_t *pred_buf_q3, uint16_t *dst,
int dst_stride, int alpha_q3, int bd);
diff --git a/av1/common/x86/highbd_inv_txfm_avx2.c b/av1/common/x86/highbd_inv_txfm_avx2.c
index 94640cb..1b23c9a 100644
--- a/av1/common/x86/highbd_inv_txfm_avx2.c
+++ b/av1/common/x86/highbd_inv_txfm_avx2.c
@@ -4458,7 +4458,7 @@
case TX_4X16:
av1_highbd_inv_txfm_add_4x16_sse4_1(input, dest, stride, txfm_param);
break;
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
case TX_4X32:
av1_highbd_inv_txfm_add_4x32_sse4_1(input, dest, stride, txfm_param);
break;
@@ -4471,7 +4471,7 @@
case TX_64X4:
av1_highbd_inv_txfm_add_64x4_sse4_1(input, dest, stride, txfm_param);
break;
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
default:
av1_highbd_inv_txfm2d_add_universe_avx2(
input, dest, stride, txfm_param->tx_type, txfm_param->tx_size,
diff --git a/av1/common/x86/highbd_inv_txfm_sse4.c b/av1/common/x86/highbd_inv_txfm_sse4.c
index 54cd9f3..5640f96 100644
--- a/av1/common/x86/highbd_inv_txfm_sse4.c
+++ b/av1/common/x86/highbd_inv_txfm_sse4.c
@@ -5635,11 +5635,11 @@
{ idct32x32_low1_sse4_1, idct32x32_low8_sse4_1,
idct32x32_low16_sse4_1, idct32x32_sse4_1 },
{ NULL, NULL, NULL, NULL },
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ iidentity32_sse4_1, NULL, NULL, iidentity32_sse4_1 },
#else
{ iidentity32_sse4_1, NULL, NULL, NULL },
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{
{ idct64x64_low1_sse4_1, idct64x64_low8_sse4_1,
@@ -5672,11 +5672,11 @@
{ idct32x32_low1_sse4_1, idct32x32_low8_sse4_1,
idct32x32_low16_sse4_1, idct32x32_sse4_1 },
{ NULL, NULL, NULL, NULL },
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{ iidentity32_sse4_1, NULL, NULL, iidentity32_sse4_1 },
#else
{ iidentity32_sse4_1, NULL, NULL, NULL },
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{
{ idct64x64_low1_sse4_1, idct64x64_low8_sse4_1,
@@ -6316,7 +6316,7 @@
}
}
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
static void highbd_inv_txfm2d_add_4x32_sse4_1(const int32_t *input,
uint16_t *output, int stride,
TX_TYPE tx_type, TX_SIZE tx_size,
@@ -6549,7 +6549,7 @@
txfm_size_row, bd);
}
}
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
void av1_highbd_inv_txfm2d_add_universe_sse4_1(const int32_t *input,
uint16_t *output, int stride,
@@ -6659,7 +6659,7 @@
eob, bd);
}
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
void av1_highbd_inv_txfm_add_4x32_sse4_1(const tran_low_t *input,
uint16_t *dest, int stride,
const TxfmParam *txfm_param) {
@@ -6703,7 +6703,7 @@
highbd_inv_txfm2d_add_64x4_sse4_1(input, dest, stride, tx_type, tx_size, eob,
bd);
}
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
void av1_highbd_inv_txfm_add_sse4_1(const tran_low_t *input, uint16_t *dest,
int stride, const TxfmParam *txfm_param) {
@@ -6728,7 +6728,7 @@
case TX_4X16:
av1_highbd_inv_txfm_add_4x16_sse4_1(input, dest, stride, txfm_param);
break;
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
case TX_4X32:
av1_highbd_inv_txfm_add_4x32_sse4_1(input, dest, stride, txfm_param);
break;
@@ -6741,7 +6741,7 @@
case TX_64X4:
av1_highbd_inv_txfm_add_64x4_sse4_1(input, dest, stride, txfm_param);
break;
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
default:
av1_highbd_inv_txfm2d_add_universe_sse4_1(
input, dest, stride, txfm_param->tx_type, tx_size,
diff --git a/av1/common/x86/reconinter_avx2.c b/av1/common/x86/reconinter_avx2.c
index e342787..3e76f44 100644
--- a/av1/common/x86/reconinter_avx2.c
+++ b/av1/common/x86/reconinter_avx2.c
@@ -213,7 +213,7 @@
i += 1;
} while (i < h);
} else {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
assert(w == 256);
do {
const CONV_BUF_TYPE *src0_ptr = src0;
@@ -269,7 +269,7 @@
} while (i < h);
#else
assert(0);
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
}
}
@@ -433,7 +433,7 @@
i += 1;
} while (i < h);
} else {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
assert(w == 256);
do {
const CONV_BUF_TYPE *src0_ptr = src0;
@@ -489,7 +489,7 @@
} while (i < h);
#else
assert(0);
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
}
}
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index b4fbb16..83921ea 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -2199,7 +2199,6 @@
if (!do_split) {
return PARTITION_NONE;
}
-#if CONFIG_BLOCK_256
const int square_split_ctx = square_split_context(xd, mi_row, mi_col, bsize);
if (is_square_split_eligible(bsize, cm->sb_size)) {
const bool do_square_split =
@@ -2209,7 +2208,6 @@
return PARTITION_SPLIT;
}
}
-#endif // CONFIG_BLOCK_256
RECT_PART_TYPE rect_type = rect_type_implied_by_bsize(bsize, xd->tree_type);
if (rect_type == RECT_INVALID) {
@@ -4020,7 +4018,7 @@
static AOM_INLINE void setup_seq_sb_size(SequenceHeader *seq_params,
struct aom_read_bit_buffer *rb) {
static const BLOCK_SIZE sb_sizes[] = {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
BLOCK_256X256,
#endif
BLOCK_128X128,
@@ -4030,7 +4028,7 @@
bool bit = aom_rb_read_bit(rb);
if (!bit) {
index++;
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
bit = aom_rb_read_bit(rb);
if (!bit) {
index++;
diff --git a/av1/decoder/decoder.h b/av1/decoder/decoder.h
index b100eb2..898c932 100644
--- a/av1/decoder/decoder.h
+++ b/av1/decoder/decoder.h
@@ -73,11 +73,11 @@
* cb_offset[p] is the offset into the dqcoeff_block[p] for the current coding
* block, for each plane 'p'.
*/
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
uint32_t cb_offset[MAX_MB_PLANE];
#else
uint16_t cb_offset[MAX_MB_PLANE];
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
/*!
* Pointer to 'eob_data' inside 'td->cb_buffer_base' or 'pbi->cb_buffer_base'
* with appropriate offset for the current superblock, for each plane.
diff --git a/av1/encoder/av1_fwd_txfm2d.c b/av1/encoder/av1_fwd_txfm2d.c
index 562458b..7d0bf04 100644
--- a/av1/encoder/av1_fwd_txfm2d.c
+++ b/av1/encoder/av1_fwd_txfm2d.c
@@ -485,7 +485,7 @@
}
}
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
void av1_fwd_txfm2d_4x32_c(const int16_t *input, int32_t *output, int stride,
TX_TYPE tx_type,
#if CONFIG_INTER_DDT
@@ -603,7 +603,7 @@
memcpy(output + row * 32, output + row * 64, 32 * sizeof(*output));
}
}
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
static const int8_t fwd_shift_4x4[3] = { 2, 0, 0 };
static const int8_t fwd_shift_8x8[3] = { 2, -1, 0 };
@@ -624,14 +624,14 @@
static const int8_t fwd_shift_32x8[3] = { 2, -2, 0 };
static const int8_t fwd_shift_16x64[3] = { 0, -2, 0 };
static const int8_t fwd_shift_64x16[3] = { 2, -4, 0 };
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
static const int8_t fwd_shift_4x32[3] = { 2, -2, 0 };
static const int8_t fwd_shift_32x4[3] = { 2, -2, 0 };
static const int8_t fwd_shift_8x64[3] = { 0, -2, 0 };
static const int8_t fwd_shift_64x8[3] = { 2, -4, 0 };
static const int8_t fwd_shift_4x64[3] = { 0, 0, 0 };
static const int8_t fwd_shift_64x4[3] = { 2, -2, 0 };
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
const int8_t *av1_fwd_txfm_shift_ls[TX_SIZES_ALL] = {
fwd_shift_4x4, fwd_shift_8x8, fwd_shift_16x16, fwd_shift_32x32,
@@ -639,10 +639,10 @@
fwd_shift_16x8, fwd_shift_16x32, fwd_shift_32x16, fwd_shift_32x64,
fwd_shift_64x32, fwd_shift_4x16, fwd_shift_16x4, fwd_shift_8x32,
fwd_shift_32x8, fwd_shift_16x64, fwd_shift_64x16,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
fwd_shift_4x32, fwd_shift_32x4, fwd_shift_8x64, fwd_shift_64x8,
fwd_shift_4x64, fwd_shift_64x4,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
const int8_t av1_fwd_cos_bit_col[MAX_TXWH_IDX /*txw_idx*/]
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 28bf43e..2b30928 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3603,7 +3603,6 @@
if (!do_split) {
return;
}
-#if CONFIG_BLOCK_256
const bool do_square_split = p == PARTITION_SPLIT;
if (is_square_split_eligible(bsize, cm->sb_size)) {
const int square_split_ctx =
@@ -3615,7 +3614,6 @@
assert(p == PARTITION_SPLIT);
return;
}
-#endif // CONFIG_BLOCK_256
RECT_PART_TYPE rect_type = get_rect_part_type(p);
if (rect_type_implied_by_bsize(bsize, xd->tree_type) == RECT_INVALID) {
aom_write_symbol(w, rect_type, ec_ctx->rect_type_cdf[plane][rect_type_ctx],
@@ -3924,7 +3922,6 @@
this_mi_col, this_bsize);
}
break;
-#if CONFIG_BLOCK_256
case PARTITION_SPLIT:
write_modes_sb(cpi, tile, w, tok, tok_end, ptree->sub_tree[0],
get_partition_subtree_const(ptree_luma, 0), mi_row, mi_col,
@@ -3939,7 +3936,6 @@
get_partition_subtree_const(ptree_luma, 3), mi_row + hbs_h,
mi_col + hbs_w, subsize);
break;
-#endif // CONFIG_BLOCK_256
#else // CONFIG_EXT_RECUR_PARTITIONS
case PARTITION_SPLIT:
write_modes_sb(cpi, tile, w, tok, tok_end, ptree->sub_tree[0], mi_row,
@@ -5467,7 +5463,7 @@
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_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
assert(seq_params->sb_size == BLOCK_256X256 ||
seq_params->sb_size == BLOCK_128X128 ||
seq_params->sb_size == BLOCK_64X64);
@@ -5479,7 +5475,7 @@
#else
assert(seq_params->sb_size == BLOCK_128X128 ||
seq_params->sb_size == BLOCK_64X64);
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
aom_wb_write_bit(wb, seq_params->sb_size == BLOCK_128X128);
}
diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index 0a2c143..907c40b 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -579,7 +579,6 @@
} SimpleMotionData;
/*!\cond */
-#if CONFIG_BLOCK_256
#define BLOCK_256_COUNT 1
#define BLOCK_128_COUNT 3
#define BLOCK_64_COUNT 7
@@ -587,14 +586,6 @@
#define BLOCK_16_COUNT 63
#define BLOCK_8_COUNT 64
#define BLOCK_4_COUNT 64
-#else
-#define BLOCK_128_COUNT 1
-#define BLOCK_64_COUNT 3
-#define BLOCK_32_COUNT 15
-#define BLOCK_16_COUNT 31
-#define BLOCK_8_COUNT 32
-#define BLOCK_4_COUNT 32
-#endif // CONFIG_BLOCK_256
#define MAKE_SM_DATA_BUF(width, height) \
SimpleMotionData \
@@ -606,9 +597,7 @@
typedef struct SimpleMotionDataBufs {
/*!\cond */
// Square blocks
-#if CONFIG_BLOCK_256
MAKE_SM_DATA_BUF(256, 256);
-#endif // CONFIG_BLOCK_256
MAKE_SM_DATA_BUF(128, 128);
MAKE_SM_DATA_BUF(64, 64);
MAKE_SM_DATA_BUF(32, 32);
@@ -617,9 +606,7 @@
MAKE_SM_DATA_BUF(4, 4);
// 1:2 blocks
-#if CONFIG_BLOCK_256
MAKE_SM_DATA_BUF(128, 256);
-#endif // CONFIG_BLOCK_256
MAKE_SM_DATA_BUF(64, 128);
MAKE_SM_DATA_BUF(32, 64);
MAKE_SM_DATA_BUF(16, 32);
@@ -627,9 +614,7 @@
MAKE_SM_DATA_BUF(4, 8);
// 2:1 blocks
-#if CONFIG_BLOCK_256
MAKE_SM_DATA_BUF(256, 128);
-#endif // CONFIG_BLOCK_256
MAKE_SM_DATA_BUF(128, 64);
MAKE_SM_DATA_BUF(64, 32);
MAKE_SM_DATA_BUF(32, 16);
@@ -646,7 +631,6 @@
MAKE_SM_DATA_BUF(32, 8);
MAKE_SM_DATA_BUF(16, 4);
-#if CONFIG_FLEX_PARTITION
// 1:8 blocks
MAKE_SM_DATA_BUF(8, 64);
MAKE_SM_DATA_BUF(4, 32);
@@ -660,7 +644,6 @@
// 16:1 blocks
MAKE_SM_DATA_BUF(64, 4);
-#endif // CONFIG_FLEX_PARTITION
/*!\endcond */
} SimpleMotionDataBufs;
@@ -863,10 +846,8 @@
#if CONFIG_EXT_RECUR_PARTITIONS
/*! Cost for sending split token. */
int do_split_cost[PARTITION_STRUCTURE_NUM][PARTITION_CONTEXTS][2];
-#if CONFIG_BLOCK_256
/*! Cost for sending square split token. */
int do_square_split_cost[PARTITION_STRUCTURE_NUM][SQUARE_SPLIT_CONTEXTS][2];
-#endif // CONFIG_BLOCK_256
/*! Cost for sending rectangular type token. */
int rect_type_cost[PARTITION_STRUCTURE_NUM][PARTITION_CONTEXTS][2];
/*! Cost for sending do_ext_partition token. */
@@ -1893,11 +1874,11 @@
1, // BLOCK_64X128
1, // BLOCK_128X64
1, // BLOCK_128X128
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
1, // BLOCK_128X256
1, // BLOCK_256X128
1, // BLOCK_256X256
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
1, // BLOCK_4X16
1, // BLOCK_16X4
1, // BLOCK_8X32
@@ -1921,11 +1902,11 @@
0, // BLOCK_64X128
0, // BLOCK_128X64
0, // BLOCK_128X128
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
0, // BLOCK_128X256
0, // BLOCK_256X128
0, // BLOCK_256X256
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
1, // BLOCK_4X16
1, // BLOCK_16X4
1, // BLOCK_8X32
@@ -1933,14 +1914,14 @@
1, // BLOCK_16X64
1, // BLOCK_64X16
#endif // CONFIG_NEW_TX_PARTITION
-#if CONFIG_EXT_RECUR_PARTITIONS && CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
1, // BLOCK_4X32
1, // BLOCK_32X4
1, // BLOCK_8X64
1, // BLOCK_64X8
1, // BLOCK_4X64
1, // BLOCK_64X4
-#endif // CONFIG_EXT_RECUR_PARTITIONS && CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
return LUT[bsize];
diff --git a/av1/encoder/compound_type.c b/av1/encoder/compound_type.c
index cb98f0c..4fe9d36 100644
--- a/av1/encoder/compound_type.c
+++ b/av1/encoder/compound_type.c
@@ -141,20 +141,20 @@
BLOCK_16X32, BLOCK_32X16, BLOCK_32X32,
// 64x128, 128x64, 128x128
BLOCK_32X64, BLOCK_64X32, BLOCK_64X64,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
// 128X256, 256X128, 256X256
BLOCK_64X128, BLOCK_128X64, BLOCK_128X128,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// 4X16, 16X4, 8X32
BLOCK_INVALID, BLOCK_INVALID, BLOCK_4X16,
// 32X8, 16X64, 64X16
BLOCK_16X4, BLOCK_8X32, BLOCK_32X8,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
// 32X4, 4X32, 64X8
BLOCK_INVALID, BLOCK_INVALID, BLOCK_32X4,
// 8x64, 4X64, 64X4
BLOCK_4X32, BLOCK_INVALID, BLOCK_INVALID,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
/* clang-format on */
const struct macroblock_plane *const p = &x->plane[0];
diff --git a/av1/encoder/context_tree.c b/av1/encoder/context_tree.c
index 032142c..9ebf35d 100644
--- a/av1/encoder/context_tree.c
+++ b/av1/encoder/context_tree.c
@@ -18,9 +18,9 @@
static const BLOCK_SIZE square[MAX_SB_SIZE_LOG2 - 1] = {
BLOCK_4X4, BLOCK_8X8, BLOCK_16X16,
BLOCK_32X32, BLOCK_64X64, BLOCK_128X128,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
BLOCK_256X256,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
void av1_copy_tree_context(PICK_MODE_CONTEXT *dst_ctx,
@@ -169,12 +169,12 @@
ctx->coeff[i] = shared_bufs->coeff_buf[i];
ctx->qcoeff[i] = shared_bufs->qcoeff_buf[i];
ctx->dqcoeff[i] = shared_bufs->dqcoeff_buf[i];
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
const int num_blk_plane =
(i == 0) ? ctx->num_4x4_blk : ctx->num_4x4_blk_chroma;
#else
const int num_blk_plane = ctx->num_4x4_blk;
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
AOM_CHECK_MEM_ERROR(&error, ctx->blk_skip[i],
aom_calloc(num_blk_plane, sizeof(*ctx->blk_skip[i])));
AOM_CHECK_MEM_ERROR(
@@ -1090,13 +1090,13 @@
static AOM_INLINE int get_pc_tree_nodes(const BLOCK_SIZE sb_size,
int stat_generation_stage) {
const int is_sb_size_128 = sb_size == BLOCK_128X128;
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
const int is_sb_size_256 = sb_size == BLOCK_256X256;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
const int tree_nodes_inc =
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
is_sb_size_256 ? (1024 + 4 * 1024) :
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
is_sb_size_128 ? 1024
: 0;
const int tree_nodes =
@@ -1108,9 +1108,9 @@
AV1_COMMON *const cm = &cpi->common;
const int stat_generation_stage = is_stat_generation_stage(cpi);
const int is_sb_size_128 = cm->sb_size == BLOCK_128X128;
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
const int is_sb_size_256 = cm->sb_size == BLOCK_256X256;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
const int tree_nodes = get_pc_tree_nodes(cm->sb_size, stat_generation_stage);
int sms_tree_index = 0;
SIMPLE_MOTION_DATA_TREE *this_sms;
@@ -1124,9 +1124,9 @@
if (!stat_generation_stage) {
const int leaf_factor =
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
is_sb_size_256 ? 16 :
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
is_sb_size_128 ? 4
: 1;
diff --git a/av1/encoder/encodeframe_utils.c b/av1/encoder/encodeframe_utils.c
index b95df0a..f2aaae0 100644
--- a/av1/encoder/encodeframe_utils.c
+++ b/av1/encoder/encodeframe_utils.c
@@ -1709,7 +1709,7 @@
ctx_tr->do_split_cdf[plane_index][i], 2);
}
}
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
for (int plane_index = 0; plane_index < PARTITION_STRUCTURE_NUM;
plane_index++) {
for (int i = 0; i < SQUARE_SPLIT_CONTEXTS; i++) {
@@ -1717,7 +1717,7 @@
ctx_tr->do_square_split_cdf[plane_index][i], 2);
}
}
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
for (int plane_index = 0; plane_index < PARTITION_STRUCTURE_NUM;
plane_index++) {
for (int i = 0; i < PARTITION_CONTEXTS; i++) {
diff --git a/av1/encoder/encodeframe_utils.h b/av1/encoder/encodeframe_utils.h
index 452b55a..1bf1d7c 100644
--- a/av1/encoder/encodeframe_utils.h
+++ b/av1/encoder/encodeframe_utils.h
@@ -354,9 +354,9 @@
case 32: return BLOCK_32X32;
case 64: return BLOCK_64X64;
case 128: return BLOCK_128X128;
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
case 256: return BLOCK_256X256;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
default: assert(0); return 0;
}
}
diff --git a/av1/encoder/encodemb.h b/av1/encoder/encodemb.h
index 3095858..f6ab77e 100644
--- a/av1/encoder/encodemb.h
+++ b/av1/encoder/encodemb.h
@@ -212,9 +212,9 @@
static const uint16_t dc_coeff_scale[TX_SIZES_ALL] = {
1024, 2048, 4096, 4096, 0, 1448, 1448, 2896, 2896, 2896,
2896, 0, 0, 2048, 2048, 4096, 4096, 0, 0,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
2896, 2896, 0, 0, 0, 0,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#ifdef __cplusplus
diff --git a/av1/encoder/encoder_utils.c b/av1/encoder/encoder_utils.c
index 65bd36a..2ce4368 100644
--- a/av1/encoder/encoder_utils.c
+++ b/av1/encoder/encoder_utils.c
@@ -170,7 +170,7 @@
};
/* clang-format off */
-// TODO(urvang): update for CONFIG_FLEX_PARTITION. Used for speed >= 1.
+// TODO(urvang): update for CONFIG_EXT_RECUR_PARTITIONS. Used for speed >= 1.
const int default_obmc_probs[FRAME_UPDATE_TYPES][BLOCK_SIZES_ALL] = { {
// BLOCK_4X4
0,
@@ -184,10 +184,10 @@
0, 0, 0,
// BLOCK_64X128 .. BLOCK_128X128
0, 0, 0,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
// BLOCK_128X256 .. BLOCK_256X256
0, 0, 0,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// BLOCK_4X16, BLOCK_16X4
0, 0,
// BLOCK_8X32, BLOCK_32X8
@@ -207,10 +207,10 @@
28, 30, 38,
// BLOCK_64X128 .. BLOCK_128X128
16, 16, 16,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
// BLOCK_128X256 .. BLOCK_256X256
16, 16, 16,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// BLOCK_4X16, BLOCK_16X4
0, 0,
// BLOCK_8X32, BLOCK_32X8
@@ -230,10 +230,10 @@
0, 0, 0,
// BLOCK_64X128 .. BLOCK_128X128
0, 0, 0,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
// BLOCK_128X256 .. BLOCK_256X256
0, 0, 0,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// BLOCK_4X16, BLOCK_16X4
0, 0,
// BLOCK_8X32, BLOCK_32X8
@@ -253,10 +253,10 @@
30, 33, 16,
// BLOCK_64X128 .. BLOCK_128X128
16, 16, 16,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
// BLOCK_128X256 .. BLOCK_256X256
16, 16, 16,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// BLOCK_4X16, BLOCK_16X4
0, 0,
// BLOCK_8X32, BLOCK_32X8
@@ -277,9 +277,9 @@
// BLOCK_64X128 .. BLOCK_128X128
16, 16, 16,
// BLOCK_128X256 .. BLOCK_256X256
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
16, 16, 16,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// BLOCK_4X16, BLOCK_16X4
0, 0,
// BLOCK_8X32, BLOCK_32X8
@@ -299,10 +299,10 @@
0, 0, 0,
// BLOCK_64X128 .. BLOCK_128X128
0, 0, 0,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
// BLOCK_128X256 .. BLOCK_256X256
0, 0, 0,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// BLOCK_4X16, BLOCK_16X4
0, 0,
// BLOCK_8X32, BLOCK_32X8
@@ -322,10 +322,10 @@
34, 35, 32,
// BLOCK_64X128 .. BLOCK_128X128
19, 16, 16,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
// BLOCK_128X256 .. BLOCK_256X256
19, 16, 16,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// BLOCK_4X16, BLOCK_16X4
0, 0,
// BLOCK_8X32, BLOCK_32X8
@@ -756,13 +756,13 @@
oxcf->resize_cfg.resize_mode == RESIZE_NONE && oxcf->speed > 1) {
return AOMMIN(cm->width, cm->height) > 480 ? BLOCK_128X128 : BLOCK_64X64;
}
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
return AOMMIN(oxcf->frm_dim_cfg.width, oxcf->frm_dim_cfg.height) >= 720
? BLOCK_256X256
: BLOCK_128X128;
#else
return BLOCK_128X128;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
}
static AOM_INLINE void reallocate_sb_size_dependent_buffers(AV1_COMP *cpi) {
diff --git a/av1/encoder/encoder_utils.h b/av1/encoder/encoder_utils.h
index 246ae21..7944bd3 100644
--- a/av1/encoder/encoder_utils.h
+++ b/av1/encoder/encoder_utils.h
@@ -240,7 +240,7 @@
4; \
}
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
MAKE_BFP_SAD_WRAPPER(aom_highbd_sad256x256)
MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad256x256_avg)
MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad256x256x4d)
@@ -252,7 +252,7 @@
MAKE_BFP_SAD_WRAPPER(aom_highbd_sad128x256)
MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad128x256_avg)
MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad128x256x4d)
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
MAKE_BFP_SAD_WRAPPER(aom_highbd_sad128x128)
MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad128x128_avg)
MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad128x128x4d)
@@ -321,7 +321,7 @@
MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad64x16_avg)
MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad64x16x4d)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
MAKE_BFP_SAD_WRAPPER(aom_highbd_sad64x8)
MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad64x8_avg)
MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad64x8x4d)
@@ -342,13 +342,11 @@
MAKE_BFP_SAD_WRAPPER(aom_highbd_sad4x32)
MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad4x32_avg)
MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad4x32x4d)
-#endif // CONFIG_FLEX_PARTITION
-#if CONFIG_BLOCK_256
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad256x256_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad256x128_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad128x256_avg)
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad128x128_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad128x64_avg)
@@ -372,14 +370,14 @@
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad32x8_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad16x64_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad64x16_avg)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad8x64_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad64x8_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad4x64_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad64x4_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad4x32_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_dist_wtd_sad32x4_avg)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#define HIGHBD_MBFP(BT, MCSDF, MCSVF) \
cpi->fn_ptr[BT].msdf = MCSDF; \
@@ -415,11 +413,11 @@
4; \
}
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad256x256)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad256x128)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad128x256)
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
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)
@@ -442,14 +440,14 @@
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_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad8x64)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad64x8)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad4x64)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad64x4)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad4x32)
MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad32x4)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#define HIGHBD_SDSFP(BT, SDSF, SDSX4DF) \
cpi->fn_ptr[BT].sdsf = SDSF; \
@@ -495,11 +493,11 @@
for (i = 0; i < 4; i++) sad_array[i] >>= 4; \
}
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_256x256)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_256x128)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_128x256)
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_128x128)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_128x64)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_64x128)
@@ -519,20 +517,18 @@
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_4x16)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_4x8)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_8x32)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_8x64)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_64x8)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_4x64)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_64x4)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_4x32)
MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_32x4)
-#endif // CONFIG_FLEX_PARTITION
-#if CONFIG_BLOCK_256
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_256x256x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_256x128x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_128x256x4d)
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_128x128x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_128x64x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_64x128x4d)
@@ -552,14 +548,14 @@
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_4x16x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_4x8x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_8x32x4d)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_8x64x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_64x8x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_4x64x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_64x4x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_4x32x4d)
MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_32x4x4d)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#define HIGHBD_OBFP(BT, OSDF, OVF, OSVF) \
cpi->fn_ptr[BT].osdf = OSDF; \
@@ -595,11 +591,11 @@
return fnname(ref, ref_stride, wsrc, msk) >> 4; \
}
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad256x256)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad256x128)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad128x256)
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad128x128)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad128x64)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad64x128)
@@ -622,14 +618,14 @@
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_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad8x64)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad64x8)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad4x64)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad64x4)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad4x32)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad32x4)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
static AOM_INLINE void highbd_set_var_fns(AV1_COMP *const cpi) {
AV1_COMMON *const cm = &cpi->common;
@@ -657,15 +653,13 @@
HIGHBD_BFP_WRAPPER(128, 128, 8)
HIGHBD_BFP_WRAPPER(128, 64, 8)
HIGHBD_BFP_WRAPPER(64, 128, 8)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_BFP_WRAPPER(64, 8, 8)
HIGHBD_BFP_WRAPPER(8, 64, 8)
HIGHBD_BFP_WRAPPER(32, 4, 8)
HIGHBD_BFP_WRAPPER(4, 32, 8)
HIGHBD_BFP_WRAPPER(64, 4, 8)
HIGHBD_BFP_WRAPPER(4, 64, 8)
-#endif // CONFIG_FLEX_PARTITION
-#if CONFIG_BLOCK_256
HIGHBD_BFP_WRAPPER(128, 256, 8)
HIGHBD_BFP_WRAPPER(256, 128, 8)
HIGHBD_BFP_WRAPPER(256, 256, 8)
@@ -673,7 +667,7 @@
HIGHBD_MBFP_WRAPPER(256, 256, 8)
HIGHBD_MBFP_WRAPPER(256, 128, 8)
HIGHBD_MBFP_WRAPPER(128, 256, 8)
-#endif // CONFIG_BLOCK_128
+#endif // CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_MBFP_WRAPPER(128, 128, 8)
HIGHBD_MBFP_WRAPPER(128, 64, 8)
HIGHBD_MBFP_WRAPPER(64, 128, 8)
@@ -696,20 +690,18 @@
HIGHBD_MBFP_WRAPPER(8, 32, 8)
HIGHBD_MBFP_WRAPPER(16, 4, 8)
HIGHBD_MBFP_WRAPPER(4, 16, 8)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_MBFP_WRAPPER(64, 8, 8)
HIGHBD_MBFP_WRAPPER(8, 64, 8)
HIGHBD_MBFP_WRAPPER(32, 4, 8)
HIGHBD_MBFP_WRAPPER(4, 32, 8)
HIGHBD_MBFP_WRAPPER(64, 4, 8)
HIGHBD_MBFP_WRAPPER(4, 64, 8)
-#endif // CONFIG_FLEX_PARTITION
-#if CONFIG_BLOCK_256
LOWBD_OBFP_WRAPPER(256, 256)
LOWBD_OBFP_WRAPPER(256, 128)
LOWBD_OBFP_WRAPPER(128, 256)
-#endif // CONFIG_BLOCK_128
+#endif // CONFIG_EXT_RECUR_PARTITIONS
LOWBD_OBFP_WRAPPER(128, 128)
LOWBD_OBFP_WRAPPER(128, 64)
LOWBD_OBFP_WRAPPER(64, 128)
@@ -732,20 +724,18 @@
LOWBD_OBFP_WRAPPER(8, 32)
LOWBD_OBFP_WRAPPER(16, 4)
LOWBD_OBFP_WRAPPER(4, 16)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
LOWBD_OBFP_WRAPPER(64, 8)
LOWBD_OBFP_WRAPPER(8, 64)
LOWBD_OBFP_WRAPPER(32, 4)
LOWBD_OBFP_WRAPPER(4, 32)
LOWBD_OBFP_WRAPPER(64, 4)
LOWBD_OBFP_WRAPPER(4, 64)
-#endif // CONFIG_FLEX_PARTITION
-#if CONFIG_BLOCK_256
HIGHBD_SDSFP_WRAPPER(256, 256, 8)
HIGHBD_SDSFP_WRAPPER(256, 128, 8)
HIGHBD_SDSFP_WRAPPER(128, 256, 8)
-#endif // CONFIG_BLOCK_128
+#endif // CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_SDSFP_WRAPPER(128, 128, 8);
HIGHBD_SDSFP_WRAPPER(128, 64, 8);
HIGHBD_SDSFP_WRAPPER(64, 128, 8);
@@ -765,14 +755,14 @@
HIGHBD_SDSFP_WRAPPER(4, 16, 8);
HIGHBD_SDSFP_WRAPPER(4, 8, 8);
HIGHBD_SDSFP_WRAPPER(8, 32, 8);
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_SDSFP_WRAPPER(64, 8, 8)
HIGHBD_SDSFP_WRAPPER(8, 64, 8)
HIGHBD_SDSFP_WRAPPER(32, 4, 8)
HIGHBD_SDSFP_WRAPPER(4, 32, 8)
HIGHBD_SDSFP_WRAPPER(64, 4, 8)
HIGHBD_SDSFP_WRAPPER(4, 64, 8)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
break;
case AOM_BITS_10:
@@ -798,15 +788,13 @@
HIGHBD_BFP_WRAPPER(128, 128, 10)
HIGHBD_BFP_WRAPPER(128, 64, 10)
HIGHBD_BFP_WRAPPER(64, 128, 10)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_BFP_WRAPPER(64, 8, 10)
HIGHBD_BFP_WRAPPER(8, 64, 10)
HIGHBD_BFP_WRAPPER(32, 4, 10)
HIGHBD_BFP_WRAPPER(4, 32, 10)
HIGHBD_BFP_WRAPPER(64, 4, 10)
HIGHBD_BFP_WRAPPER(4, 64, 10)
-#endif // CONFIG_FLEX_PARTITION
-#if CONFIG_BLOCK_256
HIGHBD_BFP_WRAPPER(128, 256, 10)
HIGHBD_BFP_WRAPPER(256, 128, 10)
HIGHBD_BFP_WRAPPER(256, 256, 10)
@@ -814,7 +802,7 @@
HIGHBD_MBFP_WRAPPER(256, 256, 10)
HIGHBD_MBFP_WRAPPER(256, 128, 10)
HIGHBD_MBFP_WRAPPER(128, 256, 10)
-#endif // CONFIG_BLOCK_128
+#endif // CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_MBFP_WRAPPER(128, 128, 10)
HIGHBD_MBFP_WRAPPER(128, 64, 10)
HIGHBD_MBFP_WRAPPER(64, 128, 10)
@@ -837,20 +825,18 @@
HIGHBD_MBFP_WRAPPER(8, 32, 10)
HIGHBD_MBFP_WRAPPER(16, 4, 10)
HIGHBD_MBFP_WRAPPER(4, 16, 10)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_MBFP_WRAPPER(64, 8, 10)
HIGHBD_MBFP_WRAPPER(8, 64, 10)
HIGHBD_MBFP_WRAPPER(32, 4, 10)
HIGHBD_MBFP_WRAPPER(4, 32, 10)
HIGHBD_MBFP_WRAPPER(64, 4, 10)
HIGHBD_MBFP_WRAPPER(4, 64, 10)
-#endif // CONFIG_FLEX_PARTITION
-#if CONFIG_BLOCK_256
HIGHBD_OBFP_WRAPPER(256, 256, 10)
HIGHBD_OBFP_WRAPPER(256, 128, 10)
HIGHBD_OBFP_WRAPPER(128, 256, 10)
-#endif // CONFIG_BLOCK_128
+#endif // CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_OBFP_WRAPPER(128, 128, 10)
HIGHBD_OBFP_WRAPPER(128, 64, 10)
HIGHBD_OBFP_WRAPPER(64, 128, 10)
@@ -873,20 +859,18 @@
HIGHBD_OBFP_WRAPPER(8, 32, 10)
HIGHBD_OBFP_WRAPPER(16, 4, 10)
HIGHBD_OBFP_WRAPPER(4, 16, 10)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_OBFP_WRAPPER(64, 8, 10)
HIGHBD_OBFP_WRAPPER(8, 64, 10)
HIGHBD_OBFP_WRAPPER(32, 4, 10)
HIGHBD_OBFP_WRAPPER(4, 32, 10)
HIGHBD_OBFP_WRAPPER(64, 4, 10)
HIGHBD_OBFP_WRAPPER(4, 64, 10)
-#endif // CONFIG_FLEX_PARTITION
-#if CONFIG_BLOCK_256
HIGHBD_SDSFP_WRAPPER(256, 256, 10)
HIGHBD_SDSFP_WRAPPER(256, 128, 10)
HIGHBD_SDSFP_WRAPPER(128, 256, 10)
-#endif // CONFIG_BLOCK_128
+#endif // CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_SDSFP_WRAPPER(128, 128, 10);
HIGHBD_SDSFP_WRAPPER(128, 64, 10);
HIGHBD_SDSFP_WRAPPER(64, 128, 10);
@@ -906,14 +890,14 @@
HIGHBD_SDSFP_WRAPPER(4, 16, 10);
HIGHBD_SDSFP_WRAPPER(4, 8, 10);
HIGHBD_SDSFP_WRAPPER(8, 32, 10);
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_SDSFP_WRAPPER(64, 8, 10)
HIGHBD_SDSFP_WRAPPER(8, 64, 10)
HIGHBD_SDSFP_WRAPPER(32, 4, 10)
HIGHBD_SDSFP_WRAPPER(4, 32, 10)
HIGHBD_SDSFP_WRAPPER(64, 4, 10)
HIGHBD_SDSFP_WRAPPER(4, 64, 10)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
break;
case AOM_BITS_12:
@@ -939,15 +923,13 @@
HIGHBD_BFP_WRAPPER(128, 128, 12)
HIGHBD_BFP_WRAPPER(128, 64, 12)
HIGHBD_BFP_WRAPPER(64, 128, 12)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_BFP_WRAPPER(64, 8, 12)
HIGHBD_BFP_WRAPPER(8, 64, 12)
HIGHBD_BFP_WRAPPER(32, 4, 12)
HIGHBD_BFP_WRAPPER(4, 32, 12)
HIGHBD_BFP_WRAPPER(64, 4, 12)
HIGHBD_BFP_WRAPPER(4, 64, 12)
-#endif // CONFIG_FLEX_PARTITION
-#if CONFIG_BLOCK_256
HIGHBD_BFP_WRAPPER(128, 256, 12)
HIGHBD_BFP_WRAPPER(256, 128, 12)
HIGHBD_BFP_WRAPPER(256, 256, 12)
@@ -955,7 +937,7 @@
HIGHBD_MBFP_WRAPPER(128, 256, 12)
HIGHBD_MBFP_WRAPPER(256, 128, 12)
HIGHBD_MBFP_WRAPPER(256, 256, 12)
-#endif // CONFIG_BLOCK_128
+#endif // CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_MBFP_WRAPPER(128, 128, 12)
HIGHBD_MBFP_WRAPPER(128, 64, 12)
HIGHBD_MBFP_WRAPPER(64, 128, 12)
@@ -978,20 +960,18 @@
HIGHBD_MBFP_WRAPPER(8, 32, 12)
HIGHBD_MBFP_WRAPPER(16, 4, 12)
HIGHBD_MBFP_WRAPPER(4, 16, 12)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_MBFP_WRAPPER(64, 8, 12)
HIGHBD_MBFP_WRAPPER(8, 64, 12)
HIGHBD_MBFP_WRAPPER(32, 4, 12)
HIGHBD_MBFP_WRAPPER(4, 32, 12)
HIGHBD_MBFP_WRAPPER(64, 4, 12)
HIGHBD_MBFP_WRAPPER(4, 64, 12)
-#endif // CONFIG_FLEX_PARTITION
-#if CONFIG_BLOCK_256
HIGHBD_OBFP_WRAPPER(256, 256, 12)
HIGHBD_OBFP_WRAPPER(256, 128, 12)
HIGHBD_OBFP_WRAPPER(128, 256, 12)
-#endif // CONFIG_BLOCK_128
+#endif // CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_OBFP_WRAPPER(128, 128, 12)
HIGHBD_OBFP_WRAPPER(128, 64, 12)
HIGHBD_OBFP_WRAPPER(64, 128, 12)
@@ -1014,20 +994,18 @@
HIGHBD_OBFP_WRAPPER(8, 32, 12)
HIGHBD_OBFP_WRAPPER(16, 4, 12)
HIGHBD_OBFP_WRAPPER(4, 16, 12)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_OBFP_WRAPPER(64, 8, 12)
HIGHBD_OBFP_WRAPPER(8, 64, 12)
HIGHBD_OBFP_WRAPPER(32, 4, 12)
HIGHBD_OBFP_WRAPPER(4, 32, 12)
HIGHBD_OBFP_WRAPPER(64, 4, 12)
HIGHBD_OBFP_WRAPPER(4, 64, 12)
-#endif // CONFIG_FLEX_PARTITION
-#if CONFIG_BLOCK_256
HIGHBD_SDSFP_WRAPPER(256, 256, 12)
HIGHBD_SDSFP_WRAPPER(256, 128, 12)
HIGHBD_SDSFP_WRAPPER(128, 256, 12)
-#endif // CONFIG_BLOCK_128
+#endif // CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_SDSFP_WRAPPER(128, 128, 12);
HIGHBD_SDSFP_WRAPPER(128, 64, 12);
HIGHBD_SDSFP_WRAPPER(64, 128, 12);
@@ -1047,14 +1025,14 @@
HIGHBD_SDSFP_WRAPPER(4, 16, 12);
HIGHBD_SDSFP_WRAPPER(4, 8, 12);
HIGHBD_SDSFP_WRAPPER(8, 32, 12);
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_SDSFP_WRAPPER(64, 8, 12)
HIGHBD_SDSFP_WRAPPER(8, 64, 12)
HIGHBD_SDSFP_WRAPPER(32, 4, 12)
HIGHBD_SDSFP_WRAPPER(4, 32, 12)
HIGHBD_SDSFP_WRAPPER(64, 4, 12)
HIGHBD_SDSFP_WRAPPER(4, 64, 12)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
break;
default:
diff --git a/av1/encoder/hash_motion.c b/av1/encoder/hash_motion.c
index 879c4fe..a1cf224 100644
--- a/av1/encoder/hash_motion.c
+++ b/av1/encoder/hash_motion.c
@@ -60,9 +60,9 @@
case 32: return 3;
case 64: return 4;
case 128: return 5;
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
case 256: return 6;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
default: return -1;
}
}
diff --git a/av1/encoder/hybrid_fwd_txfm.c b/av1/encoder/hybrid_fwd_txfm.c
index 7f5c931..1262e29 100644
--- a/av1/encoder/hybrid_fwd_txfm.c
+++ b/av1/encoder/hybrid_fwd_txfm.c
@@ -307,7 +307,7 @@
bd);
}
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
static void highbd_fwd_txfm_4x32(const int16_t *src_diff, tran_low_t *coeff,
int diff_stride, TxfmParam *txfm_param) {
int32_t *dst_coeff = (int32_t *)coeff;
@@ -373,7 +373,7 @@
#endif // CONFIG_INTER_DDT
bd);
}
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
void av1_fwd_txfm(const int16_t *src_diff, tran_low_t *coeff, int diff_stride,
TxfmParam *txfm_param) {
@@ -451,7 +451,7 @@
case TX_32X8:
highbd_fwd_txfm_32x8(src_diff, coeff, diff_stride, txfm_param);
break;
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
case TX_4X32:
highbd_fwd_txfm_4x32(src_diff, coeff, diff_stride, txfm_param);
break;
@@ -470,7 +470,7 @@
case TX_64X4:
highbd_fwd_txfm_64x4(src_diff, coeff, diff_stride, txfm_param);
break;
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
default: assert(0); break;
}
}
diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c
index d64f423..fdd7ad5 100644
--- a/av1/encoder/mcomp.c
+++ b/av1/encoder/mcomp.c
@@ -125,12 +125,12 @@
search_method = get_faster_search_method(search_method);
}
}
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
const int max_dim = AOMMAX(block_size_wide[bsize], block_size_high[bsize]);
if (cpi->sf.mv_sf.fast_motion_estimation_on_block_256 && max_dim >= 256) {
search_method = get_faster_search_method(search_method);
}
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// MV search of flex MV precision is supported only for NSTEP or DIAMOND
// search
if (cpi->common.seq_params.enable_flex_mvres &&
@@ -233,13 +233,13 @@
ms_params->var_params.vfp = &cpi->fn_ptr[bsize];
ms_params->var_params.subpel_search_type = cpi->sf.mv_sf.subpel_search_type;
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
if (cpi->sf.mv_sf.fast_motion_estimation_on_block_256 &&
AOMMAX(block_size_wide[bsize], block_size_high[bsize]) >= 256) {
ms_params->var_params.subpel_search_type =
AOMMIN(ms_params->var_params.subpel_search_type, USE_2_TAPS);
}
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
ms_params->var_params.w = block_size_wide[bsize];
ms_params->var_params.h = block_size_high[bsize];
diff --git a/av1/encoder/partition_search.c b/av1/encoder/partition_search.c
index 6accad3..cced9b1 100644
--- a/av1/encoder/partition_search.c
+++ b/av1/encoder/partition_search.c
@@ -2522,9 +2522,9 @@
PARTITION_TYPE partition, const int mi_row,
const int mi_col, BLOCK_SIZE bsize,
const int ctx, BLOCK_SIZE sb_size) {
-#if !CONFIG_BLOCK_256
+#if !CONFIG_EXT_RECUR_PARTITIONS
(void)sb_size;
-#endif // !CONFIG_BLOCK_256
+#endif // !CONFIG_EXT_RECUR_PARTITIONS
const TREE_TYPE tree_type = xd->tree_type;
const int plane_index = tree_type == CHROMA_PART;
FRAME_CONTEXT *fc = xd->tile_ctx;
@@ -2554,7 +2554,6 @@
return;
}
-#if CONFIG_BLOCK_256
const bool do_square_split = partition == PARTITION_SPLIT;
if (is_square_split_eligible(bsize, sb_size)) {
const int square_split_ctx =
@@ -2568,7 +2567,6 @@
if (do_square_split) {
return;
}
-#endif // CONFIG_BLOCK_256
RECT_PART_TYPE rect_type = get_rect_part_type(partition);
if (rect_type_implied_by_bsize(bsize, tree_type) == RECT_INVALID) {
@@ -5560,13 +5558,6 @@
const BLOCK_SIZE bsize = blk_params.bsize;
assert(bsize < BLOCK_SIZES_ALL);
-#if CONFIG_EXT_RECUR_PARTITIONS
- (void)sms_tree;
- (void)part_none_rd;
- (void)part_split_rd;
-#endif // !CONFIG_EXT_RECUR_PARTITIONS
-
-#if !CONFIG_EXT_RECUR_PARTITIONS
// Early termination: using the rd costs of PARTITION_NONE and subblocks
// from PARTITION_SPLIT to determine an early breakout.
if (cpi->sf.part_sf.ml_early_term_after_part_split_level &&
@@ -5580,7 +5571,6 @@
part_search_state->split_rd, mi_row, mi_col,
&part_search_state->terminate_partition_search);
}
-#endif // !CONFIG_EXT_RECUR_PARTITIONS
// Use the rd costs of PARTITION_NONE and subblocks from PARTITION_SPLIT
// to prune out rectangular partitions in some directions.
@@ -7000,7 +6990,6 @@
// Prune if the best partition does not split
part_search_state->prune_partition_4a[HORZ] = 1;
}
-#if CONFIG_FLEX_PARTITION
if (part_sf->prune_ext_part_with_part_rect) {
// Prune if the best partition is rect but subtrees did not further split
// in horz
@@ -7051,24 +7040,6 @@
part_search_state->prune_partition_4a[HORZ] = 1;
}
}
-#else
- if (part_sf->prune_ext_part_with_part_rect &&
- pc_tree->partitioning == PARTITION_HORZ &&
- !node_uses_horz(pc_tree->horizontal[0]) &&
- !node_uses_horz(pc_tree->horizontal[1])) {
- // Prune if the best partition is horz but horz did not further split in
- // horz
- part_search_state->prune_partition_4a[HORZ] = 1;
- }
- if (part_sf->prune_part_4_with_part_3 && !frame_is_intra_only(cm) &&
- pc_tree->partitioning == PARTITION_HORZ_3 &&
- !node_uses_horz(pc_tree->horizontal3[0]) &&
- !node_uses_horz(pc_tree->horizontal3[3])) {
- // Prune is best partition is horizontal H, but first and last
- // subpartitions did not further split in horizontal direction.
- part_search_state->prune_partition_4a[HORZ] = 1;
- }
-#endif // CONFIG_FLEX_PARTITION
if (part_sf->prune_part_4_horz_or_vert && !frame_is_intra_only(cm) &&
pc_tree->partitioning == PARTITION_VERT &&
part_search_state->partition_rect_allowed[HORZ]) {
@@ -7084,7 +7055,6 @@
// Prune if the best partition does not split
part_search_state->prune_partition_4b[HORZ] = 1;
}
-#if CONFIG_FLEX_PARTITION
if (part_sf->prune_ext_part_with_part_rect) {
// Prune if the best partition is rect but subtrees did not further split
// in horz
@@ -7135,24 +7105,6 @@
part_search_state->prune_partition_4b[HORZ] = 1;
}
}
-#else
- if (part_sf->prune_ext_part_with_part_rect &&
- pc_tree->partitioning == PARTITION_HORZ &&
- !node_uses_horz(pc_tree->horizontal[0]) &&
- !node_uses_horz(pc_tree->horizontal[1])) {
- // Prune if the best partition is horz but horz did not further split in
- // horz
- part_search_state->prune_partition_4b[HORZ] = 1;
- }
- if (part_sf->prune_part_4_with_part_3 && !frame_is_intra_only(cm) &&
- pc_tree->partitioning == PARTITION_HORZ_3 &&
- !node_uses_horz(pc_tree->horizontal3[0]) &&
- !node_uses_horz(pc_tree->horizontal3[3])) {
- // Prune is best partition is horizontal H, but first and last
- // subpartitions did not further split in horizontal direction.
- part_search_state->prune_partition_4b[HORZ] = 1;
- }
-#endif // CONFIG_FLEX_PARTITION
if (part_sf->prune_part_4_horz_or_vert && !frame_is_intra_only(cm) &&
pc_tree->partitioning == PARTITION_VERT &&
part_search_state->partition_rect_allowed[HORZ]) {
@@ -7168,7 +7120,6 @@
// Prune if the best partition does not split
part_search_state->prune_partition_4a[VERT] = 1;
}
-#if CONFIG_FLEX_PARTITION
if (part_sf->prune_ext_part_with_part_rect) {
// Prune if the best partition is rect but subtrees did not further split
// in vert
@@ -7219,24 +7170,6 @@
part_search_state->prune_partition_4a[VERT] = 1;
}
}
-#else
- if (part_sf->prune_ext_part_with_part_rect &&
- pc_tree->partitioning == PARTITION_VERT &&
- !node_uses_vert(pc_tree->vertical[0]) &&
- !node_uses_vert(pc_tree->vertical[1])) {
- // Prune if the best partition is vert but vert did not further split in
- // vert
- part_search_state->prune_partition_4a[VERT] = 1;
- }
- if (part_sf->prune_part_4_with_part_3 && !frame_is_intra_only(cm) &&
- pc_tree->partitioning == PARTITION_VERT_3 &&
- !node_uses_vert(pc_tree->vertical3[0]) &&
- !node_uses_vert(pc_tree->vertical3[3])) {
- // Prune is best partition is vertical H, but first and last
- // subpartitions did not further split in vertical direction.
- part_search_state->prune_partition_4a[VERT] = 1;
- }
-#endif // CONFIG_FLEX_PARTITION
if (part_sf->prune_part_4_horz_or_vert && !frame_is_intra_only(cm) &&
pc_tree->partitioning == PARTITION_HORZ &&
part_search_state->partition_rect_allowed[VERT]) {
@@ -7252,7 +7185,6 @@
// Prune if the best partition does not split
part_search_state->prune_partition_4b[VERT] = 1;
}
-#if CONFIG_FLEX_PARTITION
if (part_sf->prune_ext_part_with_part_rect) {
// Prune if the best partition is rect but subtrees did not further split
// in vert
@@ -7303,24 +7235,6 @@
part_search_state->prune_partition_4b[VERT] = 1;
}
}
-#else
- if (part_sf->prune_ext_part_with_part_rect &&
- pc_tree->partitioning == PARTITION_VERT &&
- !node_uses_vert(pc_tree->vertical[0]) &&
- !node_uses_vert(pc_tree->vertical[1])) {
- // Prune if the best partition is vert but vert did not further split in
- // vert
- part_search_state->prune_partition_4b[VERT] = 1;
- }
- if (part_sf->prune_part_4_with_part_3 && !frame_is_intra_only(cm) &&
- pc_tree->partitioning == PARTITION_VERT_3 &&
- !node_uses_vert(pc_tree->vertical3[0]) &&
- !node_uses_vert(pc_tree->vertical3[3])) {
- // Prune is best partition is vertical H, but first and last
- // subpartitions did not further split in vertical direction.
- part_search_state->prune_partition_4b[VERT] = 1;
- }
-#endif // CONFIG_FLEX_PARTITION
if (part_sf->prune_part_4_horz_or_vert && !frame_is_intra_only(cm) &&
pc_tree->partitioning == PARTITION_HORZ &&
part_search_state->partition_rect_allowed[VERT]) {
@@ -8697,10 +8611,8 @@
search_none_after_rect =
try_none_after_rect(xd, &cm->mi_params, bsize, mi_row, mi_col);
}
-#if CONFIG_BLOCK_256
// For 256X256, always search the subblocks first.
search_none_after_split |= bsize == BLOCK_256X256;
-#endif // CONFIG_BLOCK_256
}
#endif // CONFIG_EXT_RECUR_PARTITIONS
@@ -8951,7 +8863,7 @@
prune_partitions_after_split(cpi, x, sms_tree, &part_search_state, &best_rdc,
part_none_rd, part_split_rd);
#endif // !CONFIG_EXT_RECUR_PARTITIONS
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
if (search_none_after_split) {
// Based on split result, decide if we want to further delay the search to
// after rect
@@ -9010,7 +8922,7 @@
#endif // CONFIG_MVP_IMPROVEMENT || WARP_CU_BANK
);
}
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// Rectangular partitions search stage.
rectangular_partition_search(
diff --git a/av1/encoder/partition_strategy.c b/av1/encoder/partition_strategy.c
index 5b493af..69c6c27 100644
--- a/av1/encoder/partition_strategy.c
+++ b/av1/encoder/partition_strategy.c
@@ -623,10 +623,10 @@
ml_mean = av1_simple_motion_search_term_none_mean_16;
ml_std = av1_simple_motion_search_term_none_std_16;
ml_model = av1_simple_motion_search_term_none_model_16;
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
} else if (bsize == BLOCK_256X256) {
return;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
} else {
assert(0 && "Unexpected block size in simple_motion_term_none");
}
@@ -1273,9 +1273,9 @@
nn_config = &av1_partition_breakout_nnconfig_128;
thresh = cpi->sf.part_sf.ml_partition_search_breakout_thresh[4];
break;
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
case BLOCK_256X256: return 0; break;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
default: assert(0 && "Unexpected bsize.");
}
if (!nn_config || thresh < 0) return 0;
@@ -1354,7 +1354,7 @@
cpi->sf.part_sf.simple_motion_search_split && *do_square_split &&
bsize >= BLOCK_8X8 &&
mi_row + mi_size_high[bsize] <= mi_params->mi_rows &&
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
bsize < BLOCK_256X256 &&
#endif
mi_col + mi_size_wide[bsize] <= mi_params->mi_cols &&
@@ -1419,6 +1419,8 @@
const int is_le_min_sq_part = is_bsize_geq(sb_enc->min_partition_size, bsize);
const int is_gt_max_sq_part = (block_height > max_partition_size_1d) ||
(block_width > max_partition_size_1d);
+ (void)do_square_split;
+ (void)is_not_edge_block;
#else // CONFIG_EXT_RECUR_PARTITIONS
const int min_partition_size_1d = block_size_wide[sb_enc->min_partition_size];
const int bsize_1d = block_size_wide[bsize];
@@ -1427,10 +1429,6 @@
assert(min_partition_size_1d <= max_partition_size_1d);
#endif // CONFIG_EXT_RECUR_PARTITIONS
-#if CONFIG_EXT_RECUR_PARTITIONS
- (void)do_square_split;
- (void)is_not_edge_block;
-#endif
if (is_gt_max_sq_part) {
// If current block size is larger than max, only allow split.
*partition_none_allowed = 0;
@@ -1646,9 +1644,7 @@
// Gets the number of sms data in a single dimension
static INLINE int get_sms_count_from_length(int mi_length) {
switch (mi_length) {
-#if CONFIG_BLOCK_256
case 64: return BLOCK_256_COUNT;
-#endif // CONFIG_BLOCK_256
case 32: return BLOCK_128_COUNT;
case 16: return BLOCK_64_COUNT;
case 8: return BLOCK_32_COUNT;
@@ -1687,9 +1683,7 @@
BLOCK_SIZE bsize) {
switch (bsize) {
// Square blocks
-#if CONFIG_BLOCK_256
MAKE_SMS_ARR_SWITCH_CASE(256, 256);
-#endif // CONFIG_BLOCK_256
MAKE_SMS_ARR_SWITCH_CASE(128, 128);
MAKE_SMS_ARR_SWITCH_CASE(64, 64);
MAKE_SMS_ARR_SWITCH_CASE(32, 32);
@@ -1698,9 +1692,7 @@
MAKE_SMS_ARR_SWITCH_CASE(4, 4);
// 1:2 blocks
-#if CONFIG_BLOCK_256
MAKE_SMS_ARR_SWITCH_CASE(128, 256);
-#endif // CONFIG_BLOCK_256
MAKE_SMS_ARR_SWITCH_CASE(64, 128);
MAKE_SMS_ARR_SWITCH_CASE(32, 64);
MAKE_SMS_ARR_SWITCH_CASE(16, 32);
@@ -1708,9 +1700,7 @@
MAKE_SMS_ARR_SWITCH_CASE(4, 8);
// 2:1 blocks
-#if CONFIG_BLOCK_256
MAKE_SMS_ARR_SWITCH_CASE(256, 128);
-#endif // CONFIG_BLOCK_256
MAKE_SMS_ARR_SWITCH_CASE(128, 64);
MAKE_SMS_ARR_SWITCH_CASE(64, 32);
MAKE_SMS_ARR_SWITCH_CASE(32, 16);
@@ -1727,7 +1717,6 @@
MAKE_SMS_ARR_SWITCH_CASE(32, 8);
MAKE_SMS_ARR_SWITCH_CASE(16, 4);
-#if CONFIG_FLEX_PARTITION
// 1:8 blocks
MAKE_SMS_ARR_SWITCH_CASE(8, 64);
MAKE_SMS_ARR_SWITCH_CASE(4, 32);
@@ -1741,7 +1730,6 @@
// 1:16 blocks
MAKE_SMS_ARR_SWITCH_CASE(4, 64);
-#endif // CONFIG_FLEX_PARTITION
default: assert(0 && "Invalid bsize"); return NULL;
}
diff --git a/av1/encoder/pickcdef.c b/av1/encoder/pickcdef.c
index 8399c27..bc74d24 100644
--- a/av1/encoder/pickcdef.c
+++ b/av1/encoder/pickcdef.c
@@ -360,11 +360,11 @@
return;
}
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
cdef_list dlist[MI_SIZE_256X256 * MI_SIZE_256X256];
#else
cdef_list dlist[MI_SIZE_128X128 * MI_SIZE_128X128];
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
int dir[CDEF_NBLOCKS][CDEF_NBLOCKS] = { { 0 } };
int var[CDEF_NBLOCKS][CDEF_NBLOCKS] = { { 0 } };
const CommonModeInfoParams *const mi_params = &cm->mi_params;
@@ -427,7 +427,7 @@
mi_params->mi_grid_base[MI_SIZE_64X64 * fbr * mi_params->mi_stride +
MI_SIZE_64X64 * fbc];
BLOCK_SIZE bs = mbmi->sb_type[PLANE_TYPE_Y];
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
if (bs > BLOCK_64X64 && bs <= BLOCK_256X256) {
const int bw = block_size_wide[bs];
const int bh = block_size_high[bs];
@@ -444,13 +444,13 @@
((fbr & 1) && (mbmi->sb_type[PLANE_TYPE_Y] == BLOCK_128X128 ||
mbmi->sb_type[PLANE_TYPE_Y] == BLOCK_64X128)))
continue;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
int nhb = AOMMIN(MI_SIZE_64X64, mi_params->mi_cols - MI_SIZE_64X64 * fbc);
int nvb = AOMMIN(MI_SIZE_64X64, mi_params->mi_rows - MI_SIZE_64X64 * fbr);
int hb_step = 1;
int vb_step = 1;
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
if (bs > BLOCK_64X64 && bs <= BLOCK_256X256) {
if (block_size_wide[bs] == 256) {
nhb =
@@ -493,7 +493,7 @@
} else {
bs = BLOCK_64X64;
}
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
const int cdef_count = av1_cdef_compute_sb_list(
mi_params, fbr * MI_SIZE_64X64, fbc * MI_SIZE_64X64, dlist, bs);
@@ -603,10 +603,10 @@
int mi_row = sb_index[i] / mi_params->mi_stride;
int mi_col = sb_index[i] % mi_params->mi_stride;
if (
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
bsize_y == BLOCK_256X256 || bsize_y == BLOCK_256X128 ||
bsize_y == BLOCK_128X256 ||
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
bsize_y == BLOCK_128X128 || bsize_y == BLOCK_128X64 ||
bsize_y == BLOCK_64X128) {
const int x_inside_boundary = AOMMIN(bw, mi_params->mi_cols - mi_col);
diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 15cbd58..347772e 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -58,13 +58,13 @@
// 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, 48, 48, 64,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
96, 96, 128,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
4, 4, 8, 8, 16, 16,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
6, 6, 12, 12, 8, 8,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static const int use_intra_ext_tx_for_txsize[EXT_TX_SETS_INTRA]
@@ -113,7 +113,6 @@
fc->do_split_cdf[plane_index][i], NULL);
}
}
-#if CONFIG_BLOCK_256
for (int plane_index = (xd->tree_type == CHROMA_PART);
plane_index < PARTITION_STRUCTURE_NUM; plane_index++) {
for (i = 0; i < SQUARE_SPLIT_CONTEXTS; ++i) {
@@ -121,7 +120,6 @@
fc->do_square_split_cdf[plane_index][i], NULL);
}
}
-#endif // CONFIG_BLOCK_256
for (int plane_index = (xd->tree_type == CHROMA_PART);
plane_index < PARTITION_STRUCTURE_NUM; plane_index++) {
for (i = 0; i < PARTITION_CONTEXTS; ++i) {
@@ -163,7 +161,6 @@
if (!do_split) {
continue;
}
-#if CONFIG_BLOCK_256
const bool do_square_split = part == PARTITION_SPLIT;
if (is_square_split_eligible(bsize, cm->sb_size)) {
mode_costs->partition_cost[plane_index][ctx][part] +=
@@ -173,7 +170,6 @@
if (do_square_split) {
continue;
}
-#endif // CONFIG_BLOCK_256
RECT_PART_TYPE rect_type = get_rect_part_type(part);
if (rect_type_implied_by_bsize(bsize, tree_type) == RECT_INVALID) {
mode_costs->partition_cost[plane_index][ctx][part] +=
@@ -1691,25 +1687,25 @@
3,
3,
3,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
3,
3,
3,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
1,
1,
2,
2,
3,
3,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
1,
1,
2,
2,
2,
2,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static int sse_norm_curvfit_model_cat_lookup(double sse_norm) {
@@ -1750,25 +1746,25 @@
7,
7,
8,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
8,
8,
8,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
0,
0,
2,
2,
4,
4,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
1,
1,
3,
3,
2,
2,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
// TODO(any): Add models for BLOCK_256
diff --git a/av1/encoder/rdopt_utils.h b/av1/encoder/rdopt_utils.h
index d3af5e1..eb89016 100644
--- a/av1/encoder/rdopt_utils.h
+++ b/av1/encoder/rdopt_utils.h
@@ -382,7 +382,7 @@
if (cm->seq_params.monochrome || !xd->is_chroma_ref) return CFL_DISALLOWED;
if (!xd->is_chroma_ref) {
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
// CfL is available to luma partitions lesser than or equal to 32x32.
const BLOCK_SIZE bsize = xd->mi[0]->sb_type[0];
return (CFL_ALLOWED_TYPE)(block_size_wide[bsize] <= CFL_BUF_LINE &&
@@ -397,7 +397,7 @@
assert(block_size_wide[xd->mi[0]->sb_type[0]] <= 32 &&
block_size_high[xd->mi[0]->sb_type[0]] <= 32);
return CFL_ALLOWED;
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
}
// For chroma reference blocks, we should store data in the encoder iff we're
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 99bb021..99e0ed3 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -295,9 +295,9 @@
sf->inter_sf.prune_ref_mv_idx_search = 1;
}
}
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
sf->part_sf.use_square_partition_only_threshold = BLOCK_MAX;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
}
static void set_good_speed_features_framesize_independent(
@@ -379,9 +379,9 @@
} else {
sf->mv_sf.exhaustive_searches_thresh = (1 << 25);
}
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
sf->mv_sf.fast_motion_estimation_on_block_256 = 1;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
sf->rd_sf.perform_coeff_opt = 1;
sf->hl_sf.superres_auto_search_type = SUPERRES_AUTO_DUAL;
@@ -741,10 +741,8 @@
part_sf->prune_rect_with_ml = 0;
part_sf->end_part_search_after_consec_failures = 0;
part_sf->ext_recur_depth_level = 0;
-#if CONFIG_BLOCK_256
part_sf->prune_rect_with_split_depth = 0;
part_sf->search_256_after_128 = 0;
-#endif // CONFIG_BLOCK_256
part_sf->prune_part_h_with_partition_boundary = 0;
#endif // CONFIG_EXT_RECUR_PARTITIONS
#if CONFIG_ML_PART_SPLIT
@@ -772,9 +770,9 @@
mv_sf->use_downsampled_sad = 0;
mv_sf->warp_search_method = WARP_SEARCH_SQUARE;
mv_sf->warp_search_iters = 8;
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
mv_sf->fast_motion_estimation_on_block_256 = 0;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
}
static AOM_INLINE void init_flexmv_sf(
@@ -996,12 +994,10 @@
} else {
sf->part_sf.partition_search_breakout_dist_thr = (1 << 22);
}
-#if CONFIG_BLOCK_256
const int is_720p_or_larger = AOMMIN(cm->width, cm->height) >= 720;
if (is_720p_or_larger) {
sf->part_sf.prune_rect_with_split_depth = 1;
}
-#endif // CONFIG_BLOCK_256
sf->part_sf.partition_search_breakout_rate_thr = 100;
#if CONFIG_ML_PART_SPLIT
if (is_2k_or_larger) {
@@ -1108,9 +1104,7 @@
sf->inter_sf.reuse_erp_mode_flag =
(REUSE_PARTITION_MODE_FLAG | REUSE_INTERFRAME_FLAG);
sf->part_sf.prune_rect_with_none_rd = 1;
-#if CONFIG_BLOCK_256
sf->part_sf.search_256_after_128 = 1;
-#endif // CONFIG_BLOCK_256
AOM_FALLTHROUGH_INTENDED;
case 0: break;
default: assert(0 && "Invalid ERP pruning level.");
diff --git a/av1/encoder/speed_features.h b/av1/encoder/speed_features.h
index 8721dde..a0500e5 100644
--- a/av1/encoder/speed_features.h
+++ b/av1/encoder/speed_features.h
@@ -520,10 +520,8 @@
// to INT_MAX. If set to 2, recursion depth is set to 1.
int ext_recur_depth_level;
-#if CONFIG_BLOCK_256
// Prune rect partitions if PARTITION_SPLIT goes deep.
int prune_rect_with_split_depth;
-#endif // CONFIG_BLOCK_256
// Search horizontal and vertical split before PARTITION_NONE if the neighbor
// blocks are much smaller than the current block size.
@@ -537,10 +535,8 @@
// the current best partition's boundary after searching NONE, HORZ, VERT, and
// H-parts.
int prune_part_4_with_partition_boundary;
-#if CONFIG_BLOCK_256
// Delay the search for block 256 to after block 128
int search_256_after_128;
-#endif // CONFIG_BLOCK_256
#endif // CONFIG_EXT_RECUR_PARTITIONS
#if CONFIG_ML_PART_SPLIT
int prune_split_with_ml;
@@ -617,11 +613,11 @@
// Maximum number of iterations in WARPED_CAUSAL refinement search
int warp_search_iters;
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
// Use faster motion search settings for partition blocks with at least one
// dimension that's >= 256
int fast_motion_estimation_on_block_256;
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
} MV_SPEED_FEATURES;
typedef struct INTER_MODE_SPEED_FEATURES {
diff --git a/av1/encoder/tx_prune_model_weights.h b/av1/encoder/tx_prune_model_weights.h
index 5d6c711..2824d9d 100644
--- a/av1/encoder/tx_prune_model_weights.h
+++ b/av1/encoder/tx_prune_model_weights.h
@@ -1369,14 +1369,14 @@
NULL, // 32x8 transform
NULL, // 16x64 transform
NULL, // 64x16 transform
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
NULL, // 4x32 transform
NULL, // 32x4 transform
NULL, // 8x64 transform
NULL, // 64x8 transform
NULL, // 4x64 transform
NULL, // 64x4 transform
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static NN_CONFIG_V2 *av1_tx_type_nnconfig_map_ver[] = {
@@ -1399,14 +1399,14 @@
NULL, // 32x8 transform
NULL, // 16x64 transform
NULL, // 64x16 transform
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
NULL, // 4x32 transform
NULL, // 32x4 transform
NULL, // 8x64 transform
NULL, // 64x8 transform
NULL, // 4x64 transform
NULL, // 64x4 transform
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#else
/******************************CONFIG_NN***************************************/
@@ -2354,14 +2354,14 @@
NULL, // 32x8 transform
NULL, // 16x64 transform
NULL, // 64x16 transform
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
NULL, // 4x32 transform
NULL, // 32x4 transform
NULL, // 8x64 transform
NULL, // 64x8 transform
NULL, // 4x64 transform
NULL, // 64x4 transform
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static const NN_CONFIG *av1_tx_type_nnconfig_map_ver[] = {
@@ -2384,14 +2384,14 @@
NULL, // 32x8 transform
NULL, // 16x64 transform
NULL, // 64x16 transform
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
NULL, // 4x32 transform
NULL, // 32x4 transform
NULL, // 8x64 transform
NULL, // 64x8 transform
NULL, // 4x64 transform
NULL, // 64x4 transform
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#endif // CONFIG_NN_V2
@@ -3344,7 +3344,7 @@
&av1_tx_split_nnconfig_8x32, // TX_32X8,
&av1_tx_split_nnconfig_16x64, // TX_16X64,
&av1_tx_split_nnconfig_16x64, // TX_64X16,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
// TODO(now): Can add ML models for these.
NULL, // 4x32 transform
NULL, // 32x4 transform
@@ -3352,7 +3352,7 @@
NULL, // 64x8 transform
NULL, // 4x64 transform
NULL, // 64x4 transform
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#ifdef __cplusplus
diff --git a/av1/encoder/tx_search.c b/av1/encoder/tx_search.c
index 88ee046..e4f3f20 100644
--- a/av1/encoder/tx_search.c
+++ b/av1/encoder/tx_search.c
@@ -57,33 +57,33 @@
static const uint32_t skip_pred_threshold[3][BLOCK_SIZES_ALL] = {
{
64, 64, 64, 70, 60, 60, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
68, 68, 68,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
64, 64, 70, 70, 68, 68,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
60, 60, 68, 68, 68, 68,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{
88, 88, 88, 86, 87, 87, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
68, 68, 68,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
88, 88, 86, 86, 68, 68,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
87, 87, 68, 68, 68, 68,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
{
90, 93, 93, 90, 93, 93, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
74, 74, 74,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
90, 90, 90, 90, 74, 74,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
93, 93, 74, 74, 74, 74,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
},
};
@@ -95,13 +95,13 @@
TX_4X4, TX_4X8, TX_8X4, TX_8X8, TX_8X16, TX_16X8,
TX_16X16, TX_16X16, TX_16X16, TX_16X16, TX_16X16, TX_16X16,
TX_16X16, TX_16X16, TX_16X16, TX_16X16,
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
TX_16X16, TX_16X16, TX_16X16,
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
TX_4X16, TX_16X4, TX_8X8, TX_8X8, TX_16X16, TX_16X16,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
TX_4X16, TX_16X4, TX_8X16, TX_16X8, TX_4X16, TX_16X4,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
// look-up table for sqrt of number of pixels in a transform block
@@ -109,9 +109,9 @@
// Note that width or height of 64 is considered 32 instead.
static const int sqrt_tx_pixels_2d[TX_SIZES_ALL] = {
4, 8, 16, 32, 32, 6, 6, 12, 12, 23, 23, 32, 32, 8, 8, 16, 16, 23, 23,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
11, 11, 16, 16, 11, 11,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static int find_tx_size_rd_info(TXB_RD_RECORD *cur_record,
@@ -237,11 +237,11 @@
rd_record_tree_64x128, // BLOCK_64X128
rd_record_tree_128x64, // BLOCK_128X64
rd_record_tree_128x128, // BLOCK_128X128
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
NULL, // BLOCK_128X256
NULL, // BLOCK_256X128
NULL, // BLOCK_256X256
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
NULL, // BLOCK_4X16
NULL, // BLOCK_16X4
rd_record_tree_1_4, // BLOCK_8X32
@@ -267,13 +267,13 @@
sizeof(rd_record_tree_64x128) / sizeof(RD_RECORD_IDX_NODE), // BLOCK_64X128
sizeof(rd_record_tree_128x64) / sizeof(RD_RECORD_IDX_NODE), // BLOCK_128X64
sizeof(rd_record_tree_128x128) / sizeof(RD_RECORD_IDX_NODE), // BLOCK_128X128
-#if CONFIG_BLOCK_256
- 0, // BLOCK_128X256
- 0, // BLOCK_256X128
- 0, // BLOCK_256X256
-#endif // CONFIG_BLOCK_256
- 0, // BLOCK_4X16
- 0, // BLOCK_16X4
+#if CONFIG_EXT_RECUR_PARTITIONS
+ 0, // BLOCK_128X256
+ 0, // BLOCK_256X128
+ 0, // BLOCK_256X256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
+ 0, // BLOCK_4X16
+ 0, // BLOCK_16X4
sizeof(rd_record_tree_1_4) / sizeof(RD_RECORD_IDX_NODE), // BLOCK_8X32
sizeof(rd_record_tree_4_1) / sizeof(RD_RECORD_IDX_NODE), // BLOCK_32X8
sizeof(rd_record_tree_1_4) / sizeof(RD_RECORD_IDX_NODE), // BLOCK_16X64
@@ -660,9 +660,9 @@
unsigned int esq[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
if (bsize < BLOCK_16X16 || (bsize >= BLOCK_4X16 && bsize <= BLOCK_32X8)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
|| (bsize >= BLOCK_4X32 && bsize <= BLOCK_64X4)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
) {
// Special cases: calculate 'esq' values manually, as we don't have 'vf'
// functions for the 16 (very small) sub-blocks of this block.
@@ -676,13 +676,13 @@
: (bh == 16) ? 2
: (bh == 32) ? 3
: 4;
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
assert(bw <= 64);
assert(bh <= 64);
#else
assert(bw <= 32);
assert(bh <= 32);
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
assert(((bw - 1) >> w_shift) + (((bh - 1) >> h_shift) << 2) == 15);
for (int i = 0; i < bh; ++i)
for (int j = 0; j < bw; ++j) {
@@ -1846,7 +1846,7 @@
NULL,
// TX_64X16
NULL,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
// TX_4X32
NULL,
// TX_32X4
@@ -1859,7 +1859,7 @@
NULL,
// TX_64X4
NULL,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
// Probablities are sorted in descending order.
@@ -4001,14 +4001,14 @@
TX_32X8, // 32x8 transform
TX_16X32, // 16x64 transform
TX_32X16, // 64x16 transform
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
TX_4X32, // 4x32 transform
TX_32X4, // 32x4 transform
TX_8X32, // 8x64 transform
TX_32X8, // 64x8 transform
TX_4X32, // 4x64 transform
TX_32X4, // 64x4 transform
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
mbmi->tx_size = tx_size_max_32[mbmi->tx_size];
diff --git a/av1/encoder/x86/av1_fwd_txfm2d_avx2.c b/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
index 0d9eccb..e6c8034 100644
--- a/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
+++ b/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
@@ -3254,14 +3254,14 @@
av1_lowbd_fwd_txfm2d_32x8_sse2, // 32x8 transform
lowbd_fwd_txfm2d_16x64_avx2, // 16x64 transform
lowbd_fwd_txfm2d_64x16_avx2, // 64x16 transform
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
av1_lowbd_fwd_txfm2d_4x32_sse2, // 4x32 transform
av1_lowbd_fwd_txfm2d_32x4_sse2, // 32x4 transform
av1_lowbd_fwd_txfm2d_8x64_sse2, // 8x64 transform
av1_lowbd_fwd_txfm2d_64x8_sse2, // 64x8 transform
av1_lowbd_fwd_txfm2d_4x64_sse2, // 4x64 transform
av1_lowbd_fwd_txfm2d_64x4_sse2, // 64x4 transform
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
void av1_lowbd_fwd_txfm_avx2(const int16_t *src_diff, tran_low_t *coeff,
diff --git a/av1/encoder/x86/av1_fwd_txfm2d_sse4.c b/av1/encoder/x86/av1_fwd_txfm2d_sse4.c
index d4d6a43..01999a3 100644
--- a/av1/encoder/x86/av1_fwd_txfm2d_sse4.c
+++ b/av1/encoder/x86/av1_fwd_txfm2d_sse4.c
@@ -389,14 +389,14 @@
av1_lowbd_fwd_txfm2d_32x8_sse2, // 32x8 transform
NULL, // 16x64 transform
NULL, // 64x16 transform
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
av1_lowbd_fwd_txfm2d_4x32_sse2, // 4x32 transform
av1_lowbd_fwd_txfm2d_32x4_sse2, // 32x4 transform
av1_lowbd_fwd_txfm2d_8x64_sse2, // 8x64 transform
av1_lowbd_fwd_txfm2d_64x8_sse2, // 64x8 transform
av1_lowbd_fwd_txfm2d_4x64_sse2, // 4x64 transform
av1_lowbd_fwd_txfm2d_64x4_sse2, // 64x4 transform
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
void av1_lowbd_fwd_txfm_sse4_1(const int16_t *src_diff, tran_low_t *coeff,
diff --git a/av1/encoder/x86/av1_fwd_txfm_sse2.c b/av1/encoder/x86/av1_fwd_txfm_sse2.c
index ab0c010..23fa185 100644
--- a/av1/encoder/x86/av1_fwd_txfm_sse2.c
+++ b/av1/encoder/x86/av1_fwd_txfm_sse2.c
@@ -3553,7 +3553,7 @@
memset(output + 16 * 32, 0, 16 * 32 * sizeof(*output));
}
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
void av1_lowbd_fwd_txfm2d_4x32_sse2(const int16_t *input, int32_t *output,
int stride, TX_TYPE tx_type,
#if CONFIG_INTER_DDT
@@ -3897,7 +3897,7 @@
store_buffer_16bit_to_32bit_w8(buf8, output8 + 8 * j, 32, 8);
}
}
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
static FwdTxfm2dFunc fwd_txfm2d_func_ls[TX_SIZES_ALL] = {
av1_lowbd_fwd_txfm2d_4x4_sse2, // 4x4 transform
@@ -3919,14 +3919,14 @@
av1_lowbd_fwd_txfm2d_32x8_sse2, // 32x8 transform
NULL, // 16x64 transform
NULL, // 64x16 transform
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
av1_lowbd_fwd_txfm2d_4x32_sse2, // 4x16 transform
av1_lowbd_fwd_txfm2d_32x4_sse2, // 16x4 transform
av1_lowbd_fwd_txfm2d_8x64_sse2, // 8x32 transform
av1_lowbd_fwd_txfm2d_64x8_sse2, // 32x8 transform
av1_lowbd_fwd_txfm2d_4x64_sse2, // 16x64 transform
av1_lowbd_fwd_txfm2d_64x4_sse2, // 64x16 transform
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
void av1_lowbd_fwd_txfm_sse2(const int16_t *src_diff, tran_low_t *coeff,
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 9d84e36..8258b2d 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -160,9 +160,6 @@
set_aom_config_var(
CONFIG_EXT_RECUR_PARTITIONS 1 NUMBER
"AV2 Fully recursive partitions including H partitions experiment flag")
-set_aom_config_var(CONFIG_BLOCK_256 1 NUMBER "AV2 BLOCK_256 experiment flag")
-set_aom_config_var(CONFIG_FLEX_PARTITION 1 NUMBER
- "AV2 Flexible partition experiment flag")
set_aom_config_var(CONFIG_CB1TO4_SPLIT 1 NUMBER
"AV2 amended flexible partition experiment flag")
set_aom_config_var(CONFIG_INTRA_SDP_LATENCY_FIX 1 NUMBER
diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
index 8297a6a..f9abcc2 100644
--- a/build/cmake/aom_configure.cmake
+++ b/build/cmake/aom_configure.cmake
@@ -305,7 +305,7 @@
add_compiler_flag_if_supported("-Wvla")
if(CMAKE_C_COMPILER_ID MATCHES "GNU")
- if(CONFIG_BLOCK_256)
+ if(CONFIG_EXT_RECUR_PARTITIONS)
add_c_flag_if_supported("-Wstack-usage=960000")
add_cxx_flag_if_supported("-Wstack-usage=960000")
elseif("${SANITIZE}" MATCHES "address|undefined")
diff --git a/build/cmake/aom_experiment_deps.cmake b/build/cmake/aom_experiment_deps.cmake
index 282d363..4e8c66c 100644
--- a/build/cmake/aom_experiment_deps.cmake
+++ b/build/cmake/aom_experiment_deps.cmake
@@ -69,11 +69,6 @@
change_config_and_warn(CONFIG_PARA_BD_REDUCE 0 !CONFIG_ENTROPY_PARA)
endif()
- # CONFIG_BLOCK_256 is dependent on CONFIG_EXT_RECUR_PARTITIONS.
- if(NOT CONFIG_EXT_RECUR_PARTITIONS AND CONFIG_BLOCK_256)
- change_config_and_warn(CONFIG_BLOCK_256 0 !CONFIG_EXT_RECUR_PARTITIONS)
- endif()
-
# CONFIG_ENABLE_MHCCP is dependent on CONFIG_EXT_RECUR_PARTITIONS.
if(NOT CONFIG_EXT_RECUR_PARTITIONS AND CONFIG_ENABLE_MHCCP)
change_config_and_warn(CONFIG_ENABLE_MHCCP 0 !CONFIG_EXT_RECUR_PARTITIONS)
@@ -86,14 +81,20 @@
change_config_and_warn(CONFIG_IMPROVEIDTX_RDPH 0 !CONFIG_IMPROVEIDTX_CTXS)
endif()
- # CONFIG_FLEX_PARTITION is dependent on CONFIG_EXT_RECUR_PARTITIONS.
- if(NOT CONFIG_EXT_RECUR_PARTITIONS AND CONFIG_FLEX_PARTITION)
- change_config_and_warn(CONFIG_FLEX_PARTITION 0 !CONFIG_EXT_RECUR_PARTITIONS)
+ # CONFIG_CB1TO4_SPLIT is dependent on CONFIG_EXT_RECUR_PARTITIONS.
+ if(NOT CONFIG_EXT_RECUR_PARTITIONS AND CONFIG_CB1TO4_SPLIT)
+ change_config_and_warn(CONFIG_CB1TO4_SPLIT 0 !CONFIG_EXT_RECUR_PARTITIONS)
endif()
- # CONFIG_CB1TO4_SPLIT is dependent on CONFIG_FLEX_PARTITION.
- if(NOT CONFIG_FLEX_PARTITION AND CONFIG_CB1TO4_SPLIT)
- change_config_and_warn(CONFIG_CB1TO4_SPLIT 0 !CONFIG_FLEX_PARTITION)
+ # CONFIG_ML_PART_SPLIT is dependent on CONFIG_EXT_RECUR_PARTITIONS.
+ if(NOT CONFIG_EXT_RECUR_PARTITIONS AND CONFIG_ML_PART_SPLIT)
+ change_config_and_warn(CONFIG_ML_PART_SPLIT 0 !CONFIG_EXT_RECUR_PARTITIONS)
+ endif()
+
+ # CONFIG_PARTITION_CONTEXT_REDUCE is dependent on CONFIG_CB1TO4_SPLIT.
+ if(NOT CONFIG_CB1TO4_SPLIT AND CONFIG_PARTITION_CONTEXT_REDUCE)
+ change_config_and_warn(CONFIG_PARTITION_CONTEXT_REDUCE 0
+ !CONFIG_CB1TO4_SPLIT)
endif()
# CONFIG_BAWP_CHROMA depends on CONFIG_BAWP
diff --git a/examples/inspect.c b/examples/inspect.c
index e8860ba..60ade68 100644
--- a/examples/inspect.c
+++ b/examples/inspect.c
@@ -185,11 +185,11 @@
ENUM(BLOCK_64X128),
ENUM(BLOCK_128X64),
ENUM(BLOCK_128X128),
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
ENUM(BLOCK_128X256),
ENUM(BLOCK_256X128),
ENUM(BLOCK_256X256),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
ENUM(BLOCK_4X16),
ENUM(BLOCK_16X4),
ENUM(BLOCK_8X32),
diff --git a/test/av1_convolve_test.cc b/test/av1_convolve_test.cc
index ed13a4b..ed4d8b3 100644
--- a/test/av1_convolve_test.cc
+++ b/test/av1_convolve_test.cc
@@ -141,11 +141,11 @@
TEST_F(AV1ConvolveParametersTest, GetHighbdTestParams) {
auto v = GetHighbdTestParams(av1_highbd_convolve_x_sr_c);
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
ASSERT_EQ(80U, v.size());
#else
ASSERT_EQ(60U, v.size());
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
int num_10 = 0;
int num_12 = 0;
for (const auto &p : v) {
diff --git a/test/av1_fwd_txfm2d_test.cc b/test/av1_fwd_txfm2d_test.cc
index dccc6e2..15bbf04 100644
--- a/test/av1_fwd_txfm2d_test.cc
+++ b/test/av1_fwd_txfm2d_test.cc
@@ -162,14 +162,14 @@
1.7, // 32x8 transform
2.0, // 16x64 transform
4.7, // 64x16 transform
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
0.8, // 4x32 transform
0.8, // 32x4 transform
4.0, // 8x64 transform
4.0, // 64x8 transform
3.0, // 4x64 transform
3.0, // 64x4 transform
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
static double max_error_ls[TX_SIZES_ALL] = {
@@ -192,14 +192,14 @@
13, // 32x8 transform
30, // 16x64 transform
36, // 64x16 transform
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
8, // 4x32 transform
8, // 32x4 transform
99, // 8x64 transform
99, // 64x8 transform
90, // 4x64 transform
90, // 64x4 transform
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
vector<AV1FwdTxfm2dParam> GetTxfm2dParamList() {
@@ -401,9 +401,9 @@
TX_4X4, TX_8X8, TX_16X16, TX_32X32, TX_64X64, TX_4X8, TX_8X4,
TX_8X16, TX_16X8, TX_16X32, TX_32X16, TX_32X64, TX_64X32, TX_4X16,
TX_16X4, TX_8X32, TX_32X8, TX_16X64, TX_64X16,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
TX_4X32, TX_32X4, TX_8X64, TX_64X8, TX_4X64, TX_64X4,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(SSE2, AV1FwdTxfm2dTest,
@@ -429,9 +429,9 @@
TX_4X4, TX_8X8, TX_16X16, TX_32X32, TX_64X64, TX_4X8, TX_8X4,
TX_8X16, TX_16X8, TX_16X32, TX_32X16, TX_32X64, TX_64X32, TX_4X16,
TX_16X4, TX_8X32, TX_32X8, TX_16X64, TX_64X16,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
TX_4X32, TX_32X4, TX_8X64, TX_64X8, TX_4X64, TX_64X4,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(AVX2, AV1FwdTxfm2dTest,
@@ -610,9 +610,9 @@
TX_4X4, TX_8X8, TX_16X16, TX_32X32, TX_64X64, TX_4X8, TX_8X4,
TX_8X16, TX_16X8, TX_16X32, TX_32X16, TX_32X64, TX_64X32, TX_4X16,
TX_16X4, TX_8X32, TX_32X8, TX_16X64, TX_64X16,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
TX_4X32, TX_32X4, TX_8X64, TX_64X8, TX_4X64, TX_64X4,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(SSE4_1, AV1HighbdFwdTxfm2dTest,
diff --git a/test/av1_txfm_test.h b/test/av1_txfm_test.h
index 8a6457f..7b19c88 100644
--- a/test/av1_txfm_test.h
+++ b/test/av1_txfm_test.h
@@ -137,10 +137,10 @@
av1_fwd_txfm2d_64x32_c, av1_fwd_txfm2d_4x16_c, av1_fwd_txfm2d_16x4_c,
av1_fwd_txfm2d_8x32_c, av1_fwd_txfm2d_32x8_c, av1_fwd_txfm2d_16x64_c,
av1_fwd_txfm2d_64x16_c,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
av1_fwd_txfm2d_4x32_c, av1_fwd_txfm2d_32x4_c, av1_fwd_txfm2d_8x64_c,
av1_fwd_txfm2d_64x8_c, av1_fwd_txfm2d_4x64_c, av1_fwd_txfm2d_64x4_c,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#endif
@@ -155,11 +155,11 @@
av1_inv_txfm2d_add_16x4_c, av1_inv_txfm2d_add_8x32_c,
av1_inv_txfm2d_add_32x8_c, av1_inv_txfm2d_add_16x64_c,
av1_inv_txfm2d_add_64x16_c,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
av1_inv_txfm2d_add_4x32_c, av1_inv_txfm2d_add_32x4_c,
av1_inv_txfm2d_add_8x64_c, av1_inv_txfm2d_add_64x8_c,
av1_inv_txfm2d_add_4x64_c, av1_inv_txfm2d_add_64x4_c,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
#define BD_NUM 3
diff --git a/test/cfl_test.cc b/test/cfl_test.cc
index a49a377..95cd47a 100644
--- a/test/cfl_test.cc
+++ b/test/cfl_test.cc
@@ -27,7 +27,7 @@
#define NUM_ITERATIONS (100)
#define NUM_ITERATIONS_SPEED (INT16_MAX)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
#define ALL_CFL_TX_SIZES(function) \
make_tuple(static_cast<TX_SIZE>(TX_4X4), &function), \
@@ -99,7 +99,7 @@
make_tuple(static_cast<TX_SIZE>(TX_32X16), &fun420, &fun422, &fun444), \
make_tuple(static_cast<TX_SIZE>(TX_32X32), &fun420, &fun422, &fun444)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
namespace {
diff --git a/test/comp_avg_pred_test.h b/test/comp_avg_pred_test.h
index c69351d..50c1c5f 100644
--- a/test/comp_avg_pred_test.h
+++ b/test/comp_avg_pred_test.h
@@ -26,11 +26,11 @@
#include "aom_ports/aom_timer.h"
namespace libaom_test {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
const int kMaxSize = MAX_SB_SIZE + 32; // padding
#else
const int kMaxSize = 128 + 32; // padding
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
namespace AV1DISTWTDCOMPAVG {
diff --git a/test/dr_prediction_test.cc b/test/dr_prediction_test.cc
index 2a2babd..33f0f2f 100644
--- a/test/dr_prediction_test.cc
+++ b/test/dr_prediction_test.cc
@@ -37,7 +37,7 @@
TX_4X4, TX_8X8, TX_16X16, TX_32X32, TX_64X64, TX_4X8, TX_8X4,
TX_8X16, TX_16X8, TX_16X32, TX_32X16, TX_32X64, TX_64X32, TX_4X16,
TX_16X4, TX_8X32, TX_32X8, TX_16X64, TX_64X16,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
TX_4X32, TX_32X4, TX_8X64, TX_64X8, TX_4X64, TX_64X4,
#endif
};
@@ -47,7 +47,7 @@
"TX_8X4", "TX_8X16", "TX_16X8", "TX_16X32", "TX_32X16", "TX_32X64",
"TX_64X32", "TX_4X16", "TX_16X4", "TX_8X32", "TX_32X8", "TX_16X64",
"TX_64X16",
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
"TX_4X32", "TX_32X4", "TX_8X64", "TX_64X8", "TX_4X64", "TX_64X4",
#endif
};
diff --git a/test/filterintra_test.cc b/test/filterintra_test.cc
index c3cc8ef..da09597 100644
--- a/test/filterintra_test.cc
+++ b/test/filterintra_test.cc
@@ -163,9 +163,9 @@
const TX_SIZE kTxSize[] = {
TX_4X4, TX_8X8, TX_16X16, TX_32X32, TX_4X8, TX_8X4, TX_8X16,
TX_16X8, TX_16X32, TX_32X16, TX_4X16, TX_16X4, TX_8X32, TX_32X8,
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
TX_4X32, TX_32X4,
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(
diff --git a/test/masked_sad_test.cc b/test/masked_sad_test.cc
index 8ae6552..44c1106 100644
--- a/test/masked_sad_test.cc
+++ b/test/masked_sad_test.cc
@@ -150,14 +150,14 @@
make_tuple(&aom_highbd_masked_sad32x8_ssse3, &aom_highbd_masked_sad32x8_c),
make_tuple(&aom_highbd_masked_sad16x64_ssse3, &aom_highbd_masked_sad16x64_c),
make_tuple(&aom_highbd_masked_sad64x16_ssse3, &aom_highbd_masked_sad64x16_c),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(&aom_highbd_masked_sad4x32_ssse3, &aom_highbd_masked_sad4x32_c),
make_tuple(&aom_highbd_masked_sad32x4_ssse3, &aom_highbd_masked_sad32x4_c),
make_tuple(&aom_highbd_masked_sad8x64_ssse3, &aom_highbd_masked_sad8x64_c),
make_tuple(&aom_highbd_masked_sad64x8_ssse3, &aom_highbd_masked_sad64x8_c),
make_tuple(&aom_highbd_masked_sad4x64_ssse3, &aom_highbd_masked_sad4x64_c),
make_tuple(&aom_highbd_masked_sad64x4_ssse3, &aom_highbd_masked_sad64x4_c),
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(SSSE3, HighbdMaskedSADTest,
@@ -193,14 +193,14 @@
make_tuple(&aom_highbd_masked_sad128x128_avx2,
&aom_highbd_masked_sad128x128_ssse3),
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(&aom_highbd_masked_sad128x256_avx2,
&aom_highbd_masked_sad128x256_c),
make_tuple(&aom_highbd_masked_sad256x128_avx2,
&aom_highbd_masked_sad256x128_c),
make_tuple(&aom_highbd_masked_sad256x256_avx2,
&aom_highbd_masked_sad256x256_c),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
make_tuple(&aom_highbd_masked_sad4x16_avx2, &aom_highbd_masked_sad4x16_ssse3),
make_tuple(&aom_highbd_masked_sad16x4_avx2, &aom_highbd_masked_sad16x4_ssse3),
@@ -210,14 +210,14 @@
&aom_highbd_masked_sad16x64_ssse3),
make_tuple(&aom_highbd_masked_sad64x16_avx2,
&aom_highbd_masked_sad64x16_ssse3),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(&aom_highbd_masked_sad4x32_avx2, &aom_highbd_masked_sad4x32_ssse3),
make_tuple(&aom_highbd_masked_sad32x4_avx2, &aom_highbd_masked_sad32x4_ssse3),
make_tuple(&aom_highbd_masked_sad8x64_avx2, &aom_highbd_masked_sad8x64_ssse3),
make_tuple(&aom_highbd_masked_sad64x8_avx2, &aom_highbd_masked_sad64x8_ssse3),
make_tuple(&aom_highbd_masked_sad4x64_avx2, &aom_highbd_masked_sad4x64_ssse3),
make_tuple(&aom_highbd_masked_sad64x4_avx2, &aom_highbd_masked_sad64x4_ssse3),
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(AVX2, HighbdMaskedSADTest,
diff --git a/test/masked_variance_test.cc b/test/masked_variance_test.cc
index bdda9c6..eb2b172 100644
--- a/test/masked_variance_test.cc
+++ b/test/masked_variance_test.cc
@@ -180,14 +180,14 @@
#if HAVE_SSSE3
const HighbdMaskedSubPixelVarianceParam hbd_sub_pel_var_test[] = {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(&aom_highbd_8_masked_sub_pixel_variance256x256_ssse3,
&aom_highbd_8_masked_sub_pixel_variance256x256_c, AOM_BITS_8),
make_tuple(&aom_highbd_8_masked_sub_pixel_variance256x128_ssse3,
&aom_highbd_8_masked_sub_pixel_variance256x128_c, AOM_BITS_8),
make_tuple(&aom_highbd_8_masked_sub_pixel_variance128x256_ssse3,
&aom_highbd_8_masked_sub_pixel_variance128x256_c, AOM_BITS_8),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
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,
@@ -221,14 +221,14 @@
make_tuple(&aom_highbd_8_masked_sub_pixel_variance4x4_ssse3,
&aom_highbd_8_masked_sub_pixel_variance4x4_c, AOM_BITS_8),
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(&aom_highbd_10_masked_sub_pixel_variance256x256_ssse3,
&aom_highbd_10_masked_sub_pixel_variance256x256_c, AOM_BITS_10),
make_tuple(&aom_highbd_10_masked_sub_pixel_variance256x128_ssse3,
&aom_highbd_10_masked_sub_pixel_variance256x128_c, AOM_BITS_10),
make_tuple(&aom_highbd_10_masked_sub_pixel_variance128x256_ssse3,
&aom_highbd_10_masked_sub_pixel_variance128x256_c, AOM_BITS_10),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
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,
@@ -262,14 +262,14 @@
make_tuple(&aom_highbd_10_masked_sub_pixel_variance4x4_ssse3,
&aom_highbd_10_masked_sub_pixel_variance4x4_c, AOM_BITS_10),
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(&aom_highbd_12_masked_sub_pixel_variance256x256_ssse3,
&aom_highbd_12_masked_sub_pixel_variance256x256_c, AOM_BITS_12),
make_tuple(&aom_highbd_12_masked_sub_pixel_variance256x128_ssse3,
&aom_highbd_12_masked_sub_pixel_variance256x128_c, AOM_BITS_12),
make_tuple(&aom_highbd_12_masked_sub_pixel_variance128x256_ssse3,
&aom_highbd_12_masked_sub_pixel_variance128x256_c, AOM_BITS_12),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
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,
@@ -339,7 +339,7 @@
&aom_highbd_12_masked_sub_pixel_variance16x4_c, AOM_BITS_12),
make_tuple(&aom_highbd_12_masked_sub_pixel_variance4x16_ssse3,
&aom_highbd_12_masked_sub_pixel_variance4x16_c, AOM_BITS_12),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(&aom_highbd_8_masked_sub_pixel_variance64x8_ssse3,
&aom_highbd_8_masked_sub_pixel_variance64x8_c, AOM_BITS_8),
make_tuple(&aom_highbd_8_masked_sub_pixel_variance8x64_ssse3,
@@ -376,7 +376,7 @@
&aom_highbd_12_masked_sub_pixel_variance64x4_c, AOM_BITS_12),
make_tuple(&aom_highbd_12_masked_sub_pixel_variance4x64_ssse3,
&aom_highbd_12_masked_sub_pixel_variance4x64_c, AOM_BITS_12),
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(SSSE3_C_COMPARE, HighbdMaskedSubPixelVarianceTest,
diff --git a/test/obmc_sad_test.cc b/test/obmc_sad_test.cc
index 07c6c4b..d5b9afd 100644
--- a/test/obmc_sad_test.cc
+++ b/test/obmc_sad_test.cc
@@ -112,14 +112,14 @@
TestFuncs(aom_highbd_obmc_sad16x4_c, aom_highbd_obmc_sad16x4_sse4_1),
TestFuncs(aom_highbd_obmc_sad4x16_c, aom_highbd_obmc_sad4x16_sse4_1),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
TestFuncs(aom_highbd_obmc_sad64x8_c, aom_highbd_obmc_sad64x8_sse4_1),
TestFuncs(aom_highbd_obmc_sad8x64_c, aom_highbd_obmc_sad8x64_sse4_1),
TestFuncs(aom_highbd_obmc_sad32x4_c, aom_highbd_obmc_sad32x4_sse4_1),
TestFuncs(aom_highbd_obmc_sad4x32_c, aom_highbd_obmc_sad4x32_sse4_1),
TestFuncs(aom_highbd_obmc_sad64x4_c, aom_highbd_obmc_sad64x4_sse4_1),
TestFuncs(aom_highbd_obmc_sad4x64_c, aom_highbd_obmc_sad4x64_sse4_1),
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(SSE4_1, ObmcSadHBDTest,
@@ -128,11 +128,11 @@
#if HAVE_AVX2
ObmcSadHBDTest::ParamType avx2_functions_hbd[] = {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
TestFuncs(aom_highbd_obmc_sad256x256_c, aom_highbd_obmc_sad256x256_avx2),
TestFuncs(aom_highbd_obmc_sad256x128_c, aom_highbd_obmc_sad256x128_avx2),
TestFuncs(aom_highbd_obmc_sad128x256_c, aom_highbd_obmc_sad128x256_avx2),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
TestFuncs(aom_highbd_obmc_sad128x128_c, aom_highbd_obmc_sad128x128_avx2),
TestFuncs(aom_highbd_obmc_sad128x64_c, aom_highbd_obmc_sad128x64_avx2),
TestFuncs(aom_highbd_obmc_sad64x128_c, aom_highbd_obmc_sad64x128_avx2),
@@ -157,14 +157,14 @@
TestFuncs(aom_highbd_obmc_sad16x4_c, aom_highbd_obmc_sad16x4_avx2),
TestFuncs(aom_highbd_obmc_sad4x16_c, aom_highbd_obmc_sad4x16_avx2),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
TestFuncs(aom_highbd_obmc_sad64x8_c, aom_highbd_obmc_sad64x8_avx2),
TestFuncs(aom_highbd_obmc_sad8x64_c, aom_highbd_obmc_sad8x64_avx2),
TestFuncs(aom_highbd_obmc_sad32x4_c, aom_highbd_obmc_sad32x4_avx2),
TestFuncs(aom_highbd_obmc_sad4x32_c, aom_highbd_obmc_sad4x32_avx2),
TestFuncs(aom_highbd_obmc_sad64x4_c, aom_highbd_obmc_sad64x4_avx2),
TestFuncs(aom_highbd_obmc_sad4x64_c, aom_highbd_obmc_sad4x64_avx2),
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(AVX2, ObmcSadHBDTest,
diff --git a/test/obmc_variance_test.cc b/test/obmc_variance_test.cc
index eb23f23..bbd32e5 100644
--- a/test/obmc_variance_test.cc
+++ b/test/obmc_variance_test.cc
@@ -97,14 +97,14 @@
#if HAVE_SSE4_1
ObmcVarianceHBDTest::ParamType sse4_functions_hbd[] = {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
TestFuncs(aom_highbd_obmc_variance256x256_c,
aom_highbd_obmc_variance256x256_sse4_1, 8),
TestFuncs(aom_highbd_obmc_variance256x128_c,
aom_highbd_obmc_variance256x128_sse4_1, 8),
TestFuncs(aom_highbd_obmc_variance128x256_c,
aom_highbd_obmc_variance128x256_sse4_1, 8),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
TestFuncs(aom_highbd_obmc_variance128x128_c,
aom_highbd_obmc_variance128x128_sse4_1, 8),
TestFuncs(aom_highbd_obmc_variance128x64_c,
@@ -138,14 +138,14 @@
TestFuncs(aom_highbd_obmc_variance4x4_c, aom_highbd_obmc_variance4x4_sse4_1,
8),
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
TestFuncs(aom_highbd_obmc_variance256x256_c,
aom_highbd_obmc_variance256x256_sse4_1, 10),
TestFuncs(aom_highbd_obmc_variance256x128_c,
aom_highbd_obmc_variance256x128_sse4_1, 10),
TestFuncs(aom_highbd_obmc_variance128x256_c,
aom_highbd_obmc_variance128x256_sse4_1, 10),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
TestFuncs(aom_highbd_10_obmc_variance128x128_c,
aom_highbd_10_obmc_variance128x128_sse4_1, 10),
TestFuncs(aom_highbd_10_obmc_variance128x64_c,
@@ -179,14 +179,14 @@
TestFuncs(aom_highbd_10_obmc_variance4x4_c,
aom_highbd_10_obmc_variance4x4_sse4_1, 10),
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
TestFuncs(aom_highbd_obmc_variance256x256_c,
aom_highbd_obmc_variance256x256_sse4_1, 12),
TestFuncs(aom_highbd_obmc_variance256x128_c,
aom_highbd_obmc_variance256x128_sse4_1, 12),
TestFuncs(aom_highbd_obmc_variance128x256_c,
aom_highbd_obmc_variance128x256_sse4_1, 12),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
TestFuncs(aom_highbd_12_obmc_variance128x128_c,
aom_highbd_12_obmc_variance128x128_sse4_1, 12),
TestFuncs(aom_highbd_12_obmc_variance128x64_c,
@@ -256,7 +256,7 @@
aom_highbd_12_obmc_variance16x4_sse4_1, 12),
TestFuncs(aom_highbd_12_obmc_variance4x16_c,
aom_highbd_12_obmc_variance4x16_sse4_1, 12),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
TestFuncs(aom_highbd_obmc_variance64x8_c, aom_highbd_obmc_variance64x8_sse4_1,
8),
TestFuncs(aom_highbd_obmc_variance8x64_c, aom_highbd_obmc_variance8x64_sse4_1,
@@ -293,7 +293,7 @@
aom_highbd_12_obmc_variance64x4_sse4_1, 12),
TestFuncs(aom_highbd_12_obmc_variance4x64_c,
aom_highbd_12_obmc_variance4x64_sse4_1, 12),
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(SSE4_1, ObmcVarianceHBDTest,
diff --git a/test/sad_test.cc b/test/sad_test.cc
index b361d8b..c00fe41 100644
--- a/test/sad_test.cc
+++ b/test/sad_test.cc
@@ -1074,11 +1074,11 @@
//------------------------------------------------------------------------------
// C functions
const SadMxNParam c_tests[] = {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(256, 256, &aom_highbd_sad256x256_c, 8),
make_tuple(256, 128, &aom_highbd_sad256x128_c, 8),
make_tuple(128, 256, &aom_highbd_sad128x256_c, 8),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
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),
@@ -1095,11 +1095,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_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(256, 256, &aom_highbd_sad256x256_c, 10),
make_tuple(256, 128, &aom_highbd_sad256x128_c, 10),
make_tuple(128, 256, &aom_highbd_sad128x256_c, 10),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
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),
@@ -1116,11 +1116,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_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(256, 256, &aom_highbd_sad256x256_c, 12),
make_tuple(256, 128, &aom_highbd_sad256x128_c, 12),
make_tuple(128, 256, &aom_highbd_sad128x256_c, 12),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
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),
@@ -1173,7 +1173,7 @@
make_tuple(16, 4, &aom_highbd_sad16x4_c, 12),
make_tuple(4, 16, &aom_highbd_sad4x16_c, 12),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(64, 8, &aom_highbd_sad64x8_c, 8),
make_tuple(8, 64, &aom_highbd_sad8x64_c, 8),
make_tuple(64, 8, &aom_highbd_sad64x8_c, 10),
@@ -1194,16 +1194,16 @@
make_tuple(4, 64, &aom_highbd_sad4x64_c, 10),
make_tuple(64, 4, &aom_highbd_sad64x4_c, 12),
make_tuple(4, 64, &aom_highbd_sad4x64_c, 12),
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(C, SADTest, ::testing::ValuesIn(c_tests));
const SadSkipMxNParam skip_c_tests[] = {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(256, 256, &aom_highbd_sad_skip_256x256_c, 8),
make_tuple(256, 128, &aom_highbd_sad_skip_256x128_c, 8),
make_tuple(128, 256, &aom_highbd_sad_skip_128x256_c, 8),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
make_tuple(128, 128, &aom_highbd_sad_skip_128x128_c, 8),
make_tuple(128, 64, &aom_highbd_sad_skip_128x64_c, 8),
make_tuple(64, 128, &aom_highbd_sad_skip_64x128_c, 8),
@@ -1227,11 +1227,11 @@
make_tuple(16, 4, &aom_highbd_sad_skip_16x4_c, 8),
make_tuple(4, 16, &aom_highbd_sad_skip_4x16_c, 8),
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(256, 256, &aom_highbd_sad_skip_256x256_c, 10),
make_tuple(256, 128, &aom_highbd_sad_skip_256x128_c, 10),
make_tuple(128, 256, &aom_highbd_sad_skip_128x256_c, 10),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
make_tuple(128, 128, &aom_highbd_sad_skip_128x128_c, 10),
make_tuple(128, 64, &aom_highbd_sad_skip_128x64_c, 10),
make_tuple(64, 128, &aom_highbd_sad_skip_64x128_c, 10),
@@ -1255,11 +1255,11 @@
make_tuple(16, 4, &aom_highbd_sad_skip_16x4_c, 10),
make_tuple(4, 16, &aom_highbd_sad_skip_4x16_c, 10),
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(256, 256, &aom_highbd_sad_skip_256x256_c, 12),
make_tuple(256, 128, &aom_highbd_sad_skip_256x128_c, 12),
make_tuple(128, 256, &aom_highbd_sad_skip_128x256_c, 12),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
make_tuple(128, 128, &aom_highbd_sad_skip_128x128_c, 12),
make_tuple(128, 64, &aom_highbd_sad_skip_128x64_c, 12),
make_tuple(64, 128, &aom_highbd_sad_skip_64x128_c, 12),
@@ -1286,11 +1286,11 @@
INSTANTIATE_TEST_SUITE_P(C, SADSkipTest, ::testing::ValuesIn(skip_c_tests));
const SadMxNAvgParam avg_c_tests[] = {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(256, 256, &aom_highbd_sad256x256_avg_c, 8),
make_tuple(256, 128, &aom_highbd_sad256x128_avg_c, 8),
make_tuple(128, 256, &aom_highbd_sad128x256_avg_c, 8),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
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),
@@ -1308,11 +1308,11 @@
make_tuple(4, 8, &aom_highbd_sad4x8_avg_c, 8),
make_tuple(4, 4, &aom_highbd_sad4x4_avg_c, 8),
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(256, 256, &aom_highbd_sad256x256_avg_c, 10),
make_tuple(256, 128, &aom_highbd_sad256x128_avg_c, 10),
make_tuple(128, 256, &aom_highbd_sad128x256_avg_c, 10),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
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),
@@ -1330,11 +1330,11 @@
make_tuple(4, 8, &aom_highbd_sad4x8_avg_c, 10),
make_tuple(4, 4, &aom_highbd_sad4x4_avg_c, 10),
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(256, 256, &aom_highbd_sad256x256_avg_c, 12),
make_tuple(256, 128, &aom_highbd_sad256x128_avg_c, 12),
make_tuple(128, 256, &aom_highbd_sad128x256_avg_c, 12),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
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),
@@ -1373,7 +1373,7 @@
make_tuple(16, 4, &aom_highbd_sad16x4_avg_c, 12),
make_tuple(4, 16, &aom_highbd_sad4x16_avg_c, 12),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(64, 8, &aom_highbd_sad64x8_avg_c, 8),
make_tuple(8, 64, &aom_highbd_sad8x64_avg_c, 8),
make_tuple(64, 8, &aom_highbd_sad64x8_avg_c, 10),
@@ -1394,16 +1394,16 @@
make_tuple(4, 64, &aom_highbd_sad4x64_avg_c, 10),
make_tuple(64, 4, &aom_highbd_sad64x4_avg_c, 12),
make_tuple(4, 64, &aom_highbd_sad4x64_avg_c, 12),
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(C, SADavgTest, ::testing::ValuesIn(avg_c_tests));
const SadMxNx4Param x4d_c_tests[] = {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(256, 256, &aom_highbd_sad256x256x4d_c, 8),
make_tuple(256, 128, &aom_highbd_sad256x128x4d_c, 8),
make_tuple(128, 256, &aom_highbd_sad128x256x4d_c, 8),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
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),
@@ -1421,11 +1421,11 @@
make_tuple(4, 8, &aom_highbd_sad4x8x4d_c, 8),
make_tuple(4, 4, &aom_highbd_sad4x4x4d_c, 8),
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(256, 256, &aom_highbd_sad256x256x4d_c, 10),
make_tuple(256, 128, &aom_highbd_sad256x128x4d_c, 10),
make_tuple(128, 256, &aom_highbd_sad128x256x4d_c, 10),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
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),
@@ -1443,11 +1443,11 @@
make_tuple(4, 8, &aom_highbd_sad4x8x4d_c, 10),
make_tuple(4, 4, &aom_highbd_sad4x4x4d_c, 10),
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(256, 256, &aom_highbd_sad256x256x4d_c, 12),
make_tuple(256, 128, &aom_highbd_sad256x128x4d_c, 12),
make_tuple(128, 256, &aom_highbd_sad128x256x4d_c, 12),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
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),
@@ -1486,7 +1486,7 @@
make_tuple(16, 4, &aom_highbd_sad16x4x4d_c, 12),
make_tuple(4, 16, &aom_highbd_sad4x16x4d_c, 12),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(64, 8, &aom_highbd_sad64x8x4d_c, 8),
make_tuple(8, 64, &aom_highbd_sad8x64x4d_c, 8),
make_tuple(64, 8, &aom_highbd_sad64x8x4d_c, 10),
@@ -1507,16 +1507,16 @@
make_tuple(4, 64, &aom_highbd_sad4x64x4d_c, 10),
make_tuple(64, 4, &aom_highbd_sad64x4x4d_c, 12),
make_tuple(4, 64, &aom_highbd_sad4x64x4d_c, 12),
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(C, SADx4Test, ::testing::ValuesIn(x4d_c_tests));
const SadMxNx4Param skip_x4d_c_tests[] = {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(256, 256, &aom_highbd_sad_skip_256x256x4d_c, 8),
make_tuple(256, 128, &aom_highbd_sad_skip_256x128x4d_c, 8),
make_tuple(128, 256, &aom_highbd_sad_skip_128x256x4d_c, 8),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
make_tuple(128, 128, &aom_highbd_sad_skip_128x128x4d_c, 8),
make_tuple(128, 64, &aom_highbd_sad_skip_128x64x4d_c, 8),
make_tuple(64, 128, &aom_highbd_sad_skip_64x128x4d_c, 8),
@@ -1540,11 +1540,11 @@
make_tuple(16, 4, &aom_highbd_sad_skip_16x4x4d_c, 8),
make_tuple(4, 16, &aom_highbd_sad_skip_4x16x4d_c, 8),
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(256, 256, &aom_highbd_sad_skip_256x256x4d_c, 10),
make_tuple(256, 128, &aom_highbd_sad_skip_256x128x4d_c, 10),
make_tuple(128, 256, &aom_highbd_sad_skip_128x256x4d_c, 10),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
make_tuple(128, 128, &aom_highbd_sad_skip_128x128x4d_c, 10),
make_tuple(128, 64, &aom_highbd_sad_skip_128x64x4d_c, 10),
make_tuple(64, 128, &aom_highbd_sad_skip_64x128x4d_c, 10),
@@ -1568,11 +1568,11 @@
make_tuple(16, 4, &aom_highbd_sad_skip_16x4x4d_c, 10),
make_tuple(4, 16, &aom_highbd_sad_skip_4x16x4d_c, 10),
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(256, 256, &aom_highbd_sad_skip_256x256x4d_c, 12),
make_tuple(256, 128, &aom_highbd_sad_skip_256x128x4d_c, 12),
make_tuple(128, 256, &aom_highbd_sad_skip_128x256x4d_c, 12),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
make_tuple(128, 128, &aom_highbd_sad_skip_128x128x4d_c, 12),
make_tuple(128, 64, &aom_highbd_sad_skip_128x64x4d_c, 12),
make_tuple(64, 128, &aom_highbd_sad_skip_64x128x4d_c, 12),
@@ -1651,11 +1651,11 @@
make_tuple(64, 16, &aom_highbd_sad64x16_sse2, 8),
make_tuple(64, 16, &aom_highbd_sad64x16_sse2, 10),
make_tuple(64, 16, &aom_highbd_sad64x16_sse2, 12),
-#if !CONFIG_FLEX_PARTITION
+#if !CONFIG_EXT_RECUR_PARTITIONS
make_tuple(16, 64, &aom_highbd_sad16x64_sse2, 8),
make_tuple(16, 64, &aom_highbd_sad16x64_sse2, 10),
make_tuple(16, 64, &aom_highbd_sad16x64_sse2, 12),
-#endif // !CONFIG_FLEX_PARTITION
+#endif // !CONFIG_EXT_RECUR_PARTITIONS
make_tuple(32, 8, &aom_highbd_sad32x8_sse2, 8),
make_tuple(8, 32, &aom_highbd_sad8x32_sse2, 8),
@@ -1673,7 +1673,7 @@
make_tuple(4, 16, &aom_highbd_sad4x16_sse2, 10),
make_tuple(4, 16, &aom_highbd_sad4x16_sse2, 12),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
// make_tuple(64, 8, &aom_highbd_sad64x8_sse2, -1),
// make_tuple(8, 64, &aom_highbd_sad8x64_sse2, -1),
make_tuple(64, 8, &aom_highbd_sad64x8_sse2, 8),
@@ -1700,7 +1700,7 @@
// make_tuple(4, 64, &aom_highbd_sad4x64_sse2, 10),
make_tuple(64, 4, &aom_highbd_sad64x4_sse2, 12),
// make_tuple(4, 64, &aom_highbd_sad4x64_sse2, 12),
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(SSE2, SADTest, ::testing::ValuesIn(sse2_tests));
@@ -1710,10 +1710,8 @@
make_tuple(32, 64, &aom_highbd_sad_skip_32x64_sse2, 8),
make_tuple(32, 32, &aom_highbd_sad_skip_32x32_sse2, 8),
make_tuple(32, 16, &aom_highbd_sad_skip_32x16_sse2, 8),
-#if !CONFIG_FLEX_PARTITION
- make_tuple(16, 32, &aom_highbd_sad_skip_16x32_sse2, 8),
-#endif // !CONFIG_FLEX_PARTITION
#if !CONFIG_EXT_RECUR_PARTITIONS
+ make_tuple(16, 32, &aom_highbd_sad_skip_16x32_sse2, 8),
make_tuple(16, 16, &aom_highbd_sad_skip_16x16_sse2, 8),
make_tuple(16, 8, &aom_highbd_sad_skip_16x8_sse2, 8),
#endif // !CONFIG_EXT_RECUR_PARTITIONS
@@ -1721,9 +1719,9 @@
make_tuple(8, 8, &aom_highbd_sad_skip_8x8_sse2, 8),
make_tuple(4, 8, &aom_highbd_sad_skip_4x8_sse2, 8),
make_tuple(64, 16, &aom_highbd_sad_skip_64x16_sse2, 8),
-#if !CONFIG_FLEX_PARTITION
+#if !CONFIG_EXT_RECUR_PARTITIONS
make_tuple(16, 64, &aom_highbd_sad_skip_16x64_sse2, 8),
-#endif // !CONFIG_FLEX_PARTITION
+#endif // !CONFIG_EXT_RECUR_PARTITIONS
make_tuple(32, 8, &aom_highbd_sad_skip_32x8_sse2, 8),
make_tuple(8, 32, &aom_highbd_sad_skip_8x32_sse2, 8),
make_tuple(4, 16, &aom_highbd_sad_skip_4x16_sse2, 8),
@@ -1733,10 +1731,8 @@
make_tuple(32, 64, &aom_highbd_sad_skip_32x64_sse2, 10),
make_tuple(32, 32, &aom_highbd_sad_skip_32x32_sse2, 10),
make_tuple(32, 16, &aom_highbd_sad_skip_32x16_sse2, 10),
-#if !CONFIG_FLEX_PARTITION
- make_tuple(16, 32, &aom_highbd_sad_skip_16x32_sse2, 10),
-#endif // !CONFIG_FLEX_PARTITION
#if !CONFIG_EXT_RECUR_PARTITIONS
+ make_tuple(16, 32, &aom_highbd_sad_skip_16x32_sse2, 10),
make_tuple(16, 16, &aom_highbd_sad_skip_16x16_sse2, 10),
make_tuple(16, 8, &aom_highbd_sad_skip_16x8_sse2, 10),
#endif // !CONFIG_EXT_RECUR_PARTITIONS
@@ -1744,9 +1740,9 @@
make_tuple(8, 8, &aom_highbd_sad_skip_8x8_sse2, 10),
make_tuple(4, 8, &aom_highbd_sad_skip_4x8_sse2, 10),
make_tuple(64, 16, &aom_highbd_sad_skip_64x16_sse2, 10),
-#if !CONFIG_FLEX_PARTITION
+#if !CONFIG_EXT_RECUR_PARTITIONS
make_tuple(16, 64, &aom_highbd_sad_skip_16x64_sse2, 10),
-#endif // !CONFIG_FLEX_PARTITION
+#endif // !CONFIG_EXT_RECUR_PARTITIONS
make_tuple(32, 8, &aom_highbd_sad_skip_32x8_sse2, 10),
make_tuple(8, 32, &aom_highbd_sad_skip_8x32_sse2, 10),
make_tuple(4, 16, &aom_highbd_sad_skip_4x16_sse2, 10),
@@ -1756,10 +1752,8 @@
make_tuple(32, 64, &aom_highbd_sad_skip_32x64_sse2, 12),
make_tuple(32, 32, &aom_highbd_sad_skip_32x32_sse2, 12),
make_tuple(32, 16, &aom_highbd_sad_skip_32x16_sse2, 12),
-#if !CONFIG_FLEX_PARTITION
- make_tuple(16, 32, &aom_highbd_sad_skip_16x32_sse2, 12),
-#endif // !CONFIG_FLEX_PARTITION
#if !CONFIG_EXT_RECUR_PARTITIONS
+ make_tuple(16, 32, &aom_highbd_sad_skip_16x32_sse2, 12),
make_tuple(16, 16, &aom_highbd_sad_skip_16x16_sse2, 12),
make_tuple(16, 8, &aom_highbd_sad_skip_16x8_sse2, 12),
#endif // !CONFIG_EXT_RECUR_PARTITIONS
@@ -1767,9 +1761,9 @@
make_tuple(8, 8, &aom_highbd_sad_skip_8x8_sse2, 12),
make_tuple(4, 8, &aom_highbd_sad_skip_4x8_sse2, 12),
make_tuple(64, 16, &aom_highbd_sad_skip_64x16_sse2, 12),
-#if !CONFIG_FLEX_PARTITION
+#if !CONFIG_EXT_RECUR_PARTITIONS
make_tuple(16, 64, &aom_highbd_sad_skip_16x64_sse2, 12),
-#endif // !CONFIG_FLEX_PARTITION
+#endif // !CONFIG_EXT_RECUR_PARTITIONS
make_tuple(32, 8, &aom_highbd_sad_skip_32x8_sse2, 12),
make_tuple(8, 32, &aom_highbd_sad_skip_8x32_sse2, 12),
make_tuple(4, 16, &aom_highbd_sad_skip_4x16_sse2, 12),
@@ -1828,11 +1822,11 @@
make_tuple(64, 16, &aom_highbd_sad64x16_avg_sse2, 10),
make_tuple(64, 16, &aom_highbd_sad64x16_avg_sse2, 12),
-#if !CONFIG_FLEX_PARTITION
+#if !CONFIG_EXT_RECUR_PARTITIONS
make_tuple(16, 64, &aom_highbd_sad16x64_avg_sse2, 8),
make_tuple(16, 64, &aom_highbd_sad16x64_avg_sse2, 10),
make_tuple(16, 64, &aom_highbd_sad16x64_avg_sse2, 12),
-#endif // !CONFIG_FLEX_PARTITION
+#endif // !CONFIG_EXT_RECUR_PARTITIONS
make_tuple(32, 8, &aom_highbd_sad32x8_avg_sse2, 8),
make_tuple(8, 32, &aom_highbd_sad8x32_avg_sse2, 8),
@@ -1854,7 +1848,7 @@
#endif // !CONFIG_COMPOUND_4XN
make_tuple(4, 16, &aom_highbd_sad4x16_avg_sse2, 12),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
// make_tuple(64, 8, &aom_highbd_sad64x8_avg_sse2, -1),
// make_tuple(8, 64, &aom_highbd_sad8x64_avg_sse2, -1),
make_tuple(64, 8, &aom_highbd_sad64x8_avg_sse2, 8),
@@ -1881,7 +1875,7 @@
// make_tuple(4, 64, &aom_highbd_sad4x64_avg_sse2, 10),
make_tuple(64, 4, &aom_highbd_sad64x4_avg_sse2, 12),
// make_tuple(4, 64, &aom_highbd_sad4x64_avg_sse2, 12),
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(SSE2, SADavgTest, ::testing::ValuesIn(avg_sse2_tests));
@@ -1947,7 +1941,7 @@
make_tuple(16, 4, &aom_highbd_sad16x4x4d_sse2, 12),
make_tuple(4, 16, &aom_highbd_sad4x16x4d_sse2, 12),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
// make_tuple(64, 8, &aom_highbd_sad64x8x4d_sse2, -1),
// make_tuple(8, 64, &aom_highbd_sad8x64x4d_sse2, -1),
make_tuple(64, 8, &aom_highbd_sad64x8x4d_sse2, 8),
@@ -1974,7 +1968,7 @@
make_tuple(4, 64, &aom_highbd_sad4x64x4d_sse2, 10),
make_tuple(64, 4, &aom_highbd_sad64x4x4d_sse2, 12),
make_tuple(4, 64, &aom_highbd_sad4x64x4d_sse2, 12),
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(SSE2, SADx4Test, ::testing::ValuesIn(x4d_sse2_tests));
@@ -2036,7 +2030,7 @@
#if HAVE_AVX2
const SadMxNParam avx2_tests[] = {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(256, 256, &aom_highbd_sad256x256_avx2, 8),
make_tuple(256, 128, &aom_highbd_sad256x128_avx2, 8),
make_tuple(128, 256, &aom_highbd_sad128x256_avx2, 8),
@@ -2046,7 +2040,7 @@
make_tuple(256, 256, &aom_highbd_sad256x256_avx2, 12),
make_tuple(256, 128, &aom_highbd_sad256x128_avx2, 12),
make_tuple(128, 256, &aom_highbd_sad128x256_avx2, 12),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
make_tuple(128, 128, &aom_highbd_sad128x128_avx2, 8),
make_tuple(128, 128, &aom_highbd_sad128x128_avx2, 10),
@@ -2112,7 +2106,7 @@
INSTANTIATE_TEST_SUITE_P(AVX2, SADTest, ::testing::ValuesIn(avx2_tests));
const SadSkipMxNParam skip_avx2_tests[] = {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(256, 256, &aom_highbd_sad_skip_256x256_avx2, 8),
make_tuple(256, 128, &aom_highbd_sad_skip_256x128_avx2, 8),
make_tuple(128, 256, &aom_highbd_sad_skip_128x256_avx2, 8),
@@ -2122,7 +2116,7 @@
make_tuple(256, 256, &aom_highbd_sad_skip_256x256_avx2, 12),
make_tuple(256, 128, &aom_highbd_sad_skip_256x128_avx2, 12),
make_tuple(128, 256, &aom_highbd_sad_skip_128x256_avx2, 12),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
make_tuple(128, 128, &aom_highbd_sad_skip_128x128_avx2, 8),
make_tuple(128, 64, &aom_highbd_sad_skip_128x64_avx2, 8),
@@ -2167,7 +2161,7 @@
::testing::ValuesIn(skip_avx2_tests));
const SadMxNAvgParam avg_avx2_tests[] = {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(256, 256, &aom_highbd_sad256x256_avg_avx2, 8),
make_tuple(256, 128, &aom_highbd_sad256x128_avg_avx2, 8),
make_tuple(128, 256, &aom_highbd_sad128x256_avg_avx2, 8),
@@ -2177,7 +2171,7 @@
make_tuple(256, 256, &aom_highbd_sad256x256_avg_avx2, 12),
make_tuple(256, 128, &aom_highbd_sad256x128_avg_avx2, 12),
make_tuple(128, 256, &aom_highbd_sad128x256_avg_avx2, 12),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
make_tuple(128, 128, &aom_highbd_sad128x128_avg_avx2, 8),
make_tuple(128, 128, &aom_highbd_sad128x128_avg_avx2, 10),
@@ -2229,7 +2223,7 @@
INSTANTIATE_TEST_SUITE_P(AVX2, SADavgTest, ::testing::ValuesIn(avg_avx2_tests));
const SadSkipMxNx4Param skip_x4d_avx2_tests[] = {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(256, 256, &aom_highbd_sad_skip_256x256x4d_avx2, 8),
make_tuple(256, 128, &aom_highbd_sad_skip_256x128x4d_avx2, 8),
make_tuple(128, 256, &aom_highbd_sad_skip_128x256x4d_avx2, 8),
@@ -2239,7 +2233,7 @@
make_tuple(256, 256, &aom_highbd_sad_skip_256x256x4d_avx2, 12),
make_tuple(256, 128, &aom_highbd_sad_skip_256x128x4d_avx2, 12),
make_tuple(128, 256, &aom_highbd_sad_skip_128x256x4d_avx2, 12),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
make_tuple(128, 128, &aom_highbd_sad_skip_128x128x4d_avx2, 8),
make_tuple(128, 64, &aom_highbd_sad_skip_128x64x4d_avx2, 8),
@@ -2290,7 +2284,7 @@
::testing::ValuesIn(skip_x4d_avx2_tests));
const SadMxNx4Param x4d_avx2_tests[] = {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
make_tuple(256, 256, &aom_highbd_sad256x256x4d_avx2, 8),
make_tuple(256, 128, &aom_highbd_sad256x128x4d_avx2, 8),
make_tuple(128, 256, &aom_highbd_sad128x256x4d_avx2, 8),
@@ -2300,7 +2294,7 @@
make_tuple(256, 256, &aom_highbd_sad256x256x4d_avx2, 12),
make_tuple(256, 128, &aom_highbd_sad256x128x4d_avx2, 12),
make_tuple(128, 256, &aom_highbd_sad128x256x4d_avx2, 12),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
make_tuple(128, 128, &aom_highbd_sad128x128x4d_avx2, 8),
make_tuple(128, 128, &aom_highbd_sad128x128x4d_avx2, 10),
diff --git a/test/test_intra_pred_speed.cc b/test/test_intra_pred_speed.cc
index 38839ac..52a98b7 100644
--- a/test/test_intra_pred_speed.cc
+++ b/test/test_intra_pred_speed.cc
@@ -87,9 +87,9 @@
"4X4", "8X8", "16X16", "32X32", "64X64", "4X8", "8X4",
"8X16", "16X8", "16X32", "32X16", "32X64", "64X32", "4X16",
"16X4", "8X32", "32X8", "16X64", "64X16",
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
"4X32", "32X4", "8X64", "64X8", "4X64", "64X4",
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
void CheckMd5Signature(TX_SIZE tx_size, const char *const signatures[],
@@ -403,7 +403,7 @@
"42b8e4a97b7f8416c72a5148c031c0b1",
"a38a2c5f79993dfae8530e9e25800893",
},
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
{
// 4X32
"c1f205381dd47ee115861c8df74a8d2a",
@@ -482,7 +482,7 @@
"50d2243d7094a8a8091f7bb0e45a6dd3",
"a25621808c86377cdddb630381f04f3d",
},
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
} // namespace
@@ -523,7 +523,7 @@
aom_highbd_smooth_predictor_4x16_c, aom_highbd_smooth_v_predictor_4x16_c,
aom_highbd_smooth_h_predictor_4x16_c)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_INTRA_PRED_TEST(
C_4, TX_4X32, aom_highbd_dc_predictor_4x32_c,
aom_highbd_dc_left_predictor_4x32_c, aom_highbd_dc_top_predictor_4x32_c,
@@ -539,7 +539,7 @@
aom_highbd_h_predictor_4x64_c, aom_highbd_paeth_predictor_4x64_c,
aom_highbd_smooth_predictor_4x64_c, aom_highbd_smooth_v_predictor_4x64_c,
aom_highbd_smooth_h_predictor_4x64_c)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#if HAVE_SSE2
HIGHBD_INTRA_PRED_TEST(SSE2_1, TX_4X4, aom_highbd_dc_predictor_4x4_sse2,
@@ -592,7 +592,7 @@
aom_highbd_smooth_predictor_8x32_c, aom_highbd_smooth_v_predictor_8x32_c,
aom_highbd_smooth_h_predictor_8x32_c)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_INTRA_PRED_TEST(
C_5, TX_8X64, aom_highbd_dc_predictor_8x64_c,
aom_highbd_dc_left_predictor_8x64_c, aom_highbd_dc_top_predictor_8x64_c,
@@ -600,7 +600,7 @@
aom_highbd_h_predictor_8x64_c, aom_highbd_paeth_predictor_8x64_c,
aom_highbd_smooth_predictor_8x64_c, aom_highbd_smooth_v_predictor_8x64_c,
aom_highbd_smooth_h_predictor_8x64_c)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#if HAVE_SSE2
HIGHBD_INTRA_PRED_TEST(SSE2_1, TX_8X8, aom_highbd_dc_predictor_8x8_sse2,
@@ -745,7 +745,7 @@
aom_highbd_smooth_predictor_32x8_c, aom_highbd_smooth_v_predictor_32x8_c,
aom_highbd_smooth_h_predictor_32x8_c)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_INTRA_PRED_TEST(
C_5, TX_32X4, aom_highbd_dc_predictor_32x4_c,
aom_highbd_dc_left_predictor_32x4_c, aom_highbd_dc_top_predictor_32x4_c,
@@ -753,7 +753,7 @@
aom_highbd_h_predictor_32x4_c, aom_highbd_paeth_predictor_32x4_c,
aom_highbd_smooth_predictor_32x4_c, aom_highbd_smooth_v_predictor_32x4_c,
aom_highbd_smooth_h_predictor_32x4_c)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
#if HAVE_SSE2
HIGHBD_INTRA_PRED_TEST(SSE2_1, TX_32X32, aom_highbd_dc_predictor_32x32_sse2,
@@ -812,7 +812,7 @@
aom_highbd_smooth_predictor_64x16_c, aom_highbd_smooth_v_predictor_64x16_c,
aom_highbd_smooth_h_predictor_64x16_c)
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
HIGHBD_INTRA_PRED_TEST(
C_4, TX_64X4, aom_highbd_dc_predictor_64x4_c,
aom_highbd_dc_left_predictor_64x4_c, aom_highbd_dc_top_predictor_64x4_c,
@@ -828,7 +828,7 @@
aom_highbd_h_predictor_64x8_c, aom_highbd_paeth_predictor_64x8_c,
aom_highbd_smooth_predictor_64x8_c, aom_highbd_smooth_v_predictor_64x8_c,
aom_highbd_smooth_h_predictor_64x8_c)
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// -----------------------------------------------------------------------------
#include "test/test_libaom.cc"
diff --git a/test/variance_test.cc b/test/variance_test.cc
index f774507..223f781 100644
--- a/test/variance_test.cc
+++ b/test/variance_test.cc
@@ -918,7 +918,7 @@
VarianceParams(3, 5, &aom_highbd_8_variance8x32_c, 8),
VarianceParams(4, 2, &aom_highbd_8_variance16x4_c, 8),
VarianceParams(2, 4, &aom_highbd_8_variance4x16_c, 8),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
VarianceParams(6, 3, &aom_highbd_12_variance64x8_c, 12),
VarianceParams(3, 6, &aom_highbd_12_variance8x64_c, 12),
VarianceParams(5, 2, &aom_highbd_12_variance32x4_c, 12),
@@ -937,7 +937,7 @@
VarianceParams(2, 5, &aom_highbd_8_variance4x32_c, 8),
VarianceParams(6, 2, &aom_highbd_8_variance64x4_c, 8),
VarianceParams(2, 6, &aom_highbd_8_variance4x64_c, 8),
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(C, AvxHBDVarianceTest,
::testing::ValuesIn(kArrayHBDVariance_c));
@@ -1019,7 +1019,7 @@
SubpelVarianceParams(3, 5, &aom_highbd_12_sub_pixel_variance8x32_c, 12),
SubpelVarianceParams(4, 2, &aom_highbd_12_sub_pixel_variance16x4_c, 12),
SubpelVarianceParams(2, 4, &aom_highbd_12_sub_pixel_variance4x16_c, 12),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
SubpelVarianceParams(6, 3, &aom_highbd_8_sub_pixel_variance64x8_c, 8),
SubpelVarianceParams(3, 6, &aom_highbd_8_sub_pixel_variance8x64_c, 8),
SubpelVarianceParams(5, 2, &aom_highbd_8_sub_pixel_variance32x4_c, 8),
@@ -1038,7 +1038,7 @@
SubpelVarianceParams(2, 5, &aom_highbd_12_sub_pixel_variance4x32_c, 12),
SubpelVarianceParams(6, 2, &aom_highbd_12_sub_pixel_variance64x4_c, 12),
SubpelVarianceParams(2, 6, &aom_highbd_12_sub_pixel_variance4x64_c, 12),
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(C, AvxHBDSubpelVarianceTest,
::testing::ValuesIn(kArrayHBDSubpelVariance_c));
@@ -1150,7 +1150,7 @@
12),
SubpelAvgVarianceParams(2, 4, &aom_highbd_12_sub_pixel_avg_variance4x16_c,
12),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
SubpelAvgVarianceParams(6, 3, &aom_highbd_8_sub_pixel_avg_variance64x8_c, 8),
SubpelAvgVarianceParams(3, 6, &aom_highbd_8_sub_pixel_avg_variance8x64_c, 8),
SubpelAvgVarianceParams(5, 2, &aom_highbd_8_sub_pixel_avg_variance32x4_c, 8),
@@ -1181,7 +1181,7 @@
12),
SubpelAvgVarianceParams(2, 6, &aom_highbd_12_sub_pixel_avg_variance4x64_c,
12),
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(C, AvxHBDSubpelAvgVarianceTest,
::testing::ValuesIn(kArrayHBDSubpelAvgVariance_c));
@@ -1301,7 +1301,7 @@
12),
ObmcSubpelVarianceParams(2, 4, &aom_highbd_12_obmc_sub_pixel_variance4x16_c,
12),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
ObmcSubpelVarianceParams(6, 3, &aom_highbd_obmc_sub_pixel_variance64x8_c, 8),
ObmcSubpelVarianceParams(3, 6, &aom_highbd_obmc_sub_pixel_variance8x64_c, 8),
ObmcSubpelVarianceParams(5, 2, &aom_highbd_obmc_sub_pixel_variance32x4_c, 8),
@@ -1332,7 +1332,7 @@
12),
ObmcSubpelVarianceParams(2, 6, &aom_highbd_12_obmc_sub_pixel_variance4x64_c,
12),
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(C, AvxHBDObmcSubpelVarianceTest,
::testing::ValuesIn(kArrayHBDObmcSubpelVariance_c));
@@ -1447,7 +1447,7 @@
VarianceParams(3, 5, &aom_highbd_8_variance8x32_sse2, 8),
// VarianceParams(4, 2, &aom_highbd_8_variance16x4_sse2, 8),
// VarianceParams(2, 4, &aom_highbd_8_variance4x16_sse2, 8),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
VarianceParams(6, 3, &aom_highbd_12_variance64x8_sse2, 12),
VarianceParams(3, 6, &aom_highbd_12_variance8x64_sse2, 12),
// VarianceParams(5, 2, &aom_highbd_12_variance32x4_sse2, 12),
@@ -1466,7 +1466,7 @@
// VarianceParams(2, 5, &aom_highbd_8_variance4x32_sse2, 8),
// VarianceParams(6, 2, &aom_highbd_8_variance64x4_sse2, 8),
// VarianceParams(2, 6, &aom_highbd_8_variance4x64_sse2, 8),
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(SSE2, AvxHBDVarianceTest,
::testing::ValuesIn(kArrayHBDVariance_sse2));
@@ -1481,11 +1481,11 @@
10)));
const VarianceParams kArrayHBDVariance_avx2[] = {
-#if CONFIG_BLOCK_256
+#if CONFIG_EXT_RECUR_PARTITIONS
VarianceParams(8, 8, &aom_highbd_8_variance256x256_avx2, 8),
VarianceParams(8, 7, &aom_highbd_8_variance256x128_avx2, 8),
VarianceParams(7, 8, &aom_highbd_8_variance128x256_avx2, 8),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
VarianceParams(7, 7, &aom_highbd_8_variance128x128_avx2, 8),
VarianceParams(7, 6, &aom_highbd_8_variance128x64_avx2, 8),
VarianceParams(6, 7, &aom_highbd_8_variance64x128_avx2, 8),
@@ -1504,16 +1504,14 @@
VarianceParams(5, 3, &aom_highbd_8_variance32x8_avx2, 8),
VarianceParams(4, 6, &aom_highbd_8_variance16x64_avx2, 8),
VarianceParams(6, 4, &aom_highbd_8_variance64x16_avx2, 8),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
VarianceParams(6, 3, &aom_highbd_8_variance64x8_avx2, 8),
VarianceParams(3, 6, &aom_highbd_8_variance8x64_avx2, 8),
-#endif // CONFIG_FLEX_PARTITION
-#if CONFIG_BLOCK_256
VarianceParams(8, 8, &aom_highbd_10_variance256x256_avx2, 10),
VarianceParams(8, 7, &aom_highbd_10_variance256x128_avx2, 10),
VarianceParams(7, 8, &aom_highbd_10_variance128x256_avx2, 10),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
VarianceParams(7, 7, &aom_highbd_10_variance128x128_avx2, 10),
VarianceParams(7, 6, &aom_highbd_10_variance128x64_avx2, 10),
VarianceParams(6, 7, &aom_highbd_10_variance64x128_avx2, 10),
@@ -1532,16 +1530,14 @@
VarianceParams(5, 3, &aom_highbd_10_variance32x8_avx2, 10),
VarianceParams(4, 6, &aom_highbd_10_variance16x64_avx2, 10),
VarianceParams(6, 4, &aom_highbd_10_variance64x16_avx2, 10),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
VarianceParams(6, 3, &aom_highbd_10_variance64x8_avx2, 10),
VarianceParams(3, 6, &aom_highbd_10_variance8x64_avx2, 10),
-#endif // CONFIG_FLEX_PARTITION
-#if CONFIG_BLOCK_256
VarianceParams(8, 8, &aom_highbd_12_variance256x256_avx2, 12),
VarianceParams(8, 7, &aom_highbd_12_variance256x128_avx2, 12),
VarianceParams(7, 8, &aom_highbd_12_variance128x256_avx2, 12),
-#endif // CONFIG_BLOCK_256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
VarianceParams(7, 7, &aom_highbd_12_variance128x128_avx2, 12),
VarianceParams(7, 6, &aom_highbd_12_variance128x64_avx2, 12),
VarianceParams(6, 7, &aom_highbd_12_variance64x128_avx2, 12),
@@ -1560,24 +1556,24 @@
VarianceParams(5, 3, &aom_highbd_12_variance32x8_avx2, 12),
VarianceParams(4, 6, &aom_highbd_12_variance16x64_avx2, 12),
VarianceParams(6, 4, &aom_highbd_12_variance64x16_avx2, 12),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
VarianceParams(6, 3, &aom_highbd_12_variance64x8_avx2, 12),
VarianceParams(3, 6, &aom_highbd_12_variance8x64_avx2, 12),
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(AVX2, AvxHBDVarianceTest,
::testing::ValuesIn(kArrayHBDVariance_avx2));
const SubpelVarianceParams kArrayHBDSubpelVariance_avx2[] = {
-#if CONFIG_BLOCK_256X256
+#if CONFIG_EXT_RECUR_PARTITIONS
// SubpelVarianceParams(8, 8, &aom_highbd_12_sub_pixel_variance256x256_avx2,
// 12),
// SubpelVarianceParams(8, 7, &aom_highbd_12_sub_pixel_variance256x128_avx2,
// 12),
// SubpelVarianceParams(7, 8, &aom_highbd_12_sub_pixel_variance128x256_avx2,
// 12),
-#endif // CONFIG_BLOCK_256X256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
// SubpelVarianceParams(7, 7, &aom_highbd_12_sub_pixel_variance128x128_avx2,
// 12),
// SubpelVarianceParams(7, 6, &aom_highbd_12_sub_pixel_variance128x64_avx2,
@@ -1600,11 +1596,12 @@
// 12),
SubpelVarianceParams(4, 3, &aom_highbd_12_sub_pixel_variance16x8_avx2, 12),
-#if CONFIG_BLOCK_256X256
- SubpelVarianceParams(8, 8, &aom_highbd_10_sub_pixel_variance256x256_avx2, 10),
+#if CONFIG_EXT_RECUR_PARTITIONS
+ // SubpelVarianceParams(8, 8, &aom_highbd_10_sub_pixel_variance256x256_avx2,
+ // 10),
SubpelVarianceParams(8, 7, &aom_highbd_10_sub_pixel_variance256x128_avx2, 10),
SubpelVarianceParams(7, 8, &aom_highbd_10_sub_pixel_variance128x256_avx2, 10),
-#endif // CONFIG_BLOCK_256X256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
SubpelVarianceParams(7, 7, &aom_highbd_10_sub_pixel_variance128x128_avx2, 10),
SubpelVarianceParams(7, 6, &aom_highbd_10_sub_pixel_variance128x64_avx2, 10),
SubpelVarianceParams(6, 7, &aom_highbd_10_sub_pixel_variance64x128_avx2, 10),
@@ -1617,11 +1614,12 @@
SubpelVarianceParams(4, 4, &aom_highbd_10_sub_pixel_variance16x16_avx2, 10),
SubpelVarianceParams(4, 3, &aom_highbd_10_sub_pixel_variance16x8_avx2, 10),
-#if CONFIG_BLOCK_256X256
- SubpelVarianceParams(8, 8, &aom_highbd_8_sub_pixel_variance256x256_avx2, 8),
+#if CONFIG_EXT_RECUR_PARTITIONS
+ // SubpelVarianceParams(8, 8, &aom_highbd_8_sub_pixel_variance256x256_avx2,
+ // 8),
SubpelVarianceParams(8, 7, &aom_highbd_8_sub_pixel_variance256x128_avx2, 8),
SubpelVarianceParams(7, 8, &aom_highbd_8_sub_pixel_variance128x256_avx2, 8),
-#endif // CONFIG_BLOCK_256X256
+#endif // CONFIG_EXT_RECUR_PARTITIONS
SubpelVarianceParams(7, 7, &aom_highbd_8_sub_pixel_variance128x128_avx2, 8),
SubpelVarianceParams(7, 6, &aom_highbd_8_sub_pixel_variance128x64_avx2, 8),
SubpelVarianceParams(6, 7, &aom_highbd_8_sub_pixel_variance64x128_avx2, 8),
@@ -1665,10 +1663,8 @@
SubpelVarianceParams(5, 6, &aom_highbd_12_sub_pixel_variance32x64_sse2, 12),
SubpelVarianceParams(5, 5, &aom_highbd_12_sub_pixel_variance32x32_sse2, 12),
SubpelVarianceParams(5, 4, &aom_highbd_12_sub_pixel_variance32x16_sse2, 12),
-#if !CONFIG_FLEX_PARTITION
- SubpelVarianceParams(4, 5, &aom_highbd_12_sub_pixel_variance16x32_sse2, 12),
-#endif // !CONFIG_FLEX_PARTITION
#if !CONFIG_EXT_RECUR_PARTITIONS
+ SubpelVarianceParams(4, 5, &aom_highbd_12_sub_pixel_variance16x32_sse2, 12),
SubpelVarianceParams(4, 4, &aom_highbd_12_sub_pixel_variance16x16_sse2, 12),
SubpelVarianceParams(4, 3, &aom_highbd_12_sub_pixel_variance16x8_sse2, 12),
#endif // !CONFIG_EXT_RECUR_PARTITIONS
@@ -1683,10 +1679,8 @@
SubpelVarianceParams(5, 6, &aom_highbd_10_sub_pixel_variance32x64_sse2, 10),
SubpelVarianceParams(5, 5, &aom_highbd_10_sub_pixel_variance32x32_sse2, 10),
SubpelVarianceParams(5, 4, &aom_highbd_10_sub_pixel_variance32x16_sse2, 10),
-#if !CONFIG_FLEX_PARTITION
- SubpelVarianceParams(4, 5, &aom_highbd_10_sub_pixel_variance16x32_sse2, 10),
-#endif // !CONFIG_FLEX_PARTITION
#if !CONFIG_EXT_RECUR_PARTITIONS
+ SubpelVarianceParams(4, 5, &aom_highbd_10_sub_pixel_variance16x32_sse2, 10),
SubpelVarianceParams(4, 4, &aom_highbd_10_sub_pixel_variance16x16_sse2, 10),
SubpelVarianceParams(4, 3, &aom_highbd_10_sub_pixel_variance16x8_sse2, 10),
#endif // !CONFIG_EXT_RECUR_PARTITIONS
@@ -1701,10 +1695,8 @@
SubpelVarianceParams(5, 6, &aom_highbd_8_sub_pixel_variance32x64_sse2, 8),
SubpelVarianceParams(5, 5, &aom_highbd_8_sub_pixel_variance32x32_sse2, 8),
SubpelVarianceParams(5, 4, &aom_highbd_8_sub_pixel_variance32x16_sse2, 8),
-#if !CONFIG_FLEX_PARTITION
- SubpelVarianceParams(4, 5, &aom_highbd_8_sub_pixel_variance16x32_sse2, 8),
-#endif // !CONFIG_FLEX_PARTITION
#if !CONFIG_EXT_RECUR_PARTITIONS
+ SubpelVarianceParams(4, 5, &aom_highbd_8_sub_pixel_variance16x32_sse2, 8),
SubpelVarianceParams(4, 4, &aom_highbd_8_sub_pixel_variance16x16_sse2, 8),
SubpelVarianceParams(4, 3, &aom_highbd_8_sub_pixel_variance16x8_sse2, 8),
#endif // !CONFIG_EXT_RECUR_PARTITIONS
@@ -1713,9 +1705,9 @@
SubpelVarianceParams(3, 2, &aom_highbd_8_sub_pixel_variance8x4_sse2, 8),
SubpelVarianceParams(6, 4, &aom_highbd_12_sub_pixel_variance64x16_sse2, 12),
-#if !CONFIG_FLEX_PARTITION
+#if !CONFIG_EXT_RECUR_PARTITIONS
SubpelVarianceParams(4, 6, &aom_highbd_12_sub_pixel_variance16x64_sse2, 12),
-#endif // !CONFIG_FLEX_PARTITION
+#endif // !CONFIG_EXT_RECUR_PARTITIONS
SubpelVarianceParams(5, 3, &aom_highbd_12_sub_pixel_variance32x8_sse2, 12),
SubpelVarianceParams(3, 5, &aom_highbd_12_sub_pixel_variance8x32_sse2, 12),
#if !CONFIG_EXT_RECUR_PARTITIONS
@@ -1723,9 +1715,9 @@
#endif // !CONFIG_EXT_RECUR_PARTITIONS
// SubpelVarianceParams(2, 4, &aom_highbd_12_sub_pixel_variance4x16_sse2, 12),
SubpelVarianceParams(6, 4, &aom_highbd_10_sub_pixel_variance64x16_sse2, 10),
-#if !CONFIG_FLEX_PARTITION
+#if !CONFIG_EXT_RECUR_PARTITIONS
SubpelVarianceParams(4, 6, &aom_highbd_10_sub_pixel_variance16x64_sse2, 10),
-#endif // !CONFIG_FLEX_PARTITION
+#endif // !CONFIG_EXT_RECUR_PARTITIONS
SubpelVarianceParams(5, 3, &aom_highbd_10_sub_pixel_variance32x8_sse2, 10),
SubpelVarianceParams(3, 5, &aom_highbd_10_sub_pixel_variance8x32_sse2, 10),
#if !CONFIG_EXT_RECUR_PARTITIONS
@@ -1733,16 +1725,16 @@
#endif // !CONFIG_EXT_RECUR_PARTITIONS
// SubpelVarianceParams(2, 4, &aom_highbd_10_sub_pixel_variance4x16_sse2, 10),
SubpelVarianceParams(6, 4, &aom_highbd_8_sub_pixel_variance64x16_sse2, 8),
-#if !CONFIG_FLEX_PARTITION
+#if !CONFIG_EXT_RECUR_PARTITIONS
SubpelVarianceParams(4, 6, &aom_highbd_8_sub_pixel_variance16x64_sse2, 8),
-#endif // !CONFIG_FLEX_PARTITION
+#endif // !CONFIG_EXT_RECUR_PARTITIONS
SubpelVarianceParams(5, 3, &aom_highbd_8_sub_pixel_variance32x8_sse2, 8),
SubpelVarianceParams(3, 5, &aom_highbd_8_sub_pixel_variance8x32_sse2, 8),
#if !CONFIG_EXT_RECUR_PARTITIONS
SubpelVarianceParams(4, 2, &aom_highbd_8_sub_pixel_variance16x4_sse2, 8),
#endif // !CONFIG_EXT_RECUR_PARTITIONS
// SubpelVarianceParams(2, 4, &aom_highbd_8_sub_pixel_variance4x16_sse2, 8),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
SubpelVarianceParams(6, 3, &aom_highbd_12_sub_pixel_variance64x8_sse2, 12),
SubpelVarianceParams(3, 6, &aom_highbd_12_sub_pixel_variance8x64_sse2, 12),
SubpelVarianceParams(5, 2, &aom_highbd_12_sub_pixel_variance32x4_sse2, 12),
@@ -1761,7 +1753,7 @@
// SubpelVarianceParams(2, 5, &aom_highbd_8_sub_pixel_variance4x32_sse2, 8),
SubpelVarianceParams(6, 2, &aom_highbd_8_sub_pixel_variance64x4_sse2, 8),
// SubpelVarianceParams(2, 6, &aom_highbd_8_sub_pixel_variance4x64_sse2, 8),
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(SSE2, AvxHBDSubpelVarianceTest,
::testing::ValuesIn(kArrayHBDSubpelVariance_sse2));
@@ -1777,11 +1769,9 @@
12),
SubpelAvgVarianceParams(5, 4, &aom_highbd_12_sub_pixel_avg_variance32x16_sse2,
12),
-#if !CONFIG_FLEX_PARTITION
+#if !CONFIG_EXT_RECUR_PARTITIONS
SubpelAvgVarianceParams(4, 5, &aom_highbd_12_sub_pixel_avg_variance16x32_sse2,
12),
-#endif // !CONFIG_FLEX_PARTITION
-#if !CONFIG_EXT_RECUR_PARTITIONS
SubpelAvgVarianceParams(4, 4, &aom_highbd_12_sub_pixel_avg_variance16x16_sse2,
12),
SubpelAvgVarianceParams(4, 3, &aom_highbd_12_sub_pixel_avg_variance16x8_sse2,
@@ -1803,11 +1793,9 @@
10),
SubpelAvgVarianceParams(5, 4, &aom_highbd_10_sub_pixel_avg_variance32x16_sse2,
10),
-#if !CONFIG_FLEX_PARTITION
+#if !CONFIG_EXT_RECUR_PARTITIONS
SubpelAvgVarianceParams(4, 5, &aom_highbd_10_sub_pixel_avg_variance16x32_sse2,
10),
-#endif // !CONFIG_FLEX_PARTITION
-#if !CONFIG_EXT_RECUR_PARTITIONS
SubpelAvgVarianceParams(4, 4, &aom_highbd_10_sub_pixel_avg_variance16x16_sse2,
10),
SubpelAvgVarianceParams(4, 3, &aom_highbd_10_sub_pixel_avg_variance16x8_sse2,
@@ -1829,11 +1817,9 @@
8),
SubpelAvgVarianceParams(5, 4, &aom_highbd_8_sub_pixel_avg_variance32x16_sse2,
8),
-#if !CONFIG_FLEX_PARTITION
+#if !CONFIG_EXT_RECUR_PARTITIONS
SubpelAvgVarianceParams(4, 5, &aom_highbd_8_sub_pixel_avg_variance16x32_sse2,
8),
-#endif // !CONFIG_FLEX_PARTITION
-#if !CONFIG_EXT_RECUR_PARTITIONS
SubpelAvgVarianceParams(4, 4, &aom_highbd_8_sub_pixel_avg_variance16x16_sse2,
8),
SubpelAvgVarianceParams(4, 3, &aom_highbd_8_sub_pixel_avg_variance16x8_sse2,
@@ -1848,10 +1834,10 @@
SubpelAvgVarianceParams(6, 4, &aom_highbd_12_sub_pixel_avg_variance64x16_sse2,
12),
-#if !CONFIG_FLEX_PARTITION
+#if !CONFIG_EXT_RECUR_PARTITIONS
SubpelAvgVarianceParams(4, 6, &aom_highbd_12_sub_pixel_avg_variance16x64_sse2,
12),
-#endif // !CONFIG_FLEX_PARTITION
+#endif // !CONFIG_EXT_RECUR_PARTITIONS
SubpelAvgVarianceParams(5, 3, &aom_highbd_12_sub_pixel_avg_variance32x8_sse2,
12),
SubpelAvgVarianceParams(3, 5, &aom_highbd_12_sub_pixel_avg_variance8x32_sse2,
@@ -1864,10 +1850,10 @@
// &aom_highbd_12_sub_pixel_avg_variance4x16_sse2, 12),
SubpelAvgVarianceParams(6, 4, &aom_highbd_10_sub_pixel_avg_variance64x16_sse2,
10),
-#if !CONFIG_FLEX_PARTITION
+#if !CONFIG_EXT_RECUR_PARTITIONS
SubpelAvgVarianceParams(4, 6, &aom_highbd_10_sub_pixel_avg_variance16x64_sse2,
10),
-#endif // !CONFIG_FLEX_PARTITION
+#endif // !CONFIG_EXT_RECUR_PARTITIONS
SubpelAvgVarianceParams(5, 3, &aom_highbd_10_sub_pixel_avg_variance32x8_sse2,
10),
SubpelAvgVarianceParams(3, 5, &aom_highbd_10_sub_pixel_avg_variance8x32_sse2,
@@ -1880,10 +1866,10 @@
// &aom_highbd_10_sub_pixel_avg_variance4x16_sse2, 10),
SubpelAvgVarianceParams(6, 4, &aom_highbd_8_sub_pixel_avg_variance64x16_sse2,
8),
-#if !CONFIG_FLEX_PARTITION
+#if !CONFIG_EXT_RECUR_PARTITIONS
SubpelAvgVarianceParams(4, 6, &aom_highbd_8_sub_pixel_avg_variance16x64_sse2,
8),
-#endif // !CONFIG_FLEX_PARTITION
+#endif // !CONFIG_EXT_RECUR_PARTITIONS
SubpelAvgVarianceParams(5, 3, &aom_highbd_8_sub_pixel_avg_variance32x8_sse2,
8),
SubpelAvgVarianceParams(3, 5, &aom_highbd_8_sub_pixel_avg_variance8x32_sse2,
@@ -1894,7 +1880,7 @@
#endif // !CONFIG_EXT_RECUR_PARTITIONS
// SubpelAvgVarianceParams(2, 4,
// &aom_highbd_8_sub_pixel_avg_variance4x16_sse2, 8),
-#if CONFIG_FLEX_PARTITION
+#if CONFIG_EXT_RECUR_PARTITIONS
SubpelAvgVarianceParams(6, 3, &aom_highbd_12_sub_pixel_avg_variance64x8_sse2,
12),
SubpelAvgVarianceParams(3, 6, &aom_highbd_12_sub_pixel_avg_variance8x64_sse2,
@@ -1935,7 +1921,7 @@
8),
// SubpelAvgVarianceParams(2, 6,
//` &aom_highbd_8_sub_pixel_avg_variance4x64_sse2, 8),
-#endif // CONFIG_FLEX_PARTITION
+#endif // CONFIG_EXT_RECUR_PARTITIONS
};
INSTANTIATE_TEST_SUITE_P(SSE2, AvxHBDSubpelAvgVarianceTest,
diff --git a/tools/aom_entropy_optimizer.c b/tools/aom_entropy_optimizer.c
index 0743795..65a8e36 100644
--- a/tools/aom_entropy_optimizer.c
+++ b/tools/aom_entropy_optimizer.c
@@ -635,7 +635,6 @@
"[PARTITION_STRUCTURE_NUM][PARTITION_CONTEXTS][CDF_SIZE(2)]",
0, &total_count, 40, mem_wanted,
"Partitions"); // minus unused context entries
-#if CONFIG_BLOCK_256
cts_each_dim[0] = PARTITION_STRUCTURE_NUM;
cts_each_dim[1] = SQUARE_SPLIT_CONTEXTS;
cts_each_dim[2] = 2;
@@ -648,7 +647,6 @@
cts_each_dim[0] = PARTITION_STRUCTURE_NUM;
cts_each_dim[1] = PARTITION_CONTEXTS;
cts_each_dim[2] = 2;
-#endif // CONFIG_BLOCK_256
optimize_cdf_table(
&fc.rect_type[0][0][0], probsfile, 3, cts_each_dim,
"static aom_cdf_prob default_rect_type_cdf"
