rm unused aom_highbd_sad_skip functions These functions are only assigned to the sdf and sdx4df function pointers in mcomp.c when the block height is >= 16. Bug: aomedia:3416 Change-Id: I4cf65ef9e174fe0c3d8715c1917a3c1a99c273e4
diff --git a/aom_dsp/aom_dsp_rtcd_defs.pl b/aom_dsp/aom_dsp_rtcd_defs.pl index d3f6b2e..4373ea0 100755 --- a/aom_dsp/aom_dsp_rtcd_defs.pl +++ b/aom_dsp/aom_dsp_rtcd_defs.pl
@@ -947,7 +947,9 @@ foreach (@encoder_block_sizes) { ($w, $h) = @$_; add_proto qw/unsigned int/, "aom_highbd_sad${w}x${h}", "const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride"; - add_proto qw/unsigned int/, "aom_highbd_sad_skip_${w}x${h}", "const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride"; + if ($h >= 16) { + add_proto qw/unsigned int/, "aom_highbd_sad_skip_${w}x${h}", "const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride"; + } add_proto qw/unsigned int/, "aom_highbd_sad${w}x${h}_avg", "const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred"; if ($w != 128 && $h != 128 && $w != 4) { specialize "aom_highbd_sad${w}x${h}", qw/sse2/; @@ -989,17 +991,10 @@ specialize qw/aom_highbd_sad_skip_32x16 avx2 sse2 neon/; specialize qw/aom_highbd_sad_skip_16x32 avx2 sse2 neon/; specialize qw/aom_highbd_sad_skip_16x16 avx2 sse2 neon/; - specialize qw/aom_highbd_sad_skip_16x8 avx2 sse2 neon/; - specialize qw/aom_highbd_sad_skip_16x4 neon/; specialize qw/aom_highbd_sad_skip_8x16 sse2 neon/; - specialize qw/aom_highbd_sad_skip_8x4 neon/; - specialize qw/aom_highbd_sad_skip_8x8 sse2 neon/; - specialize qw/aom_highbd_sad_skip_4x8 sse2 neon/; - specialize qw/aom_highbd_sad_skip_4x4 neon/; specialize qw/aom_highbd_sad_skip_4x16 sse2 neon/; specialize qw/aom_highbd_sad_skip_8x32 sse2 neon/; - specialize qw/aom_highbd_sad_skip_32x8 avx2 sse2 neon/; specialize qw/aom_highbd_sad_skip_16x64 avx2 sse2 neon/; specialize qw/aom_highbd_sad_skip_64x16 avx2 sse2 neon/; @@ -1158,7 +1153,9 @@ ($w, $h) = @$_; add_proto qw/void/, "aom_highbd_sad${w}x${h}x4d", "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[4], int ref_stride, uint32_t sad_array[4]"; add_proto qw/void/, "aom_highbd_sad${w}x${h}x3d", "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[4], int ref_stride, uint32_t sad_array[4]"; - add_proto qw/void/, "aom_highbd_sad_skip_${w}x${h}x4d", "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[4], int ref_stride, uint32_t sad_array[4]"; + if ($h >= 16) { + add_proto qw/void/, "aom_highbd_sad_skip_${w}x${h}x4d", "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[4], int ref_stride, uint32_t sad_array[4]"; + } if ($w != 128 && $h != 128) { specialize "aom_highbd_sad${w}x${h}x4d", qw/sse2/; } @@ -1197,17 +1194,10 @@ specialize qw/aom_highbd_sad_skip_32x16x4d avx2 sse2 neon/; specialize qw/aom_highbd_sad_skip_16x32x4d avx2 sse2 neon/; specialize qw/aom_highbd_sad_skip_16x16x4d avx2 sse2 neon/; - specialize qw/aom_highbd_sad_skip_16x8x4d avx2 sse2 neon/; - specialize qw/aom_highbd_sad_skip_16x4x4d neon/; specialize qw/aom_highbd_sad_skip_8x16x4d sse2 neon/; - specialize qw/aom_highbd_sad_skip_8x8x4d sse2 neon/; - specialize qw/aom_highbd_sad_skip_8x4x4d neon/; - specialize qw/aom_highbd_sad_skip_4x8x4d sse2 neon/; - specialize qw/aom_highbd_sad_skip_4x4x4d neon/; specialize qw/aom_highbd_sad_skip_4x16x4d sse2 neon/; specialize qw/aom_highbd_sad_skip_8x32x4d sse2 neon/; - specialize qw/aom_highbd_sad_skip_32x8x4d avx2 sse2 neon/; specialize qw/aom_highbd_sad_skip_16x64x4d avx2 sse2 neon/; specialize qw/aom_highbd_sad_skip_64x16x4d avx2 sse2 neon/;
diff --git a/aom_dsp/arm/highbd_sad_neon.c b/aom_dsp/arm/highbd_sad_neon.c index 87b5951..fc8855b 100644 --- a/aom_dsp/arm/highbd_sad_neon.c +++ b/aom_dsp/arm/highbd_sad_neon.c
@@ -251,14 +251,8 @@ 2 * ref_stride, (h) / 2); \ } -HBD_SAD_SKIP_WXH_SMALL_NEON(4, 4) -HBD_SAD_SKIP_WXH_SMALL_NEON(4, 8) - -HBD_SAD_SKIP_WXH_SMALL_NEON(8, 4) -HBD_SAD_SKIP_WXH_SMALL_NEON(8, 8) HBD_SAD_SKIP_WXH_SMALL_NEON(8, 16) -HBD_SAD_SKIP_WXH_LARGE_NEON(16, 8) HBD_SAD_SKIP_WXH_LARGE_NEON(16, 16) HBD_SAD_SKIP_WXH_LARGE_NEON(16, 32) @@ -278,11 +272,8 @@ HBD_SAD_SKIP_WXH_SMALL_NEON(8, 32) -HBD_SAD_SKIP_WXH_LARGE_NEON(16, 4) HBD_SAD_SKIP_WXH_LARGE_NEON(16, 64) -HBD_SAD_SKIP_WXH_LARGE_NEON(32, 8) - HBD_SAD_SKIP_WXH_LARGE_NEON(64, 16) #endif // !CONFIG_REALTIME_ONLY
diff --git a/aom_dsp/arm/highbd_sadxd_neon.c b/aom_dsp/arm/highbd_sadxd_neon.c index 1fd5681..0e43f6d 100644 --- a/aom_dsp/arm/highbd_sadxd_neon.c +++ b/aom_dsp/arm/highbd_sadxd_neon.c
@@ -326,14 +326,8 @@ sad_array[3] <<= 1; \ } -HBD_SAD_SKIP_WXH_4D_SMALL_NEON(4, 4) -HBD_SAD_SKIP_WXH_4D_SMALL_NEON(4, 8) - -HBD_SAD_SKIP_WXH_4D_SMALL_NEON(8, 4) -HBD_SAD_SKIP_WXH_4D_SMALL_NEON(8, 8) HBD_SAD_SKIP_WXH_4D_SMALL_NEON(8, 16) -HBD_SAD_SKIP_WXH_4D_LARGE_NEON(16, 8) HBD_SAD_SKIP_WXH_4D_LARGE_NEON(16, 16) HBD_SAD_SKIP_WXH_4D_LARGE_NEON(16, 32) @@ -353,11 +347,8 @@ HBD_SAD_SKIP_WXH_4D_SMALL_NEON(8, 32) -HBD_SAD_SKIP_WXH_4D_LARGE_NEON(16, 4) HBD_SAD_SKIP_WXH_4D_LARGE_NEON(16, 64) -HBD_SAD_SKIP_WXH_4D_LARGE_NEON(32, 8) - HBD_SAD_SKIP_WXH_4D_LARGE_NEON(64, 16) #endif // !CONFIG_REALTIME_ONLY
diff --git a/aom_dsp/sad.c b/aom_dsp/sad.c index da8f077..7552019 100644 --- a/aom_dsp/sad.c +++ b/aom_dsp/sad.c
@@ -227,7 +227,7 @@ return sad; } -#define HIGHBD_SADMXN(m, n) \ +#define HIGHBD_SADMXN_NO_SKIP(m, n) \ unsigned int aom_highbd_sad##m##x##n##_c(const uint8_t *src, int src_stride, \ const uint8_t *ref, \ int ref_stride) { \ @@ -249,7 +249,10 @@ aom_highbd_dist_wtd_comp_avg_pred(comp_pred8, second_pred, m, n, ref, \ ref_stride, jcp_param); \ return highbd_sadb(src, src_stride, comp_pred8, m, m, n); \ - } \ + } + +#define HIGHBD_SADMXN(m, n) \ + HIGHBD_SADMXN_NO_SKIP(m, n) \ unsigned int aom_highbd_sad_skip_##m##x##n##_c( \ const uint8_t *src, int src_stride, const uint8_t *ref, \ int ref_stride) { \ @@ -257,7 +260,7 @@ highbd_sad(src, 2 * src_stride, ref, 2 * ref_stride, (m), (n / 2)); \ } -#define HIGHBD_SAD_MXNX4D(m, n) \ +#define HIGHBD_SAD_MXNX4D_NO_SKIP(m, n) \ void aom_highbd_sad##m##x##n##x4d_c(const uint8_t *src, int src_stride, \ const uint8_t *const ref_array[4], \ int ref_stride, uint32_t sad_array[4]) { \ @@ -266,15 +269,18 @@ sad_array[i] = aom_highbd_sad##m##x##n##_c(src, src_stride, \ ref_array[i], ref_stride); \ } \ - } \ - void aom_highbd_sad_skip_##m##x##n##x4d_c( \ - const uint8_t *src, int src_stride, const uint8_t *const ref_array[4], \ - int ref_stride, uint32_t sad_array[4]) { \ - int i; \ - for (i = 0; i < 4; ++i) { \ - sad_array[i] = 2 * highbd_sad(src, 2 * src_stride, ref_array[i], \ - 2 * ref_stride, (m), (n / 2)); \ - } \ + } + +#define HIGHBD_SAD_MXNX4D(m, n) \ + HIGHBD_SAD_MXNX4D_NO_SKIP(m, n) \ + void aom_highbd_sad_skip_##m##x##n##x4d_c( \ + const uint8_t *src, int src_stride, const uint8_t *const ref_array[4], \ + int ref_stride, uint32_t sad_array[4]) { \ + int i; \ + for (i = 0; i < 4; ++i) { \ + sad_array[i] = 2 * highbd_sad(src, 2 * src_stride, ref_array[i], \ + 2 * ref_stride, (m), (n / 2)); \ + } \ } // Call SIMD version of aom_highbd_sad_mxnx4d if the 3d version is unavailable. #define HIGHBD_SAD_MXNX3D(m, n) \ @@ -336,8 +342,8 @@ HIGHBD_SAD_MXNX3D(16, 16) // 16x8 -HIGHBD_SADMXN(16, 8) -HIGHBD_SAD_MXNX4D(16, 8) +HIGHBD_SADMXN_NO_SKIP(16, 8) +HIGHBD_SAD_MXNX4D_NO_SKIP(16, 8) HIGHBD_SAD_MXNX3D(16, 8) // 8x16 @@ -346,34 +352,34 @@ HIGHBD_SAD_MXNX3D(8, 16) // 8x8 -HIGHBD_SADMXN(8, 8) -HIGHBD_SAD_MXNX4D(8, 8) +HIGHBD_SADMXN_NO_SKIP(8, 8) +HIGHBD_SAD_MXNX4D_NO_SKIP(8, 8) HIGHBD_SAD_MXNX3D(8, 8) // 8x4 -HIGHBD_SADMXN(8, 4) -HIGHBD_SAD_MXNX4D(8, 4) +HIGHBD_SADMXN_NO_SKIP(8, 4) +HIGHBD_SAD_MXNX4D_NO_SKIP(8, 4) HIGHBD_SAD_MXNX3D(8, 4) // 4x8 -HIGHBD_SADMXN(4, 8) -HIGHBD_SAD_MXNX4D(4, 8) +HIGHBD_SADMXN_NO_SKIP(4, 8) +HIGHBD_SAD_MXNX4D_NO_SKIP(4, 8) HIGHBD_SAD_MXNX3D(4, 8) // 4x4 -HIGHBD_SADMXN(4, 4) -HIGHBD_SAD_MXNX4D(4, 4) +HIGHBD_SADMXN_NO_SKIP(4, 4) +HIGHBD_SAD_MXNX4D_NO_SKIP(4, 4) HIGHBD_SAD_MXNX3D(4, 4) #if !CONFIG_REALTIME_ONLY HIGHBD_SADMXN(4, 16) HIGHBD_SAD_MXNX4D(4, 16) -HIGHBD_SADMXN(16, 4) -HIGHBD_SAD_MXNX4D(16, 4) +HIGHBD_SADMXN_NO_SKIP(16, 4) +HIGHBD_SAD_MXNX4D_NO_SKIP(16, 4) HIGHBD_SADMXN(8, 32) HIGHBD_SAD_MXNX4D(8, 32) -HIGHBD_SADMXN(32, 8) -HIGHBD_SAD_MXNX4D(32, 8) +HIGHBD_SADMXN_NO_SKIP(32, 8) +HIGHBD_SAD_MXNX4D_NO_SKIP(32, 8) HIGHBD_SADMXN(16, 64) HIGHBD_SAD_MXNX4D(16, 64) HIGHBD_SADMXN(64, 16)
diff --git a/aom_dsp/x86/highbd_sad4d_sse2.asm b/aom_dsp/x86/highbd_sad4d_sse2.asm index d9d25bb..ebbf175 100644 --- a/aom_dsp/x86/highbd_sad4d_sse2.asm +++ b/aom_dsp/x86/highbd_sad4d_sse2.asm
@@ -328,17 +328,8 @@ HIGH_SADNXN4D 32, 16, 2 HIGH_SADNXN4D 16, 32, 2 HIGH_SADNXN4D 16, 16, 2 -HIGH_SADNXN4D 16, 8, 2 HIGH_SADNXN4D 8, 16, 2 -HIGH_SADNXN4D 8, 8, 2 -HIGH_SADNXN4D 4, 8, 2 HIGH_SADNXN4D 4, 16, 2 HIGH_SADNXN4D 8, 32, 2 -HIGH_SADNXN4D 32, 8, 2 HIGH_SADNXN4D 16, 64, 2 HIGH_SADNXN4D 64, 16, 2 - -; Current code cannot handle the case when the height is downsampled to 2 -; HIGH_SADNXN4D 16, 4, 2 -; HIGH_SADNXN4D 8, 4, 2 -; HIGH_SADNXN4D 4, 4, 2
diff --git a/aom_dsp/x86/highbd_sad_avx2.c b/aom_dsp/x86/highbd_sad_avx2.c index 9eeef08..6bec333 100644 --- a/aom_dsp/x86/highbd_sad_avx2.c +++ b/aom_dsp/x86/highbd_sad_avx2.c
@@ -289,7 +289,6 @@ HIGHBD_SADMXN_AVX2(64, 16) #endif // !CONFIG_REALTIME_ONLY -HIGHBD_SAD_SKIP_MXN_AVX2(16, 8) HIGHBD_SAD_SKIP_MXN_AVX2(16, 16) HIGHBD_SAD_SKIP_MXN_AVX2(16, 32) @@ -306,7 +305,6 @@ #if !CONFIG_REALTIME_ONLY HIGHBD_SAD_SKIP_MXN_AVX2(16, 64) -HIGHBD_SAD_SKIP_MXN_AVX2(32, 8) HIGHBD_SAD_SKIP_MXN_AVX2(64, 16) #endif // !CONFIG_REALTIME_ONLY @@ -697,7 +695,6 @@ HIGHBD_SAD_MXNX4D_AVX2(64, 16) #endif // !CONFIG_REALTIME_ONLY -HIGHBD_SAD_SKIP_MXNX4D_AVX2(16, 8) HIGHBD_SAD_SKIP_MXNX4D_AVX2(16, 16) HIGHBD_SAD_SKIP_MXNX4D_AVX2(16, 32) @@ -714,7 +711,6 @@ #if !CONFIG_REALTIME_ONLY HIGHBD_SAD_SKIP_MXNX4D_AVX2(16, 64) -HIGHBD_SAD_SKIP_MXNX4D_AVX2(32, 8) HIGHBD_SAD_SKIP_MXNX4D_AVX2(64, 16) #endif // !CONFIG_REALTIME_ONLY
diff --git a/aom_dsp/x86/highbd_sad_sse2.asm b/aom_dsp/x86/highbd_sad_sse2.asm index c61c134..c1bbda9 100644 --- a/aom_dsp/x86/highbd_sad_sse2.asm +++ b/aom_dsp/x86/highbd_sad_sse2.asm
@@ -270,7 +270,6 @@ %if CONFIG_REALTIME_ONLY==0 HIGH_SAD32XN 8 ; highbd_sad_32x8_sse2 HIGH_SAD32XN 8, 1 ; highbd_sad_32x8_avg_sse2 -HIGH_SAD32XN 8, 2 ; highbd_sad_skip_32x8_sse2 %endif ; unsigned int aom_highbd_sad16x{8,16,32}_sse2(uint8_t *src, int src_stride, @@ -349,15 +348,12 @@ HIGH_SAD16XN 8, 1 ; highbd_sad16x8_avg_sse2 HIGH_SAD16XN 32, 2 ; highbd_sad_skip_16x32_sse2 HIGH_SAD16XN 16, 2 ; highbd_sad_skip_16x16_sse2 -HIGH_SAD16XN 8, 2 ; highbd_sad_skip_16x8_sse2 %if CONFIG_REALTIME_ONLY==0 HIGH_SAD16XN 64 ; highbd_sad_16x64_sse2 HIGH_SAD16XN 4 ; highbd_sad_16x4_sse2 HIGH_SAD16XN 64, 1 ; highbd_sad_16x64_avg_sse2 HIGH_SAD16XN 4, 1 ; highbd_sad_16x4_avg_sse2 HIGH_SAD16XN 64, 2 ; highbd_sad_skip_16x64_sse2 -; Current code fails there are only 2 rows -; HIGH_SAD16XN 4, 2 ; highbd_sad_skip_16x4_sse2 %endif ; unsigned int aom_highbd_sad8x{4,8,16}_sse2(uint8_t *src, int src_stride, @@ -443,7 +439,6 @@ HIGH_SAD8XN 8, 1 ; highbd_sad8x8_avg_sse2 HIGH_SAD8XN 4, 1 ; highbd_sad8x4_avg_sse2 HIGH_SAD8XN 16, 2 ; highbd_sad_skip_8x16_sse2 -HIGH_SAD8XN 8, 2 ; highbd_sad_skip_8x8_sse2 ; Current code fails there are only 2 rows ; HIGH_SAD8XN 4, 2 ; highbd_sad8x4_avg_sse2 %if CONFIG_REALTIME_ONLY==0 @@ -524,9 +519,6 @@ HIGH_SAD4XN 4 ; highbd_sad4x4_sse2 HIGH_SAD4XN 8, 1 ; highbd_sad4x8_avg_sse2 HIGH_SAD4XN 4, 1 ; highbd_sad4x4_avg_sse2 -HIGH_SAD4XN 8, 2 ; highbd_sad_skip_4x8_sse2 -; Current code fails there are only 2 rows -; HIGH_SAD4XN 4, 2 ; highbd_sad_skip_4x4_sse2 %if CONFIG_REALTIME_ONLY==0 HIGH_SAD4XN 16 ; highbd_sad4x16_sse2 HIGH_SAD4XN 16, 1 ; highbd_sad4x16_avg_sse2
diff --git a/av1/encoder/encoder_utils.h b/av1/encoder/encoder_utils.h index 92ce744..e78e62d 100644 --- a/av1/encoder/encoder_utils.h +++ b/av1/encoder/encoder_utils.h
@@ -467,14 +467,10 @@ MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_32x16) MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_16x32) MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_16x16) -MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_16x8) MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_8x16) -MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_8x8) -MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_4x8) #if !CONFIG_REALTIME_ONLY MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_64x16) -MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_32x8) MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_16x64) MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_4x16) MAKE_SDSF_SKIP_SAD_WRAPPER(aom_highbd_sad_skip_8x32) @@ -490,14 +486,10 @@ MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_32x16x4d) MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_16x32x4d) MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_16x16x4d) -MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_16x8x4d) MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_8x16x4d) -MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_8x8x4d) -MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_4x8x4d) #if !CONFIG_REALTIME_ONLY MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_64x16x4d) -MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_32x8x4d) MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_16x64x4d) MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_4x16x4d) MAKE_SDSF_SKIP_SAD_4D_WRAPPER(aom_highbd_sad_skip_8x32x4d) @@ -660,13 +652,9 @@ HIGHBD_SDSFP_WRAPPER(32, 16, 8) HIGHBD_SDSFP_WRAPPER(16, 32, 8) HIGHBD_SDSFP_WRAPPER(16, 16, 8) - HIGHBD_SDSFP_WRAPPER(16, 8, 8) HIGHBD_SDSFP_WRAPPER(8, 16, 8) - HIGHBD_SDSFP_WRAPPER(8, 8, 8) - HIGHBD_SDSFP_WRAPPER(4, 8, 8) #if !CONFIG_REALTIME_ONLY HIGHBD_SDSFP_WRAPPER(64, 16, 8) - HIGHBD_SDSFP_WRAPPER(32, 8, 8) HIGHBD_SDSFP_WRAPPER(16, 64, 8) HIGHBD_SDSFP_WRAPPER(8, 32, 8) HIGHBD_SDSFP_WRAPPER(4, 16, 8) @@ -760,14 +748,10 @@ HIGHBD_SDSFP_WRAPPER(32, 16, 10) HIGHBD_SDSFP_WRAPPER(16, 32, 10) HIGHBD_SDSFP_WRAPPER(16, 16, 10) - HIGHBD_SDSFP_WRAPPER(16, 8, 10) HIGHBD_SDSFP_WRAPPER(8, 16, 10) - HIGHBD_SDSFP_WRAPPER(8, 8, 10) - HIGHBD_SDSFP_WRAPPER(4, 8, 10) #if !CONFIG_REALTIME_ONLY HIGHBD_SDSFP_WRAPPER(64, 16, 10) - HIGHBD_SDSFP_WRAPPER(32, 8, 10) HIGHBD_SDSFP_WRAPPER(16, 64, 10) HIGHBD_SDSFP_WRAPPER(8, 32, 10) HIGHBD_SDSFP_WRAPPER(4, 16, 10) @@ -861,14 +845,10 @@ HIGHBD_SDSFP_WRAPPER(32, 16, 12) HIGHBD_SDSFP_WRAPPER(16, 32, 12) HIGHBD_SDSFP_WRAPPER(16, 16, 12) - HIGHBD_SDSFP_WRAPPER(16, 8, 12) HIGHBD_SDSFP_WRAPPER(8, 16, 12) - HIGHBD_SDSFP_WRAPPER(8, 8, 12) - HIGHBD_SDSFP_WRAPPER(4, 8, 12) #if !CONFIG_REALTIME_ONLY HIGHBD_SDSFP_WRAPPER(64, 16, 12) - HIGHBD_SDSFP_WRAPPER(32, 8, 12) HIGHBD_SDSFP_WRAPPER(16, 64, 12) HIGHBD_SDSFP_WRAPPER(8, 32, 12) HIGHBD_SDSFP_WRAPPER(4, 16, 12)
diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c index 0709e9b..ce1e4ef 100644 --- a/av1/encoder/mcomp.c +++ b/av1/encoder/mcomp.c
@@ -9,6 +9,7 @@ * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ +#include <assert.h> #include <limits.h> #include <math.h> #include <stdio.h> @@ -110,7 +111,9 @@ ms_params->sdx3df = ms_params->vfp->sdx3df; if (mv_sf->use_downsampled_sad == 2 && block_size_high[bsize] >= 16) { + assert(ms_params->vfp->sdsf != NULL); ms_params->sdf = ms_params->vfp->sdsf; + assert(ms_params->vfp->sdsx4df != NULL); ms_params->sdx4df = ms_params->vfp->sdsx4df; // Skip version of sadx3 is not available yet ms_params->sdx3df = ms_params->vfp->sdsx4df; @@ -128,6 +131,7 @@ const int src_stride = src->stride; unsigned int start_mv_sad_even_rows, start_mv_sad_odd_rows; + assert(ms_params->vfp->sdsf != NULL); start_mv_sad_even_rows = ms_params->vfp->sdsf(src_buf, src_stride, best_address, ref_stride); start_mv_sad_odd_rows = @@ -141,6 +145,7 @@ const int mult_thresh = 4; if (odd_to_even_diff_sad * mult_thresh < (int)start_mv_sad_even_rows) { ms_params->sdf = ms_params->vfp->sdsf; + assert(ms_params->vfp->sdsx4df != NULL); ms_params->sdx4df = ms_params->vfp->sdsx4df; ms_params->sdx3df = ms_params->vfp->sdsx4df; }
diff --git a/test/sad_test.cc b/test/sad_test.cc index fd10999..96585ef 100644 --- a/test/sad_test.cc +++ b/test/sad_test.cc
@@ -1178,18 +1178,11 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16_c, 8), make_tuple(16, 32, &aom_highbd_sad_skip_16x32_c, 8), make_tuple(16, 16, &aom_highbd_sad_skip_16x16_c, 8), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8_c, 8), make_tuple(8, 16, &aom_highbd_sad_skip_8x16_c, 8), - make_tuple(8, 8, &aom_highbd_sad_skip_8x8_c, 8), - make_tuple(8, 4, &aom_highbd_sad_skip_8x4_c, 8), - make_tuple(4, 8, &aom_highbd_sad_skip_4x8_c, 8), - make_tuple(4, 4, &aom_highbd_sad_skip_4x4_c, 8), #if !CONFIG_REALTIME_ONLY make_tuple(64, 16, &aom_highbd_sad_skip_64x16_c, 8), make_tuple(16, 64, &aom_highbd_sad_skip_16x64_c, 8), - make_tuple(32, 8, &aom_highbd_sad_skip_32x8_c, 8), make_tuple(8, 32, &aom_highbd_sad_skip_8x32_c, 8), - make_tuple(16, 4, &aom_highbd_sad_skip_16x4_c, 8), make_tuple(4, 16, &aom_highbd_sad_skip_4x16_c, 8), #endif make_tuple(128, 128, &aom_highbd_sad_skip_128x128_c, 10), @@ -1202,18 +1195,11 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16_c, 10), make_tuple(16, 32, &aom_highbd_sad_skip_16x32_c, 10), make_tuple(16, 16, &aom_highbd_sad_skip_16x16_c, 10), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8_c, 10), make_tuple(8, 16, &aom_highbd_sad_skip_8x16_c, 10), - make_tuple(8, 8, &aom_highbd_sad_skip_8x8_c, 10), - make_tuple(8, 4, &aom_highbd_sad_skip_8x4_c, 10), - make_tuple(4, 8, &aom_highbd_sad_skip_4x8_c, 10), - make_tuple(4, 4, &aom_highbd_sad_skip_4x4_c, 10), #if !CONFIG_REALTIME_ONLY make_tuple(64, 16, &aom_highbd_sad_skip_64x16_c, 10), make_tuple(16, 64, &aom_highbd_sad_skip_16x64_c, 10), - make_tuple(32, 8, &aom_highbd_sad_skip_32x8_c, 10), make_tuple(8, 32, &aom_highbd_sad_skip_8x32_c, 10), - make_tuple(16, 4, &aom_highbd_sad_skip_16x4_c, 10), make_tuple(4, 16, &aom_highbd_sad_skip_4x16_c, 10), #endif make_tuple(128, 128, &aom_highbd_sad_skip_128x128_c, 12), @@ -1226,18 +1212,11 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16_c, 12), make_tuple(16, 32, &aom_highbd_sad_skip_16x32_c, 12), make_tuple(16, 16, &aom_highbd_sad_skip_16x16_c, 12), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8_c, 12), make_tuple(8, 16, &aom_highbd_sad_skip_8x16_c, 12), - make_tuple(8, 8, &aom_highbd_sad_skip_8x8_c, 12), - make_tuple(8, 4, &aom_highbd_sad_skip_8x4_c, 12), - make_tuple(4, 8, &aom_highbd_sad_skip_4x8_c, 12), - make_tuple(4, 4, &aom_highbd_sad_skip_4x4_c, 12), #if !CONFIG_REALTIME_ONLY make_tuple(64, 16, &aom_highbd_sad_skip_64x16_c, 12), make_tuple(16, 64, &aom_highbd_sad_skip_16x64_c, 12), - make_tuple(32, 8, &aom_highbd_sad_skip_32x8_c, 12), make_tuple(8, 32, &aom_highbd_sad_skip_8x32_c, 12), - make_tuple(16, 4, &aom_highbd_sad_skip_16x4_c, 12), make_tuple(4, 16, &aom_highbd_sad_skip_4x16_c, 12), #endif // !CONFIG_REALTIME_ONLY #endif // CONFIG_AV1_HIGHBITDEPTH @@ -1614,18 +1593,11 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16x4d_c, 8), make_tuple(16, 32, &aom_highbd_sad_skip_16x32x4d_c, 8), make_tuple(16, 16, &aom_highbd_sad_skip_16x16x4d_c, 8), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8x4d_c, 8), make_tuple(8, 16, &aom_highbd_sad_skip_8x16x4d_c, 8), - make_tuple(8, 8, &aom_highbd_sad_skip_8x8x4d_c, 8), - make_tuple(8, 4, &aom_highbd_sad_skip_8x4x4d_c, 8), - make_tuple(4, 8, &aom_highbd_sad_skip_4x8x4d_c, 8), - make_tuple(4, 4, &aom_highbd_sad_skip_4x4x4d_c, 8), #if !CONFIG_REALTIME_ONLY make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_c, 8), make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_c, 8), - make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_c, 8), make_tuple(8, 32, &aom_highbd_sad_skip_8x32x4d_c, 8), - make_tuple(16, 4, &aom_highbd_sad_skip_16x4x4d_c, 8), make_tuple(4, 16, &aom_highbd_sad_skip_4x16x4d_c, 8), #endif @@ -1639,18 +1611,11 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16x4d_c, 10), make_tuple(16, 32, &aom_highbd_sad_skip_16x32x4d_c, 10), make_tuple(16, 16, &aom_highbd_sad_skip_16x16x4d_c, 10), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8x4d_c, 10), make_tuple(8, 16, &aom_highbd_sad_skip_8x16x4d_c, 10), - make_tuple(8, 8, &aom_highbd_sad_skip_8x8x4d_c, 10), - make_tuple(8, 4, &aom_highbd_sad_skip_8x4x4d_c, 10), - make_tuple(4, 8, &aom_highbd_sad_skip_4x8x4d_c, 10), - make_tuple(4, 4, &aom_highbd_sad_skip_4x4x4d_c, 10), #if !CONFIG_REALTIME_ONLY make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_c, 10), make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_c, 10), - make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_c, 10), make_tuple(8, 32, &aom_highbd_sad_skip_8x32x4d_c, 10), - make_tuple(16, 4, &aom_highbd_sad_skip_16x4x4d_c, 10), make_tuple(4, 16, &aom_highbd_sad_skip_4x16x4d_c, 10), #endif @@ -1664,18 +1629,11 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16x4d_c, 12), make_tuple(16, 32, &aom_highbd_sad_skip_16x32x4d_c, 12), make_tuple(16, 16, &aom_highbd_sad_skip_16x16x4d_c, 12), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8x4d_c, 12), make_tuple(8, 16, &aom_highbd_sad_skip_8x16x4d_c, 12), - make_tuple(8, 8, &aom_highbd_sad_skip_8x8x4d_c, 12), - make_tuple(8, 4, &aom_highbd_sad_skip_8x4x4d_c, 12), - make_tuple(4, 8, &aom_highbd_sad_skip_4x8x4d_c, 12), - make_tuple(4, 4, &aom_highbd_sad_skip_4x4x4d_c, 12), #if !CONFIG_REALTIME_ONLY make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_c, 12), make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_c, 12), - make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_c, 12), make_tuple(8, 32, &aom_highbd_sad_skip_8x32x4d_c, 12), - make_tuple(16, 4, &aom_highbd_sad_skip_16x4x4d_c, 12), make_tuple(4, 16, &aom_highbd_sad_skip_4x16x4d_c, 12), #endif #endif // CONFIG_AV1_HIGHBITDEPTH @@ -1909,12 +1867,7 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16_neon, 8), make_tuple(16, 32, &aom_highbd_sad_skip_16x32_neon, 8), make_tuple(16, 16, &aom_highbd_sad_skip_16x16_neon, 8), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8_neon, 8), make_tuple(8, 16, &aom_highbd_sad_skip_8x16_neon, 8), - make_tuple(8, 8, &aom_highbd_sad_skip_8x8_neon, 8), - make_tuple(8, 4, &aom_highbd_sad_skip_8x4_neon, 8), - make_tuple(4, 8, &aom_highbd_sad_skip_4x8_neon, 8), - make_tuple(4, 4, &aom_highbd_sad_skip_4x4_neon, 8), make_tuple(128, 128, &aom_highbd_sad_skip_128x128_neon, 10), make_tuple(128, 64, &aom_highbd_sad_skip_128x64_neon, 10), make_tuple(64, 128, &aom_highbd_sad_skip_64x128_neon, 10), @@ -1925,12 +1878,7 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16_neon, 10), make_tuple(16, 32, &aom_highbd_sad_skip_16x32_neon, 10), make_tuple(16, 16, &aom_highbd_sad_skip_16x16_neon, 10), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8_neon, 10), make_tuple(8, 16, &aom_highbd_sad_skip_8x16_neon, 10), - make_tuple(8, 8, &aom_highbd_sad_skip_8x8_neon, 10), - make_tuple(8, 4, &aom_highbd_sad_skip_8x4_neon, 10), - make_tuple(4, 8, &aom_highbd_sad_skip_4x8_neon, 10), - make_tuple(4, 4, &aom_highbd_sad_skip_4x4_neon, 10), make_tuple(128, 128, &aom_highbd_sad_skip_128x128_neon, 12), make_tuple(128, 64, &aom_highbd_sad_skip_128x64_neon, 12), make_tuple(64, 128, &aom_highbd_sad_skip_64x128_neon, 12), @@ -1941,12 +1889,7 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16_neon, 12), make_tuple(16, 32, &aom_highbd_sad_skip_16x32_neon, 12), make_tuple(16, 16, &aom_highbd_sad_skip_16x16_neon, 12), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8_neon, 12), make_tuple(8, 16, &aom_highbd_sad_skip_8x16_neon, 12), - make_tuple(8, 8, &aom_highbd_sad_skip_8x8_neon, 12), - make_tuple(8, 4, &aom_highbd_sad_skip_8x4_neon, 12), - make_tuple(4, 8, &aom_highbd_sad_skip_4x8_neon, 12), - make_tuple(4, 4, &aom_highbd_sad_skip_4x4_neon, 12), #endif // CONFIG_AV1_HIGHBITDEPTH #if !CONFIG_REALTIME_ONLY make_tuple(64, 16, &aom_sad_skip_64x16_neon, -1), @@ -1958,21 +1901,15 @@ #if CONFIG_AV1_HIGHBITDEPTH make_tuple(64, 16, &aom_highbd_sad_skip_64x16_neon, 8), make_tuple(16, 64, &aom_highbd_sad_skip_16x64_neon, 8), - make_tuple(32, 8, &aom_highbd_sad_skip_32x8_neon, 8), make_tuple(8, 32, &aom_highbd_sad_skip_8x32_neon, 8), - make_tuple(16, 4, &aom_highbd_sad_skip_16x4_neon, 8), make_tuple(4, 16, &aom_highbd_sad_skip_4x16_neon, 8), make_tuple(64, 16, &aom_highbd_sad_skip_64x16_neon, 10), make_tuple(16, 64, &aom_highbd_sad_skip_16x64_neon, 10), - make_tuple(32, 8, &aom_highbd_sad_skip_32x8_neon, 10), make_tuple(8, 32, &aom_highbd_sad_skip_8x32_neon, 10), - make_tuple(16, 4, &aom_highbd_sad_skip_16x4_neon, 10), make_tuple(4, 16, &aom_highbd_sad_skip_4x16_neon, 10), make_tuple(64, 16, &aom_highbd_sad_skip_64x16_neon, 12), make_tuple(16, 64, &aom_highbd_sad_skip_16x64_neon, 12), - make_tuple(32, 8, &aom_highbd_sad_skip_32x8_neon, 12), make_tuple(8, 32, &aom_highbd_sad_skip_8x32_neon, 12), - make_tuple(16, 4, &aom_highbd_sad_skip_16x4_neon, 12), make_tuple(4, 16, &aom_highbd_sad_skip_4x16_neon, 12), #endif // CONFIG_AV1_HIGHBITDEPTH #endif // !CONFIG_REALTIME_ONLY @@ -2008,12 +1945,7 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16x4d_neon, 8), make_tuple(16, 32, &aom_highbd_sad_skip_16x32x4d_neon, 8), make_tuple(16, 16, &aom_highbd_sad_skip_16x16x4d_neon, 8), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8x4d_neon, 8), make_tuple(8, 16, &aom_highbd_sad_skip_8x16x4d_neon, 8), - make_tuple(8, 8, &aom_highbd_sad_skip_8x8x4d_neon, 8), - make_tuple(8, 4, &aom_highbd_sad_skip_8x4x4d_neon, 8), - make_tuple(4, 8, &aom_highbd_sad_skip_4x8x4d_neon, 8), - make_tuple(4, 4, &aom_highbd_sad_skip_4x4x4d_neon, 8), make_tuple(128, 128, &aom_highbd_sad_skip_128x128x4d_neon, 10), make_tuple(128, 64, &aom_highbd_sad_skip_128x64x4d_neon, 10), make_tuple(64, 128, &aom_highbd_sad_skip_64x128x4d_neon, 10), @@ -2024,12 +1956,7 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16x4d_neon, 10), make_tuple(16, 32, &aom_highbd_sad_skip_16x32x4d_neon, 10), make_tuple(16, 16, &aom_highbd_sad_skip_16x16x4d_neon, 10), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8x4d_neon, 10), make_tuple(8, 16, &aom_highbd_sad_skip_8x16x4d_neon, 10), - make_tuple(8, 8, &aom_highbd_sad_skip_8x8x4d_neon, 10), - make_tuple(8, 4, &aom_highbd_sad_skip_8x4x4d_neon, 10), - make_tuple(4, 8, &aom_highbd_sad_skip_4x8x4d_neon, 10), - make_tuple(4, 4, &aom_highbd_sad_skip_4x4x4d_neon, 10), make_tuple(128, 128, &aom_highbd_sad_skip_128x128x4d_neon, 12), make_tuple(128, 64, &aom_highbd_sad_skip_128x64x4d_neon, 12), make_tuple(64, 128, &aom_highbd_sad_skip_64x128x4d_neon, 12), @@ -2040,12 +1967,7 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16x4d_neon, 12), make_tuple(16, 32, &aom_highbd_sad_skip_16x32x4d_neon, 12), make_tuple(16, 16, &aom_highbd_sad_skip_16x16x4d_neon, 12), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8x4d_neon, 12), make_tuple(8, 16, &aom_highbd_sad_skip_8x16x4d_neon, 12), - make_tuple(8, 8, &aom_highbd_sad_skip_8x8x4d_neon, 12), - make_tuple(8, 4, &aom_highbd_sad_skip_8x4x4d_neon, 12), - make_tuple(4, 8, &aom_highbd_sad_skip_4x8x4d_neon, 12), - make_tuple(4, 4, &aom_highbd_sad_skip_4x4x4d_neon, 12), #endif // CONFIG_AV1_HIGHBITDEPTH #if !CONFIG_REALTIME_ONLY make_tuple(64, 16, &aom_sad_skip_64x16x4d_neon, -1), @@ -2057,21 +1979,15 @@ #if CONFIG_AV1_HIGHBITDEPTH make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_neon, 8), make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_neon, 8), - make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_neon, 8), make_tuple(8, 32, &aom_highbd_sad_skip_8x32x4d_neon, 8), - make_tuple(16, 4, &aom_highbd_sad_skip_16x4x4d_neon, 8), make_tuple(4, 16, &aom_highbd_sad_skip_4x16x4d_neon, 8), make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_neon, 10), make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_neon, 10), - make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_neon, 10), make_tuple(8, 32, &aom_highbd_sad_skip_8x32x4d_neon, 10), - make_tuple(16, 4, &aom_highbd_sad_skip_16x4x4d_neon, 10), make_tuple(4, 16, &aom_highbd_sad_skip_4x16x4d_neon, 10), make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_neon, 12), make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_neon, 12), - make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_neon, 12), make_tuple(8, 32, &aom_highbd_sad_skip_8x32x4d_neon, 12), - make_tuple(16, 4, &aom_highbd_sad_skip_16x4x4d_neon, 12), make_tuple(4, 16, &aom_highbd_sad_skip_4x16x4d_neon, 12), #endif // CONFIG_AV1_HIGHBITDEPTH #endif // !CONFIG_REALTIME_ONLY @@ -2591,14 +2507,10 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16_sse2, 8), 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), make_tuple(8, 16, &aom_highbd_sad_skip_8x16_sse2, 8), - make_tuple(8, 8, &aom_highbd_sad_skip_8x8_sse2, 8), - make_tuple(4, 8, &aom_highbd_sad_skip_4x8_sse2, 8), #if !CONFIG_REALTIME_ONLY make_tuple(64, 16, &aom_highbd_sad_skip_64x16_sse2, 8), make_tuple(16, 64, &aom_highbd_sad_skip_16x64_sse2, 8), - 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), #endif @@ -2610,14 +2522,10 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16_sse2, 10), 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), make_tuple(8, 16, &aom_highbd_sad_skip_8x16_sse2, 10), - make_tuple(8, 8, &aom_highbd_sad_skip_8x8_sse2, 10), - make_tuple(4, 8, &aom_highbd_sad_skip_4x8_sse2, 10), #if !CONFIG_REALTIME_ONLY make_tuple(64, 16, &aom_highbd_sad_skip_64x16_sse2, 10), make_tuple(16, 64, &aom_highbd_sad_skip_16x64_sse2, 10), - 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), #endif @@ -2629,14 +2537,10 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16_sse2, 12), 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), make_tuple(8, 16, &aom_highbd_sad_skip_8x16_sse2, 12), - make_tuple(8, 8, &aom_highbd_sad_skip_8x8_sse2, 12), - make_tuple(4, 8, &aom_highbd_sad_skip_4x8_sse2, 12), #if !CONFIG_REALTIME_ONLY make_tuple(64, 16, &aom_highbd_sad_skip_64x16_sse2, 12), make_tuple(16, 64, &aom_highbd_sad_skip_16x64_sse2, 12), - 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), #endif @@ -2861,14 +2765,10 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16x4d_sse2, 8), make_tuple(16, 32, &aom_highbd_sad_skip_16x32x4d_sse2, 8), make_tuple(16, 16, &aom_highbd_sad_skip_16x16x4d_sse2, 8), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8x4d_sse2, 8), make_tuple(8, 16, &aom_highbd_sad_skip_8x16x4d_sse2, 8), - make_tuple(8, 8, &aom_highbd_sad_skip_8x8x4d_sse2, 8), - make_tuple(4, 8, &aom_highbd_sad_skip_4x8x4d_sse2, 8), #if !CONFIG_REALTIME_ONLY make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_sse2, 8), make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_sse2, 8), - make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_sse2, 8), make_tuple(8, 32, &aom_highbd_sad_skip_8x32x4d_sse2, 8), make_tuple(4, 16, &aom_highbd_sad_skip_4x16x4d_sse2, 8), #endif @@ -2879,14 +2779,10 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16x4d_sse2, 10), make_tuple(16, 32, &aom_highbd_sad_skip_16x32x4d_sse2, 10), make_tuple(16, 16, &aom_highbd_sad_skip_16x16x4d_sse2, 10), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8x4d_sse2, 10), make_tuple(8, 16, &aom_highbd_sad_skip_8x16x4d_sse2, 10), - make_tuple(8, 8, &aom_highbd_sad_skip_8x8x4d_sse2, 10), - make_tuple(4, 8, &aom_highbd_sad_skip_4x8x4d_sse2, 10), #if !CONFIG_REALTIME_ONLY make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_sse2, 10), make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_sse2, 10), - make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_sse2, 10), make_tuple(8, 32, &aom_highbd_sad_skip_8x32x4d_sse2, 10), make_tuple(4, 16, &aom_highbd_sad_skip_4x16x4d_sse2, 10), #endif @@ -2897,14 +2793,10 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16x4d_sse2, 12), make_tuple(16, 32, &aom_highbd_sad_skip_16x32x4d_sse2, 12), make_tuple(16, 16, &aom_highbd_sad_skip_16x16x4d_sse2, 12), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8x4d_sse2, 12), make_tuple(8, 16, &aom_highbd_sad_skip_8x16x4d_sse2, 12), - make_tuple(8, 8, &aom_highbd_sad_skip_8x8x4d_sse2, 12), - make_tuple(4, 8, &aom_highbd_sad_skip_4x8x4d_sse2, 12), #if !CONFIG_REALTIME_ONLY make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_sse2, 12), make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_sse2, 12), - make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_sse2, 12), make_tuple(8, 32, &aom_highbd_sad_skip_8x32x4d_sse2, 12), make_tuple(4, 16, &aom_highbd_sad_skip_4x16x4d_sse2, 12), #endif @@ -3034,7 +2926,6 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16_avx2, 8), make_tuple(16, 32, &aom_highbd_sad_skip_16x32_avx2, 8), make_tuple(16, 16, &aom_highbd_sad_skip_16x16_avx2, 8), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8_avx2, 8), make_tuple(128, 128, &aom_highbd_sad_skip_128x128_avx2, 10), make_tuple(128, 64, &aom_highbd_sad_skip_128x64_avx2, 10), @@ -3046,7 +2937,6 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16_avx2, 10), make_tuple(16, 32, &aom_highbd_sad_skip_16x32_avx2, 10), make_tuple(16, 16, &aom_highbd_sad_skip_16x16_avx2, 10), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8_avx2, 10), make_tuple(128, 128, &aom_highbd_sad_skip_128x128_avx2, 12), make_tuple(128, 64, &aom_highbd_sad_skip_128x64_avx2, 12), @@ -3058,7 +2948,6 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16_avx2, 12), make_tuple(16, 32, &aom_highbd_sad_skip_16x32_avx2, 12), make_tuple(16, 16, &aom_highbd_sad_skip_16x16_avx2, 12), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8_avx2, 12), #if !CONFIG_REALTIME_ONLY make_tuple(16, 64, &aom_highbd_sad_skip_16x64_avx2, 8), @@ -3156,7 +3045,6 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16x4d_avx2, 8), make_tuple(16, 32, &aom_highbd_sad_skip_16x32x4d_avx2, 8), make_tuple(16, 16, &aom_highbd_sad_skip_16x16x4d_avx2, 8), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8x4d_avx2, 8), make_tuple(128, 128, &aom_highbd_sad_skip_128x128x4d_avx2, 10), make_tuple(128, 64, &aom_highbd_sad_skip_128x64x4d_avx2, 10), @@ -3168,7 +3056,6 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16x4d_avx2, 10), make_tuple(16, 32, &aom_highbd_sad_skip_16x32x4d_avx2, 10), make_tuple(16, 16, &aom_highbd_sad_skip_16x16x4d_avx2, 10), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8x4d_avx2, 10), make_tuple(128, 128, &aom_highbd_sad_skip_128x128x4d_avx2, 12), make_tuple(128, 64, &aom_highbd_sad_skip_128x64x4d_avx2, 12), @@ -3180,19 +3067,15 @@ make_tuple(32, 16, &aom_highbd_sad_skip_32x16x4d_avx2, 12), make_tuple(16, 32, &aom_highbd_sad_skip_16x32x4d_avx2, 12), make_tuple(16, 16, &aom_highbd_sad_skip_16x16x4d_avx2, 12), - make_tuple(16, 8, &aom_highbd_sad_skip_16x8x4d_avx2, 12), #if !CONFIG_REALTIME_ONLY make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_avx2, 8), - make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_avx2, 8), make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_avx2, 8), make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_avx2, 10), - make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_avx2, 10), make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_avx2, 10), make_tuple(64, 16, &aom_highbd_sad_skip_64x16x4d_avx2, 12), - make_tuple(32, 8, &aom_highbd_sad_skip_32x8x4d_avx2, 12), make_tuple(16, 64, &aom_highbd_sad_skip_16x64x4d_avx2, 12), #endif #endif