Remove funcs/arrays/enums related to 128X32 or 32X128 block
128x32 and 32x128 is not longer supported
Change-Id: I6878b834f8600ba75d00cc43c674cec9304c028d
diff --git a/aom_dsp/aom_dsp_rtcd_defs.pl b/aom_dsp/aom_dsp_rtcd_defs.pl
index 09445e1..7381877 100755
--- a/aom_dsp/aom_dsp_rtcd_defs.pl
+++ b/aom_dsp/aom_dsp_rtcd_defs.pl
@@ -53,8 +53,6 @@
push @block_sizes, [32, 8];
push @block_sizes, [16, 64];
push @block_sizes, [64, 16];
-push @block_sizes, [32, 128];
-push @block_sizes, [128, 32];
@tx_dims = (2, 4, 8, 16, 32, 64);
@tx_sizes = ();
@@ -615,8 +613,6 @@
specialize qw/aom_jnt_sad32x8_avg ssse3/;
specialize qw/aom_jnt_sad16x64_avg ssse3/;
specialize qw/aom_jnt_sad64x16_avg ssse3/;
- specialize qw/aom_jnt_sad32x128_avg ssse3/;
- specialize qw/aom_jnt_sad128x32_avg ssse3/;
add_proto qw/unsigned int/, "aom_sad4xh", "const uint8_t *a, int a_stride, const uint8_t *b, int b_stride, int width, int height";
add_proto qw/unsigned int/, "aom_sad8xh", "const uint8_t *a, int a_stride, const uint8_t *b, int b_stride, int width, int height";
@@ -942,8 +938,6 @@
specialize qw/aom_variance128x128 sse2 avx2 /;
specialize qw/aom_variance128x64 sse2 avx2 /;
specialize qw/aom_variance64x128 sse2 avx2 /;
- specialize qw/aom_variance128x32 sse2 avx2 /;
- specialize qw/aom_variance32x128 sse2 avx2 /;
specialize qw/aom_variance64x64 sse2 avx2 neon msa/;
specialize qw/aom_variance64x32 sse2 avx2 neon msa/;
specialize qw/aom_variance32x64 sse2 neon msa/;
@@ -1025,8 +1019,6 @@
specialize qw/aom_jnt_sub_pixel_avg_variance32x8 ssse3/;
specialize qw/aom_jnt_sub_pixel_avg_variance16x64 ssse3/;
specialize qw/aom_jnt_sub_pixel_avg_variance64x16 ssse3/;
- specialize qw/aom_jnt_sub_pixel_avg_variance128x32 ssse3/;
- specialize qw/aom_jnt_sub_pixel_avg_variance32x128 ssse3/;
specialize qw/aom_jnt_sub_pixel_avg_variance128x128 ssse3/;
specialize qw/aom_jnt_sub_pixel_avg_variance128x64 ssse3/;
diff --git a/aom_dsp/sad.c b/aom_dsp/sad.c
index 43b10b6..47b657c 100644
--- a/aom_dsp/sad.c
+++ b/aom_dsp/sad.c
@@ -189,10 +189,6 @@
sadMxNx4D(16, 64)
sadMxN(64, 16)
sadMxNx4D(64, 16)
-sadMxN(32, 128)
-sadMxNx4D(32, 128)
-sadMxN(128, 32)
-sadMxNx4D(128, 32)
#endif
/* clang-format on */
@@ -369,9 +365,5 @@
highbd_sadMxNx4D(16, 64)
highbd_sadMxN(64, 16)
highbd_sadMxNx4D(64, 16)
-highbd_sadMxN(32, 128)
-highbd_sadMxNx4D(32, 128)
-highbd_sadMxN(128, 32)
-highbd_sadMxNx4D(128, 32)
#endif
/* clang-format on */
diff --git a/aom_dsp/sad_av1.c b/aom_dsp/sad_av1.c
index 9216480..27ee643 100644
--- a/aom_dsp/sad_av1.c
+++ b/aom_dsp/sad_av1.c
@@ -77,8 +77,6 @@
MASKSADMxN(32, 8)
MASKSADMxN(16, 64)
MASKSADMxN(64, 16)
-MASKSADMxN(32, 128)
-MASKSADMxN(128, 32)
/* clang-format on */
@@ -147,8 +145,6 @@
HIGHBD_MASKSADMXN(32, 8)
HIGHBD_MASKSADMXN(16, 64)
HIGHBD_MASKSADMXN(64, 16)
-HIGHBD_MASKSADMXN(32, 128)
-HIGHBD_MASKSADMXN(128, 32)
#endif
// pre: predictor being evaluated
@@ -204,8 +200,6 @@
OBMCSADMxN(32, 8)
OBMCSADMxN(16, 64)
OBMCSADMxN(64, 16)
-OBMCSADMxN(32, 128)
-OBMCSADMxN(128, 32)
#endif
/* clang-format on */
@@ -261,8 +255,6 @@
HIGHBD_OBMCSADMXN(32, 8)
HIGHBD_OBMCSADMXN(16, 64)
HIGHBD_OBMCSADMXN(64, 16)
-HIGHBD_OBMCSADMXN(32, 128)
-HIGHBD_OBMCSADMXN(128, 32)
#endif
/* clang-format on */
#endif // CONFIG_AV1
diff --git a/aom_dsp/variance.c b/aom_dsp/variance.c
index a48246c..91e3b1c 100644
--- a/aom_dsp/variance.c
+++ b/aom_dsp/variance.c
@@ -275,8 +275,6 @@
VARIANCES(32, 8)
VARIANCES(16, 64)
VARIANCES(64, 16)
-VARIANCES(32, 128)
-VARIANCES(128, 32)
#endif // CONFIG_AV1
GET_VAR(16, 16)
@@ -785,8 +783,6 @@
HIGHBD_VARIANCES(32, 8)
HIGHBD_VARIANCES(16, 64)
HIGHBD_VARIANCES(64, 16)
-HIGHBD_VARIANCES(32, 128)
-HIGHBD_VARIANCES(128, 32)
#endif // CONFIG_AV1
HIGHBD_GET_VAR(8)
@@ -1009,8 +1005,6 @@
MASK_SUBPIX_VAR(32, 8)
MASK_SUBPIX_VAR(16, 64)
MASK_SUBPIX_VAR(64, 16)
-MASK_SUBPIX_VAR(32, 128)
-MASK_SUBPIX_VAR(128, 32)
void aom_highbd_comp_mask_pred_c(uint16_t *comp_pred, const uint8_t *pred8,
int width, int height, const uint8_t *ref8,
@@ -1144,8 +1138,6 @@
HIGHBD_MASK_SUBPIX_VAR(32, 8)
HIGHBD_MASK_SUBPIX_VAR(16, 64)
HIGHBD_MASK_SUBPIX_VAR(64, 16)
-HIGHBD_MASK_SUBPIX_VAR(32, 128)
-HIGHBD_MASK_SUBPIX_VAR(128, 32)
#endif // CONFIG_AV1
#if CONFIG_AV1
@@ -1254,10 +1246,6 @@
OBMC_SUBPIX_VAR(16, 64)
OBMC_VAR(64, 16)
OBMC_SUBPIX_VAR(64, 16)
-OBMC_VAR(32, 128)
-OBMC_SUBPIX_VAR(32, 128)
-OBMC_VAR(128, 32)
-OBMC_SUBPIX_VAR(128, 32)
static INLINE void highbd_obmc_variance64(const uint8_t *pre8, int pre_stride,
const int32_t *wsrc,
@@ -1450,8 +1438,4 @@
HIGHBD_OBMC_SUBPIX_VAR(16, 64)
HIGHBD_OBMC_VAR(64, 16)
HIGHBD_OBMC_SUBPIX_VAR(64, 16)
-HIGHBD_OBMC_VAR(32, 128)
-HIGHBD_OBMC_SUBPIX_VAR(32, 128)
-HIGHBD_OBMC_VAR(128, 32)
-HIGHBD_OBMC_SUBPIX_VAR(128, 32)
#endif // CONFIG_AV1
diff --git a/aom_dsp/x86/highbd_subtract_sse2.c b/aom_dsp/x86/highbd_subtract_sse2.c
index f373862..5a2d7f0 100644
--- a/aom_dsp/x86/highbd_subtract_sse2.c
+++ b/aom_dsp/x86/highbd_subtract_sse2.c
@@ -213,8 +213,6 @@
SUBTRACT_FUN(32x8) { STACK_H(16, subtract_16x8); }
SUBTRACT_FUN(16x64) { STACK_V(32, subtract_16x32); }
SUBTRACT_FUN(64x16) { STACK_H(32, subtract_32x16); }
-SUBTRACT_FUN(32x128) { STACK_V(64, subtract_32x64); }
-SUBTRACT_FUN(128x32) { STACK_H(64, subtract_64x32); }
static SubtractWxHFuncType getSubtractFunc(int rows, int cols) {
if (rows == 4) {
@@ -240,7 +238,6 @@
if (cols == 16) return subtract_16x32;
if (cols == 32) return subtract_32x32;
if (cols == 64) return subtract_64x32;
- if (cols == 128) return subtract_128x32;
}
if (rows == 64) {
if (cols == 16) return subtract_16x64;
@@ -249,7 +246,6 @@
if (cols == 128) return subtract_128x64;
}
if (rows == 128) {
- if (cols == 32) return subtract_32x128;
if (cols == 64) return subtract_64x128;
if (cols == 128) return subtract_128x128;
}
diff --git a/aom_dsp/x86/jnt_sad_ssse3.c b/aom_dsp/x86/jnt_sad_ssse3.c
index 925b307..47e8a0b 100644
--- a/aom_dsp/x86/jnt_sad_ssse3.c
+++ b/aom_dsp/x86/jnt_sad_ssse3.c
@@ -241,7 +241,5 @@
jnt_sadMxN_sse2(32, 8)
jnt_sadMxN_sse2(16, 64)
jnt_sadMxN_sse2(64, 16)
-jnt_sadMxN_sse2(32, 128)
-jnt_sadMxN_sse2(128, 32)
#endif
/* clang-format on */
diff --git a/aom_dsp/x86/jnt_variance_ssse3.c b/aom_dsp/x86/jnt_variance_ssse3.c
index f89db73..c731af0 100644
--- a/aom_dsp/x86/jnt_variance_ssse3.c
+++ b/aom_dsp/x86/jnt_variance_ssse3.c
@@ -298,6 +298,4 @@
JNT_SUBPIX_AVG_VAR(32, 8)
JNT_SUBPIX_AVG_VAR(16, 64)
JNT_SUBPIX_AVG_VAR(64, 16)
-JNT_SUBPIX_AVG_VAR(32, 128)
-JNT_SUBPIX_AVG_VAR(128, 32)
#endif // CONFIG_AV1
diff --git a/aom_dsp/x86/masked_sad_intrin_ssse3.c b/aom_dsp/x86/masked_sad_intrin_ssse3.c
index f5c63e8..4e60d4e 100644
--- a/aom_dsp/x86/masked_sad_intrin_ssse3.c
+++ b/aom_dsp/x86/masked_sad_intrin_ssse3.c
@@ -97,8 +97,6 @@
MASKSADMXN_SSSE3(32, 8)
MASKSADMXN_SSSE3(16, 64)
MASKSADMXN_SSSE3(64, 16)
-MASKSADMXN_SSSE3(32, 128)
-MASKSADMXN_SSSE3(128, 32)
static INLINE unsigned int masked_sad_ssse3(const uint8_t *src_ptr,
int src_stride,
@@ -292,8 +290,6 @@
HIGHBD_MASKSADMXN_SSSE3(32, 8)
HIGHBD_MASKSADMXN_SSSE3(16, 64)
HIGHBD_MASKSADMXN_SSSE3(64, 16)
-HIGHBD_MASKSADMXN_SSSE3(32, 128)
-HIGHBD_MASKSADMXN_SSSE3(128, 32)
static INLINE unsigned int highbd_masked_sad_ssse3(
const uint8_t *src8, int src_stride, const uint8_t *a8, int a_stride,
diff --git a/aom_dsp/x86/masked_variance_intrin_ssse3.c b/aom_dsp/x86/masked_variance_intrin_ssse3.c
index 89deb0e..6706b94 100644
--- a/aom_dsp/x86/masked_variance_intrin_ssse3.c
+++ b/aom_dsp/x86/masked_variance_intrin_ssse3.c
@@ -131,8 +131,6 @@
MASK_SUBPIX_VAR_SSSE3(32, 8)
MASK_SUBPIX_VAR_SSSE3(64, 16)
MASK_SUBPIX_VAR_SSSE3(16, 64)
-MASK_SUBPIX_VAR_SSSE3(128, 32)
-MASK_SUBPIX_VAR_SSSE3(32, 128)
static INLINE __m128i filter_block(const __m128i a, const __m128i b,
const __m128i filter) {
@@ -711,8 +709,6 @@
HIGHBD_MASK_SUBPIX_VAR_SSSE3(32, 8)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(16, 64)
HIGHBD_MASK_SUBPIX_VAR_SSSE3(64, 16)
-HIGHBD_MASK_SUBPIX_VAR_SSSE3(32, 128)
-HIGHBD_MASK_SUBPIX_VAR_SSSE3(128, 32)
static INLINE __m128i highbd_filter_block(const __m128i a, const __m128i b,
const __m128i filter) {
diff --git a/aom_dsp/x86/obmc_variance_sse4.c b/aom_dsp/x86/obmc_variance_sse4.c
index 4175986..147476a 100644
--- a/aom_dsp/x86/obmc_variance_sse4.c
+++ b/aom_dsp/x86/obmc_variance_sse4.c
@@ -150,8 +150,6 @@
OBMCVARWXH(32, 8)
OBMCVARWXH(16, 64)
OBMCVARWXH(64, 16)
-OBMCVARWXH(32, 128)
-OBMCVARWXH(128, 32)
////////////////////////////////////////////////////////////////////////////////
// High bit-depth
@@ -362,5 +360,3 @@
HBD_OBMCVARWXH(32, 8)
HBD_OBMCVARWXH(16, 64)
HBD_OBMCVARWXH(64, 16)
-HBD_OBMCVARWXH(32, 128)
-HBD_OBMCVARWXH(128, 32)
diff --git a/aom_dsp/x86/variance_avx2.c b/aom_dsp/x86/variance_avx2.c
index 0d94e6c..c2ea8ba 100644
--- a/aom_dsp/x86/variance_avx2.c
+++ b/aom_dsp/x86/variance_avx2.c
@@ -82,8 +82,6 @@
AOM_VAR_AVX2(128, 128, 32, 14);
AOM_VAR_AVX2(128, 64, 32, 13);
AOM_VAR_AVX2(64, 128, 32, 13);
-AOM_VAR_AVX2(128, 32, 32, 12);
-AOM_VAR_AVX2(32, 128, 32, 12);
unsigned int aom_sub_pixel_variance32xh_avx2(const uint8_t *src, int src_stride,
int x_offset, int y_offset,
diff --git a/aom_dsp/x86/variance_sse2.c b/aom_dsp/x86/variance_sse2.c
index cd0605a..abb2933 100644
--- a/aom_dsp/x86/variance_sse2.c
+++ b/aom_dsp/x86/variance_sse2.c
@@ -270,8 +270,6 @@
AOM_VAR_16_SSE2(128, 128, 14);
AOM_VAR_16_SSE2(128, 64, 13);
AOM_VAR_16_SSE2(64, 128, 13);
-AOM_VAR_16_SSE2(128, 32, 12);
-AOM_VAR_16_SSE2(32, 128, 12);
unsigned int aom_mse8x8_sse2(const uint8_t *src, int src_stride,
const uint8_t *ref, int ref_stride,
diff --git a/av1/common/av1_loopfilter.c b/av1/common/av1_loopfilter.c
index ff8ef83..0376bd0 100644
--- a/av1/common/av1_loopfilter.c
+++ b/av1/common/av1_loopfilter.c
@@ -59,8 +59,6 @@
32 - 1, // BLOCK_32X8,
16 - 1, // BLOCK_16X64,
64 - 1, // BLOCK_64X16
- 32 - 1, // BLOCK_32X128
- 128 - 1, // BLOCK_128X32
},
// mask for horizontal edges filtering
{
@@ -86,8 +84,6 @@
8 - 1, // BLOCK_32X8,
64 - 1, // BLOCK_16X64,
16 - 1, // BLOCK_64X16
- 128 - 1, // BLOCK_32X128
- 32 - 1, // BLOCK_128X32
},
};
@@ -490,11 +486,7 @@
0x000f000f000f000fULL, 0x000f000f000f000fULL, 0x000f000f000f000fULL } },
{ { 0xffffffffffffffffULL, // BLOCK_64X16
- 0x0000000000000000ULL, 0x0000000000000000ULL, 0x0000000000000000ULL } },
- // BLOCK_32X128
- { { 0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL } },
- // BLOCK_128X32
- { { 0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL } },
+ 0x0000000000000000ULL, 0x0000000000000000ULL, 0x0000000000000000ULL } }
};
// U/V plane max transform size is 32x32 (format 420).
@@ -570,8 +562,6 @@
0x000000000000ffffULL, // BLOCK_32X8,
0x0f0f0f0f0f0f0f0fULL, // BLOCK_16X64,
0x00000000ffffffffULL, // BLOCK_64X16
- 0xffffffffffffffffULL, // BLOCK_32X128,
- 0xffffffffffffffffULL, // BLOCK_128X32,
};
static LoopFilterMask *get_loop_filter_mask(AV1_COMMON *const cm, int mi_row,
diff --git a/av1/common/cdef.c b/av1/common/cdef.c
index 9ff36a1..50ec714 100644
--- a/av1/common/cdef.c
+++ b/av1/common/cdef.c
@@ -55,11 +55,11 @@
int maxc = cm->mi_cols - mi_col;
int maxr = cm->mi_rows - mi_row;
- if (bs == BLOCK_128X128 || bs == BLOCK_128X64 || bs == BLOCK_128X32)
+ if (bs == BLOCK_128X128 || bs == BLOCK_128X64)
maxc = AOMMIN(maxc, MI_SIZE_128X128);
else
maxc = AOMMIN(maxc, MI_SIZE_64X64);
- if (bs == BLOCK_128X128 || bs == BLOCK_64X128 || bs == BLOCK_32X128)
+ if (bs == BLOCK_128X128 || bs == BLOCK_64X128)
maxr = AOMMIN(maxr, MI_SIZE_128X128);
else
maxr = AOMMIN(maxr, MI_SIZE_64X64);
diff --git a/av1/common/common_data.h b/av1/common/common_data.h
index 64b26d5..72d75a7 100644
--- a/av1/common/common_data.h
+++ b/av1/common/common_data.h
@@ -22,6 +22,7 @@
#define IF_EXT_PARTITION(...) __VA_ARGS__,
+/* clang-format off */
// Log 2 conversion lookup tables for block width and height
static const uint8_t b_width_log2_lookup[BLOCK_SIZES_ALL] = {
0, 0,
@@ -33,7 +34,7 @@
4, IF_EXT_PARTITION(4, 5, 5) 0,
2, 1,
3, 2,
- 4, IF_EXT_PARTITION(3, 5)
+ 4
};
static const uint8_t b_height_log2_lookup[BLOCK_SIZES_ALL] = {
0, 1,
@@ -45,7 +46,7 @@
4, IF_EXT_PARTITION(5, 4, 5) 2,
0, 3,
1, 4,
- 2, IF_EXT_PARTITION(5, 3)
+ 2
};
// Log 2 conversion lookup tables for modeinfo width and height
static const uint8_t mi_width_log2_lookup[BLOCK_SIZES_ALL] = {
@@ -58,7 +59,7 @@
4, IF_EXT_PARTITION(4, 5, 5) 0,
2, 1,
3, 2,
- 4, IF_EXT_PARTITION(3, 5)
+ 4
};
static const uint8_t mi_height_log2_lookup[BLOCK_SIZES_ALL] = {
0, 1,
@@ -70,20 +71,18 @@
4, IF_EXT_PARTITION(5, 4, 5) 2,
0, 3,
1, 4,
- 2, IF_EXT_PARTITION(5, 3)
+ 2
};
-/* clang-format off */
static const uint8_t mi_size_wide[BLOCK_SIZES_ALL] = {
1, 1, 2, 2, 2, 4, 4, 4, 8, 8, 8, 16, 16,
- IF_EXT_PARTITION(16, 32, 32) 1, 4, 2, 8, 4, 16, IF_EXT_PARTITION(8, 32)
+ IF_EXT_PARTITION(16, 32, 32) 1, 4, 2, 8, 4, 16
};
static const uint8_t mi_size_high[BLOCK_SIZES_ALL] = {
1, 2, 1, 2, 4, 2, 4, 8, 4, 8, 16, 8, 16,
- IF_EXT_PARTITION(32, 16, 32) 4, 1, 8, 2, 16, 4, IF_EXT_PARTITION(32, 8)
+ IF_EXT_PARTITION(32, 16, 32) 4, 1, 8, 2, 16, 4
};
-/* clang-format on */
// Width/height lookup tables in units of various block sizes
static const uint8_t block_size_wide[BLOCK_SIZES_ALL] = {
@@ -96,7 +95,7 @@
64, IF_EXT_PARTITION(64, 128, 128) 4,
16, 8,
32, 16,
- 64, IF_EXT_PARTITION(32, 128)
+ 64
};
static const uint8_t block_size_high[BLOCK_SIZES_ALL] = {
@@ -109,7 +108,7 @@
64, IF_EXT_PARTITION(128, 64, 128) 16,
4, 32,
8, 64,
- 16, IF_EXT_PARTITION(128, 32)
+ 16
};
static const uint8_t num_4x4_blocks_wide_lookup[BLOCK_SIZES_ALL] = {
@@ -122,7 +121,7 @@
16, IF_EXT_PARTITION(16, 32, 32) 1,
4, 2,
8, 4,
- 16, IF_EXT_PARTITION(8, 32)
+ 16
};
static const uint8_t num_4x4_blocks_high_lookup[BLOCK_SIZES_ALL] = {
1, 2,
@@ -134,7 +133,7 @@
16, IF_EXT_PARTITION(32, 16, 32) 4,
1, 8,
2, 16,
- 4, IF_EXT_PARTITION(32, 8)
+ 4
};
static const uint8_t num_8x8_blocks_wide_lookup[BLOCK_SIZES_ALL] = {
1, 1,
@@ -146,7 +145,7 @@
8, IF_EXT_PARTITION(8, 16, 16) 1,
2, 1,
4, 2,
- 8, IF_EXT_PARTITION(4, 16)
+ 8
};
static const uint8_t num_8x8_blocks_high_lookup[BLOCK_SIZES_ALL] = {
1, 1,
@@ -158,7 +157,7 @@
8, IF_EXT_PARTITION(16, 8, 16) 2,
1, 4,
1, 8,
- 2, IF_EXT_PARTITION(16, 4)
+ 2
};
// AOMMIN(3, AOMMIN(b_width_log2(bsize), b_height_log2(bsize)))
@@ -172,7 +171,7 @@
3, IF_EXT_PARTITION(3, 3, 3) 0,
0, 1,
1, 2,
- 2, IF_EXT_PARTITION(3, 3)
+ 2
};
static const uint8_t num_pels_log2_lookup[BLOCK_SIZES_ALL] = {
@@ -185,8 +184,9 @@
12, IF_EXT_PARTITION(13, 13, 14) 6,
6, 8,
8, 10,
- 10, IF_EXT_PARTITION(12, 12)
+ 10
};
+/* clang-format on */
/* clang-format off */
static const BLOCK_SIZE subsize_lookup[EXT_PARTITION_TYPES][BLOCK_SIZES_ALL] =
@@ -207,9 +207,7 @@
// 4X16, 16X4, 8X32
BLOCK_4X16, BLOCK_16X4, BLOCK_8X32,
// 32X8, 16X64, 64X16
- BLOCK_32X8, BLOCK_16X64, BLOCK_64X16,
- // 32x128, 128x32
- BLOCK_32X128, BLOCK_128X32
+ BLOCK_32X8, BLOCK_16X64, BLOCK_64X16
}, { // PARTITION_HORZ
// 4X4
BLOCK_INVALID,
@@ -226,9 +224,7 @@
// 4X16, 16X4, 8X32
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 32X8, 16X64, 64X16
- BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
- // 32x128, 128x32
- BLOCK_INVALID, BLOCK_INVALID
+ BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID
}, { // PARTITION_VERT
// 4X4
BLOCK_INVALID,
@@ -245,9 +241,7 @@
// 4X16, 16X4, 8X32
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 32X8, 16X64, 64X16
- BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
- // 32x128, 128x32
- BLOCK_INVALID, BLOCK_INVALID
+ BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID
}, { // PARTITION_SPLIT
// 4X4
BLOCK_INVALID,
@@ -264,9 +258,7 @@
// 4X16, 16X4, 8X32
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 32X8, 16X64, 64X16
- BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
- // 32x128, 128x32
- BLOCK_INVALID, BLOCK_INVALID
+ BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID
}, { // PARTITION_HORZ_A
// 4X4
BLOCK_INVALID,
@@ -284,8 +276,6 @@
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 32X8, 16X64, 64X16
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
- // 32x128, 128x32
- BLOCK_INVALID, BLOCK_INVALID
}, { // PARTITION_HORZ_B
// 4X4
BLOCK_INVALID,
@@ -302,9 +292,7 @@
// 4X16, 16X4, 8X32
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 32X8, 16X64, 64X16
- BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
- // 32x128, 128x32
- BLOCK_INVALID, BLOCK_INVALID
+ BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID
}, { // PARTITION_VERT_A
// 4X4
BLOCK_INVALID,
@@ -321,9 +309,7 @@
// 4X16, 16X4, 8X32
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 32X8, 16X64, 64X16
- BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
- // 32x128, 128x32
- BLOCK_INVALID, BLOCK_INVALID
+ BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID
}, { // PARTITION_VERT_B
// 4X4
BLOCK_INVALID,
@@ -340,9 +326,7 @@
// 4X16, 16X4, 8X32
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 32X8, 16X64, 64X16
- BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
- // 32x128, 128x32
- BLOCK_INVALID, BLOCK_INVALID
+ BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID
}, { // PARTITION_HORZ_4
// 4X4
BLOCK_INVALID,
@@ -355,13 +339,11 @@
// 32X64, 64X32, 64X64
BLOCK_INVALID, BLOCK_INVALID, BLOCK_64X16,
// 64x128, 128x64, 128x128
- BLOCK_INVALID, BLOCK_INVALID, BLOCK_128X32,
+ BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 4X16, 16X4, 8X32
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 32X8, 16X64, 64X16
- BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
- // 32x128, 128x32
- BLOCK_INVALID, BLOCK_INVALID
+ BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID
}, { // PARTITION_VERT_4
// 4X4
BLOCK_INVALID,
@@ -374,13 +356,11 @@
// 32X64, 64X32, 64X64
BLOCK_INVALID, BLOCK_INVALID, BLOCK_16X64,
// 64x128, 128x64, 128x128
- BLOCK_INVALID, BLOCK_INVALID, BLOCK_32X128,
+ BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 4X16, 16X4, 8X32
BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
// 32X8, 16X64, 64X16
- BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID,
- // 32x128, 128x32
- BLOCK_INVALID, BLOCK_INVALID
+ BLOCK_INVALID, BLOCK_INVALID, BLOCK_INVALID
}
};
@@ -402,9 +382,7 @@
// 4x16, 16x4, 8x32
TX_4X4, TX_4X4, TX_8X8,
// 32x8, 16x64 64x16
- TX_8X8, TX_16X16, TX_16X16,
- // 32x128 128x32
- TX_32X32, TX_32X32
+ TX_8X8, TX_16X16, TX_16X16
};
static const TX_SIZE max_txsize_rect_lookup[BLOCK_SIZES_ALL] = {
@@ -427,9 +405,7 @@
// 8x32, 32x8
TX_8X32, TX_32X8,
// 16x64, 64x16
- TX_16X64, TX_64X16,
- // 32x128 128x32
- TX_32X64, TX_64X32
+ TX_16X64, TX_64X16
};
static const TX_TYPE_1D vtx_tab[TX_TYPES] = {
@@ -693,17 +669,15 @@
{ { BLOCK_32X64, BLOCK_32X32 }, { BLOCK_16X64, BLOCK_16X32 } },
{ { BLOCK_64X32, BLOCK_64X16 }, { BLOCK_32X32, BLOCK_32X16 } },
{ { BLOCK_64X64, BLOCK_64X32 }, { BLOCK_32X64, BLOCK_32X32 } },
- { { BLOCK_64X128, BLOCK_64X64 }, { BLOCK_32X128, BLOCK_32X64 } },
- { { BLOCK_128X64, BLOCK_128X32 }, { BLOCK_64X64, BLOCK_64X32 } },
+ { { BLOCK_64X128, BLOCK_64X64 }, { BLOCK_INVALID, BLOCK_32X64 } },
+ { { BLOCK_128X64, BLOCK_INVALID }, { BLOCK_64X64, BLOCK_64X32 } },
{ { BLOCK_128X128, BLOCK_128X64 }, { BLOCK_64X128, BLOCK_64X64 } },
{ { BLOCK_4X16, BLOCK_4X8 }, { BLOCK_4X16, BLOCK_4X8 } },
{ { BLOCK_16X4, BLOCK_16X4 }, { BLOCK_8X4, BLOCK_8X4 } },
{ { BLOCK_8X32, BLOCK_8X16 }, { BLOCK_INVALID, BLOCK_4X16 } },
{ { BLOCK_32X8, BLOCK_INVALID }, { BLOCK_16X8, BLOCK_16X4 } },
{ { BLOCK_16X64, BLOCK_16X32 }, { BLOCK_INVALID, BLOCK_8X32 } },
- { { BLOCK_64X16, BLOCK_INVALID }, { BLOCK_32X16, BLOCK_32X8 } },
- { { BLOCK_32X128, BLOCK_32X64 }, { BLOCK_INVALID, BLOCK_16X64 } },
- { { BLOCK_128X32, BLOCK_INVALID }, { BLOCK_64X32, BLOCK_64X16 } },
+ { { BLOCK_64X16, BLOCK_INVALID }, { BLOCK_32X16, BLOCK_32X8 } }
};
// Generates 5 bit field in which each bit set to 1 represents
@@ -736,8 +710,6 @@
{ 24, 30 }, // 32X8 - {0b11000, 0b11110}
{ 28, 16 }, // 16X64 - {0b11100, 0b10000}
{ 16, 28 }, // 64X16 - {0b10000, 0b11100}
- { 24, 0 }, // 32X128- {0b11000, 0b00000}
- { 0, 24 }, // 128X32- {0b00000, 0b11000}
};
/* clang-format on */
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 56ee030..f640718 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -65,7 +65,7 @@
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) }, // 208, 1
- { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
+ { AOM_CDF2(16384) }
};
#if WEDGE_IDX_ENTROPY_CODING
@@ -113,10 +113,6 @@
{ 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) },
- { AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384, 18432,
20480, 22528, 24576, 26624, 28672, 30720) } };
#endif
@@ -142,7 +138,7 @@
{ AOM_CDF2(128 * 128) }, { AOM_CDF2(255 * 128) }, { AOM_CDF2(255 * 128) },
{ AOM_CDF2(255 * 128) }, { AOM_CDF2(208 * 128) }, { AOM_CDF2(208 * 128) },
{ AOM_CDF2(208 * 128) }, { AOM_CDF2(208 * 128) }, { AOM_CDF2(255 * 128) },
- { AOM_CDF2(255 * 128) }, { AOM_CDF2(255 * 128) }, { AOM_CDF2(255 * 128) },
+ { AOM_CDF2(255 * 128) },
};
static const aom_cdf_prob
@@ -158,7 +154,6 @@
{ AOM_CDF3(32640, 32740) }, { AOM_CDF3(32640, 32740) },
{ AOM_CDF3(32640, 32740) }, { AOM_CDF3(32640, 32740) },
{ AOM_CDF3(32640, 32740) }, { AOM_CDF3(32640, 32740) },
- { AOM_CDF3(32256, 32656) }, { AOM_CDF3(32256, 32656) },
};
static const aom_cdf_prob default_obmc_cdf[BLOCK_SIZES_ALL][CDF_SIZE(2)] = {
@@ -169,7 +164,7 @@
{ AOM_CDF2(231 * 128) }, { AOM_CDF2(252 * 128) }, { AOM_CDF2(252 * 128) },
{ AOM_CDF2(252 * 128) }, { AOM_CDF2(208 * 128) }, { AOM_CDF2(208 * 128) },
{ AOM_CDF2(208 * 128) }, { AOM_CDF2(208 * 128) }, { AOM_CDF2(208 * 128) },
- { AOM_CDF2(208 * 128) }, { AOM_CDF2(252 * 128) }, { AOM_CDF2(252 * 128) },
+ { AOM_CDF2(208 * 128) },
};
static const aom_cdf_prob default_delta_q_cdf[CDF_SIZE(DELTA_Q_PROBS + 1)] = {
@@ -584,7 +579,7 @@
{ AOM_CDF2(30378) }, { AOM_CDF2(30378) }, { AOM_CDF2(30378) },
{ AOM_CDF2(30378) }, { AOM_CDF2(10985) }, { AOM_CDF2(10985) },
{ AOM_CDF2(15723) }, { AOM_CDF2(15723) }, { AOM_CDF2(30378) },
- { AOM_CDF2(30378) }, { AOM_CDF2(30378) }, { AOM_CDF2(30378) },
+ { AOM_CDF2(30378) },
};
// FIXME(someone) need real defaults here
diff --git a/av1/common/enums.h b/av1/common/enums.h
index 400a238..46ffd0e 100644
--- a/av1/common/enums.h
+++ b/av1/common/enums.h
@@ -132,8 +132,6 @@
BLOCK_32X8,
BLOCK_16X64,
BLOCK_64X16,
- BLOCK_32X128,
- BLOCK_128X32,
BLOCK_SIZES_ALL,
BLOCK_SIZES = BLOCK_4X16,
BLOCK_INVALID = 255,
diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index fba1fb0..d5867c7 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -194,8 +194,6 @@
wedge_masks[BLOCK_32X8] },
{ 0, NULL, NULL, 0, NULL },
{ 0, NULL, NULL, 0, NULL },
- { 0, NULL, NULL, 0, NULL },
- { 0, NULL, NULL, 0, NULL },
};
static const uint8_t *get_wedge_mask_inplace(int wedge_index, int neg,
@@ -1684,7 +1682,7 @@
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,
- 16, 16, 8, 8, 4, 4, 2, 2
+ 16, 16, 8, 8, 4, 4
};
/* clang-format on */
diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c
index 9e03726..c416f97 100644
--- a/av1/common/reconintra.c
+++ b/av1/common/reconintra.c
@@ -123,8 +123,6 @@
};
uint8_t has_tr_16x64[2] = { 255, 127 };
uint8_t has_tr_64x16[2] = { 3, 1 };
-uint8_t has_tr_32x128[1] = { 15 };
-uint8_t has_tr_128x32[1] = { 1 };
static const uint8_t *const has_tr_tables[BLOCK_SIZES_ALL] = {
// 4X4
@@ -142,9 +140,7 @@
// 4x16, 16x4, 8x32
has_tr_4x16, has_tr_16x4, has_tr_8x32,
// 32x8, 16x64, 64x16
- has_tr_32x8, has_tr_16x64, has_tr_64x16,
- // 32x128, 128x32
- has_tr_32x128, has_tr_128x32
+ has_tr_32x8, has_tr_16x64, has_tr_64x16
};
uint8_t has_tr_vert_8x8[32] = {
@@ -312,8 +308,6 @@
};
uint8_t has_bl_16x64[2] = { 0, 0 };
uint8_t has_bl_64x16[2] = { 42, 42 };
-uint8_t has_bl_32x128[1] = { 0 };
-uint8_t has_bl_128x32[1] = { 0 };
static const uint8_t *const has_bl_tables[BLOCK_SIZES_ALL] = {
// 4X4
@@ -331,9 +325,7 @@
// 4x16, 16x4, 8x32
has_bl_4x16, has_bl_16x4, has_bl_8x32,
// 32x8, 16x64, 64x16
- has_bl_32x8, has_bl_16x64, has_bl_64x16,
- // 32x128, 128x32
- has_bl_32x128, has_bl_128x32
+ has_bl_32x8, has_bl_16x64, has_bl_64x16
};
uint8_t has_bl_vert_8x8[32] = {
diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index 8b68b36..604ea3e 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -349,8 +349,6 @@
1, // BLOCK_32X8
1, // BLOCK_16X64
1, // BLOCK_64X16
- 1, // BLOCK_32X128
- 1, // BLOCK_128X32
};
return LUT[bsize];
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 9d0372a..3537ff8 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -133,28 +133,12 @@
#if CONFIG_FP_MB_STATS
static const uint8_t num_16x16_blocks_wide_lookup[BLOCK_SIZES_ALL] = {
- 1, 1,
- 1, 1,
- 1, 1,
- 1, 1,
- 2, 2,
- 2, 4,
- 4, IF_EXT_PARTITION(4, 8, 8) 1,
- 1, 1,
- 2, 2,
- 4, IF_EXT_PARTITION(2, 8)
+ 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 4, 4, IF_EXT_PARTITION(4, 8, 8) 1,
+ 1, 1, 2, 2, 4
};
static const uint8_t num_16x16_blocks_high_lookup[BLOCK_SIZES_ALL] = {
- 1, 1,
- 1, 1,
- 1, 1,
- 1, 2,
- 1, 2,
- 4, 2,
- 4, IF_EXT_PARTITION(8, 4, 8) 1,
- 1, 2,
- 1, 4,
- 2, IF_EXT_PARTITION(8, 2)
+ 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 4, 2, 4, IF_EXT_PARTITION(8, 4, 8) 1,
+ 1, 2, 1, 4, 2
};
#endif // CONFIG_FP_MB_STATS
@@ -1943,7 +1927,6 @@
BLOCK_16X16, BLOCK_16X16, BLOCK_16X16, // 64x128, 128x64, 128x128
BLOCK_4X4, BLOCK_4X4, BLOCK_8X8, // 4x16, 16x4, 8x32
BLOCK_8X8, BLOCK_16X16, BLOCK_16X16, // 32x8, 16x64, 64x16
- BLOCK_16X16, BLOCK_16X16 // 32x128, 128x32
};
static const BLOCK_SIZE max_partition_size[BLOCK_SIZES_ALL] = {
@@ -1955,7 +1938,6 @@
BLOCK_LARGEST, BLOCK_LARGEST, BLOCK_LARGEST, // 64x128, 128x64, 128x128
BLOCK_16X16, BLOCK_16X16, BLOCK_32X32, // 4x16, 16x4, 8x32
BLOCK_32X32, BLOCK_LARGEST, BLOCK_LARGEST, // 32x8, 16x64, 64x16
- BLOCK_LARGEST, BLOCK_LARGEST // 32x128, 128x32
};
// Next square block size less or equal than current block size.
@@ -1968,7 +1950,6 @@
BLOCK_64X64, BLOCK_64X64, BLOCK_128X128, // 64x128, 128x64, 128x128
BLOCK_4X4, BLOCK_4X4, BLOCK_8X8, // 4x16, 16x4, 8x32
BLOCK_8X8, BLOCK_16X16, BLOCK_16X16, // 32x8, 16x64, 64x16
- BLOCK_32X32, BLOCK_32X32 // 32x128, 128x32
};
/* clang-format on */
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index c4e8be8..8b49621 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -1187,12 +1187,6 @@
MAKE_BFP_SAD_WRAPPER(aom_highbd_sad64x16)
MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad64x16_avg)
MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad64x16x4d)
-MAKE_BFP_SAD_WRAPPER(aom_highbd_sad32x128)
-MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad32x128_avg)
-MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad32x128x4d)
-MAKE_BFP_SAD_WRAPPER(aom_highbd_sad128x32)
-MAKE_BFP_SADAVG_WRAPPER(aom_highbd_sad128x32_avg)
-MAKE_BFP_SAD4D_WRAPPER(aom_highbd_sad128x32x4d)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad128x128_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad128x64_avg)
@@ -1216,8 +1210,6 @@
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad32x8_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad16x64_avg)
MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad64x16_avg)
-MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad32x128_avg)
-MAKE_BFP_JSADAVG_WRAPPER(aom_highbd_jnt_sad128x32_avg)
#define HIGHBD_MBFP(BT, MCSDF, MCSVF) \
cpi->fn_ptr[BT].msdf = MCSDF; \
@@ -1270,8 +1262,6 @@
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)
-MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad32x128)
-MAKE_MBFP_COMPOUND_SAD_WRAPPER(aom_highbd_masked_sad128x32)
#define HIGHBD_OBFP(BT, OSDF, OVF, OSVF) \
cpi->fn_ptr[BT].osdf = OSDF; \
@@ -1317,30 +1307,12 @@
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad32x8)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad16x64)
MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad64x16)
-MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad32x128)
-MAKE_OBFP_SAD_WRAPPER(aom_highbd_obmc_sad128x32)
static void highbd_set_var_fns(AV1_COMP *const cpi) {
AV1_COMMON *const cm = &cpi->common;
if (cm->use_highbitdepth) {
switch (cm->bit_depth) {
case AOM_BITS_8:
- HIGHBD_BFP(BLOCK_128X32, aom_highbd_sad128x32_bits8,
- aom_highbd_sad128x32_avg_bits8, aom_highbd_8_variance128x32,
- aom_highbd_8_sub_pixel_variance128x32,
- aom_highbd_8_sub_pixel_avg_variance128x32, NULL, NULL,
- aom_highbd_sad128x32x4d_bits8,
- aom_highbd_jnt_sad128x32_avg_bits8,
- aom_highbd_8_jnt_sub_pixel_avg_variance128x32)
-
- HIGHBD_BFP(BLOCK_32X128, aom_highbd_sad32x128_bits8,
- aom_highbd_sad32x128_avg_bits8, aom_highbd_8_variance32x128,
- aom_highbd_8_sub_pixel_variance32x128,
- aom_highbd_8_sub_pixel_avg_variance32x128, NULL, NULL,
- aom_highbd_sad32x128x4d_bits8,
- aom_highbd_jnt_sad32x128_avg_bits8,
- aom_highbd_8_jnt_sub_pixel_avg_variance32x128)
-
HIGHBD_BFP(BLOCK_64X16, aom_highbd_sad64x16_bits8,
aom_highbd_sad64x16_avg_bits8, aom_highbd_8_variance64x16,
aom_highbd_8_sub_pixel_variance64x16,
@@ -1549,10 +1521,6 @@
aom_highbd_8_masked_sub_pixel_variance8x4)
HIGHBD_MBFP(BLOCK_4X4, aom_highbd_masked_sad4x4_bits8,
aom_highbd_8_masked_sub_pixel_variance4x4)
- HIGHBD_MBFP(BLOCK_128X32, aom_highbd_masked_sad128x32_bits8,
- aom_highbd_8_masked_sub_pixel_variance128x32)
- HIGHBD_MBFP(BLOCK_32X128, aom_highbd_masked_sad32x128_bits8,
- aom_highbd_8_masked_sub_pixel_variance32x128)
HIGHBD_MBFP(BLOCK_64X16, aom_highbd_masked_sad64x16_bits8,
aom_highbd_8_masked_sub_pixel_variance64x16)
HIGHBD_MBFP(BLOCK_16X64, aom_highbd_masked_sad16x64_bits8,
@@ -1613,12 +1581,6 @@
HIGHBD_OBFP(BLOCK_4X4, aom_highbd_obmc_sad4x4_bits8,
aom_highbd_obmc_variance4x4,
aom_highbd_obmc_sub_pixel_variance4x4)
- HIGHBD_OBFP(BLOCK_128X32, aom_highbd_obmc_sad128x32_bits8,
- aom_highbd_obmc_variance128x32,
- aom_highbd_obmc_sub_pixel_variance128x32)
- HIGHBD_OBFP(BLOCK_32X128, aom_highbd_obmc_sad32x128_bits8,
- aom_highbd_obmc_variance32x128,
- aom_highbd_obmc_sub_pixel_variance32x128)
HIGHBD_OBFP(BLOCK_64X16, aom_highbd_obmc_sad64x16_bits8,
aom_highbd_obmc_variance64x16,
aom_highbd_obmc_sub_pixel_variance64x16)
@@ -1640,22 +1602,6 @@
break;
case AOM_BITS_10:
- HIGHBD_BFP(
- BLOCK_128X32, aom_highbd_sad128x32_bits10,
- aom_highbd_sad128x32_avg_bits10, aom_highbd_10_variance128x32,
- aom_highbd_10_sub_pixel_variance128x32,
- aom_highbd_10_sub_pixel_avg_variance128x32, NULL, NULL,
- aom_highbd_sad128x32x4d_bits10, aom_highbd_jnt_sad128x32_avg_bits10,
- aom_highbd_10_jnt_sub_pixel_avg_variance128x32);
-
- HIGHBD_BFP(
- BLOCK_32X128, aom_highbd_sad32x128_bits10,
- aom_highbd_sad32x128_avg_bits10, aom_highbd_10_variance32x128,
- aom_highbd_10_sub_pixel_variance32x128,
- aom_highbd_10_sub_pixel_avg_variance32x128, NULL, NULL,
- aom_highbd_sad32x128x4d_bits10, aom_highbd_jnt_sad32x128_avg_bits10,
- aom_highbd_10_jnt_sub_pixel_avg_variance32x128);
-
HIGHBD_BFP(BLOCK_64X16, aom_highbd_sad64x16_bits10,
aom_highbd_sad64x16_avg_bits10, aom_highbd_10_variance64x16,
aom_highbd_10_sub_pixel_variance64x16,
@@ -1871,10 +1817,6 @@
aom_highbd_10_masked_sub_pixel_variance8x4)
HIGHBD_MBFP(BLOCK_4X4, aom_highbd_masked_sad4x4_bits10,
aom_highbd_10_masked_sub_pixel_variance4x4)
- HIGHBD_MBFP(BLOCK_128X32, aom_highbd_masked_sad128x32_bits10,
- aom_highbd_10_masked_sub_pixel_variance128x32)
- HIGHBD_MBFP(BLOCK_32X128, aom_highbd_masked_sad32x128_bits10,
- aom_highbd_10_masked_sub_pixel_variance32x128)
HIGHBD_MBFP(BLOCK_64X16, aom_highbd_masked_sad64x16_bits10,
aom_highbd_10_masked_sub_pixel_variance64x16)
HIGHBD_MBFP(BLOCK_16X64, aom_highbd_masked_sad16x64_bits10,
@@ -1935,13 +1877,6 @@
HIGHBD_OBFP(BLOCK_4X4, aom_highbd_obmc_sad4x4_bits10,
aom_highbd_10_obmc_variance4x4,
aom_highbd_10_obmc_sub_pixel_variance4x4)
- HIGHBD_OBFP(BLOCK_128X32, aom_highbd_obmc_sad128x32_bits10,
- aom_highbd_10_obmc_variance128x32,
- aom_highbd_10_obmc_sub_pixel_variance128x32)
-
- HIGHBD_OBFP(BLOCK_32X128, aom_highbd_obmc_sad32x128_bits10,
- aom_highbd_10_obmc_variance32x128,
- aom_highbd_10_obmc_sub_pixel_variance32x128)
HIGHBD_OBFP(BLOCK_64X16, aom_highbd_obmc_sad64x16_bits10,
aom_highbd_10_obmc_variance64x16,
@@ -1969,22 +1904,6 @@
break;
case AOM_BITS_12:
- HIGHBD_BFP(
- BLOCK_128X32, aom_highbd_sad128x32_bits12,
- aom_highbd_sad128x32_avg_bits12, aom_highbd_12_variance128x32,
- aom_highbd_12_sub_pixel_variance128x32,
- aom_highbd_12_sub_pixel_avg_variance128x32, NULL, NULL,
- aom_highbd_sad128x32x4d_bits12, aom_highbd_jnt_sad128x32_avg_bits12,
- aom_highbd_12_jnt_sub_pixel_avg_variance128x32);
-
- HIGHBD_BFP(
- BLOCK_32X128, aom_highbd_sad32x128_bits12,
- aom_highbd_sad32x128_avg_bits12, aom_highbd_12_variance32x128,
- aom_highbd_12_sub_pixel_variance32x128,
- aom_highbd_12_sub_pixel_avg_variance32x128, NULL, NULL,
- aom_highbd_sad32x128x4d_bits12, aom_highbd_jnt_sad32x128_avg_bits12,
- aom_highbd_12_jnt_sub_pixel_avg_variance32x128);
-
HIGHBD_BFP(BLOCK_64X16, aom_highbd_sad64x16_bits12,
aom_highbd_sad64x16_avg_bits12, aom_highbd_12_variance64x16,
aom_highbd_12_sub_pixel_variance64x16,
@@ -2200,10 +2119,6 @@
aom_highbd_12_masked_sub_pixel_variance8x4)
HIGHBD_MBFP(BLOCK_4X4, aom_highbd_masked_sad4x4_bits12,
aom_highbd_12_masked_sub_pixel_variance4x4)
- HIGHBD_MBFP(BLOCK_128X32, aom_highbd_masked_sad128x32_bits12,
- aom_highbd_12_masked_sub_pixel_variance128x32)
- HIGHBD_MBFP(BLOCK_32X128, aom_highbd_masked_sad32x128_bits12,
- aom_highbd_12_masked_sub_pixel_variance32x128)
HIGHBD_MBFP(BLOCK_64X16, aom_highbd_masked_sad64x16_bits12,
aom_highbd_12_masked_sub_pixel_variance64x16)
HIGHBD_MBFP(BLOCK_16X64, aom_highbd_masked_sad16x64_bits12,
@@ -2264,12 +2179,6 @@
HIGHBD_OBFP(BLOCK_4X4, aom_highbd_obmc_sad4x4_bits12,
aom_highbd_12_obmc_variance4x4,
aom_highbd_12_obmc_sub_pixel_variance4x4)
- HIGHBD_OBFP(BLOCK_128X32, aom_highbd_obmc_sad128x32_bits12,
- aom_highbd_12_obmc_variance128x32,
- aom_highbd_12_obmc_sub_pixel_variance128x32)
- HIGHBD_OBFP(BLOCK_32X128, aom_highbd_obmc_sad32x128_bits12,
- aom_highbd_12_obmc_variance32x128,
- aom_highbd_12_obmc_sub_pixel_variance32x128)
HIGHBD_OBFP(BLOCK_64X16, aom_highbd_obmc_sad64x16_bits12,
aom_highbd_12_obmc_variance64x16,
aom_highbd_12_obmc_sub_pixel_variance64x16)
@@ -2670,16 +2579,6 @@
aom_sad64x16x4d, aom_jnt_sad64x16_avg,
aom_jnt_sub_pixel_avg_variance64x16)
- BFP(BLOCK_32X128, aom_sad32x128, aom_sad32x128_avg, aom_variance32x128,
- aom_sub_pixel_variance32x128, aom_sub_pixel_avg_variance32x128, NULL,
- NULL, aom_sad32x128x4d, aom_jnt_sad32x128_avg,
- aom_jnt_sub_pixel_avg_variance32x128)
-
- BFP(BLOCK_128X32, aom_sad128x32, aom_sad128x32_avg, aom_variance128x32,
- aom_sub_pixel_variance128x32, aom_sub_pixel_avg_variance128x32, NULL,
- NULL, aom_sad128x32x4d, aom_jnt_sad128x32_avg,
- aom_jnt_sub_pixel_avg_variance128x32)
-
BFP(BLOCK_128X128, aom_sad128x128, aom_sad128x128_avg, aom_variance128x128,
aom_sub_pixel_variance128x128, aom_sub_pixel_avg_variance128x128,
aom_sad128x128x3, aom_sad128x128x8, aom_sad128x128x4d,
@@ -2809,10 +2708,6 @@
aom_obmc_sub_pixel_variance16x64)
OBFP(BLOCK_64X16, aom_obmc_sad64x16, aom_obmc_variance64x16,
aom_obmc_sub_pixel_variance64x16)
- OBFP(BLOCK_32X128, aom_obmc_sad32x128, aom_obmc_variance32x128,
- aom_obmc_sub_pixel_variance32x128)
- OBFP(BLOCK_128X32, aom_obmc_sad128x32, aom_obmc_variance128x32,
- aom_obmc_sub_pixel_variance128x32)
#define MBFP(BT, MCSDF, MCSVF) \
cpi->fn_ptr[BT].msdf = MCSDF; \
@@ -2848,10 +2743,6 @@
MBFP(BLOCK_64X16, aom_masked_sad64x16, aom_masked_sub_pixel_variance64x16)
- MBFP(BLOCK_32X128, aom_masked_sad32x128, aom_masked_sub_pixel_variance32x128)
-
- MBFP(BLOCK_128X32, aom_masked_sad128x32, aom_masked_sub_pixel_variance128x32)
-
highbd_set_var_fns(cpi);
/* av1_init_quantizer() is first called here. Add check in
diff --git a/av1/encoder/pickcdef.c b/av1/encoder/pickcdef.c
index 33f4fc7..9018b85 100644
--- a/av1/encoder/pickcdef.c
+++ b/av1/encoder/pickcdef.c
@@ -390,21 +390,18 @@
MI_SIZE_64X64 * fbc]
->mbmi;
if (((fbc & 1) &&
- (mbmi->sb_type == BLOCK_128X128 || mbmi->sb_type == BLOCK_128X64 ||
- mbmi->sb_type == BLOCK_128X32)) ||
+ (mbmi->sb_type == BLOCK_128X128 || mbmi->sb_type == BLOCK_128X64)) ||
((fbr & 1) &&
- (mbmi->sb_type == BLOCK_128X128 || mbmi->sb_type == BLOCK_64X128 ||
- mbmi->sb_type == BLOCK_32X128)))
+ (mbmi->sb_type == BLOCK_128X128 || mbmi->sb_type == BLOCK_64X128)))
continue;
if (mbmi->sb_type == BLOCK_128X128 || mbmi->sb_type == BLOCK_128X64 ||
- mbmi->sb_type == BLOCK_128X32 || mbmi->sb_type == BLOCK_64X128 ||
- mbmi->sb_type == BLOCK_32X128)
+ mbmi->sb_type == BLOCK_64X128)
bs = mbmi->sb_type;
- if (bs == BLOCK_128X128 || bs == BLOCK_128X64 || bs == BLOCK_128X32) {
+ if (bs == BLOCK_128X128 || bs == BLOCK_128X64) {
nhb = AOMMIN(MI_SIZE_128X128, cm->mi_cols - MI_SIZE_64X64 * fbc);
hb_step = 2;
}
- if (bs == BLOCK_128X128 || bs == BLOCK_64X128 || bs == BLOCK_32X128) {
+ if (bs == BLOCK_128X128 || bs == BLOCK_64X128) {
nvb = AOMMIN(MI_SIZE_128X128, cm->mi_rows - MI_SIZE_64X64 * fbr);
vb_step = 2;
}
diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 0098ca1..f7e3527 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -52,8 +52,7 @@
// This table is used to correct for block size.
// The factors here are << 2 (2 = x0.5, 32 = x8 etc).
static const uint8_t rd_thresh_block_size_factor[BLOCK_SIZES_ALL] = {
- 2, 3, 3, 4, 6, 6, 8, 12, 12, 16, 24, 24,
- 32, 48, 48, 64, 4, 4, 8, 8, 16, 16, 32, 32
+ 2, 3, 3, 4, 6, 6, 8, 12, 12, 16, 24, 24, 32, 48, 48, 64, 4, 4, 8, 8, 16, 16
};
static const int use_intra_ext_tx_for_txsize[EXT_TX_SETS_INTRA][EXT_TX_SIZES] =
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 19145e8..b1eef7f 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4232,16 +4232,16 @@
static const uint32_t skip_pred_threshold[3][BLOCK_SIZES_ALL] = {
{
- 50, 50, 50, 55, 47, 47, 53, 53, 53, 53, 53, 53,
- 53, 53, 53, 53, 50, 50, 55, 55, 53, 53, 53, 53,
+ 50, 50, 50, 55, 47, 47, 53, 53, 53, 53, 53,
+ 53, 53, 53, 53, 53, 50, 50, 55, 55, 53, 53,
},
{
- 69, 69, 69, 67, 68, 68, 53, 53, 53, 53, 53, 53,
- 53, 53, 53, 53, 69, 69, 67, 67, 53, 53, 53, 53,
+ 69, 69, 69, 67, 68, 68, 53, 53, 53, 53, 53,
+ 53, 53, 53, 53, 53, 69, 69, 67, 67, 53, 53,
},
{
- 70, 73, 73, 70, 73, 73, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 70, 70, 70, 70, 58, 58, 58, 58,
+ 70, 73, 73, 70, 73, 73, 58, 58, 58, 58, 58,
+ 58, 58, 58, 58, 58, 70, 70, 70, 70, 58, 58,
}
};
diff --git a/examples/inspect.c b/examples/inspect.c
index a9119a2..ceb7fc2 100644
--- a/examples/inspect.c
+++ b/examples/inspect.c
@@ -139,19 +139,16 @@
ENUM(ALTREF2_FRAME), ENUM(ALTREF_FRAME), LAST_ENUM
};
-const map_entry block_size_map[] = { ENUM(BLOCK_4X4), ENUM(BLOCK_4X8),
- ENUM(BLOCK_8X4), ENUM(BLOCK_8X8),
- ENUM(BLOCK_8X16), ENUM(BLOCK_16X8),
- ENUM(BLOCK_16X16), ENUM(BLOCK_16X32),
- ENUM(BLOCK_32X16), ENUM(BLOCK_32X32),
- ENUM(BLOCK_32X64), ENUM(BLOCK_64X32),
- ENUM(BLOCK_64X64), ENUM(BLOCK_64X128),
- ENUM(BLOCK_128X64), ENUM(BLOCK_128X128),
- ENUM(BLOCK_4X16), ENUM(BLOCK_16X4),
- ENUM(BLOCK_8X32), ENUM(BLOCK_32X8),
- ENUM(BLOCK_16X64), ENUM(BLOCK_64X16),
- ENUM(BLOCK_32X128), ENUM(BLOCK_128X32),
- LAST_ENUM };
+const map_entry block_size_map[] = {
+ ENUM(BLOCK_4X4), ENUM(BLOCK_4X8), ENUM(BLOCK_8X4),
+ ENUM(BLOCK_8X8), ENUM(BLOCK_8X16), ENUM(BLOCK_16X8),
+ ENUM(BLOCK_16X16), ENUM(BLOCK_16X32), ENUM(BLOCK_32X16),
+ ENUM(BLOCK_32X32), ENUM(BLOCK_32X64), ENUM(BLOCK_64X32),
+ ENUM(BLOCK_64X64), ENUM(BLOCK_64X128), ENUM(BLOCK_128X64),
+ ENUM(BLOCK_128X128), ENUM(BLOCK_4X16), ENUM(BLOCK_16X4),
+ ENUM(BLOCK_8X32), ENUM(BLOCK_32X8), ENUM(BLOCK_16X64),
+ ENUM(BLOCK_64X16), LAST_ENUM
+};
const map_entry tx_size_map[] = {
ENUM(TX_4X4), ENUM(TX_8X8), ENUM(TX_16X16), ENUM(TX_32X32),
diff --git a/test/sad_test.cc b/test/sad_test.cc
index 873fbcd..d064f4e 100644
--- a/test/sad_test.cc
+++ b/test/sad_test.cc
@@ -1303,8 +1303,6 @@
make_tuple(32, 8, &aom_sad32xh_sse2, -1),
make_tuple(16, 64, &aom_sad16xh_sse2, -1),
make_tuple(64, 16, &aom_sad64xh_sse2, -1),
- make_tuple(32, 128, &aom_sad32xh_sse2, -1),
- make_tuple(128, 32, &aom_sad128xh_sse2, -1),
};
INSTANTIATE_TEST_CASE_P(SSE2, JntSADTest,
::testing::ValuesIn(jnt_sad_sse2_tests));
diff --git a/test/variance_test.cc b/test/variance_test.cc
index 856817e..cecd825 100644
--- a/test/variance_test.cc
+++ b/test/variance_test.cc
@@ -846,8 +846,6 @@
::testing::Values(VarianceParams(7, 7, &aom_variance128x128_c),
VarianceParams(7, 6, &aom_variance128x64_c),
VarianceParams(6, 7, &aom_variance64x128_c),
- VarianceParams(7, 5, &aom_variance128x32_c),
- VarianceParams(5, 7, &aom_variance32x128_c),
VarianceParams(6, 6, &aom_variance64x64_c),
VarianceParams(6, 5, &aom_variance64x32_c),
VarianceParams(5, 6, &aom_variance32x64_c),
@@ -1189,8 +1187,6 @@
::testing::Values(VarianceParams(7, 7, &aom_variance128x128_sse2),
VarianceParams(7, 6, &aom_variance128x64_sse2),
VarianceParams(6, 7, &aom_variance64x128_sse2),
- VarianceParams(7, 5, &aom_variance128x32_sse2),
- VarianceParams(5, 7, &aom_variance32x128_sse2),
VarianceParams(6, 6, &aom_variance64x64_sse2),
VarianceParams(6, 5, &aom_variance64x32_sse2),
VarianceParams(5, 6, &aom_variance32x64_sse2),
@@ -1519,8 +1515,6 @@
::testing::Values(VarianceParams(7, 7, &aom_variance128x128_avx2),
VarianceParams(7, 6, &aom_variance128x64_avx2),
VarianceParams(6, 7, &aom_variance64x128_avx2),
- VarianceParams(7, 5, &aom_variance128x32_avx2),
- VarianceParams(5, 7, &aom_variance32x128_avx2),
VarianceParams(6, 6, &aom_variance64x64_avx2),
VarianceParams(6, 5, &aom_variance64x32_avx2),
VarianceParams(5, 5, &aom_variance32x32_avx2),
