aom_dsp_rtcd_defs: restore highbd opts w/CONFIG_REALTIME_ONLY
after:
f883c11f6 Remove REALTIME_ONLY from decoder
rectangular block support was restored in the decoder
Bug: aomedia:3248
Change-Id: I29ac97fcba93fe0c54205280f945e7865b3017eb
diff --git a/aom_dsp/aom_dsp_rtcd_defs.pl b/aom_dsp/aom_dsp_rtcd_defs.pl
index 804d1d1..c82b622 100755
--- a/aom_dsp/aom_dsp_rtcd_defs.pl
+++ b/aom_dsp/aom_dsp_rtcd_defs.pl
@@ -41,20 +41,20 @@
@block_widths = (4, 8, 16, 32, 64, 128);
-@block_sizes = ();
+@encoder_block_sizes = ();
foreach $w (@block_widths) {
foreach $h (@block_widths) {
- push @block_sizes, [$w, $h] if ($w <= 2*$h && $h <= 2*$w) ;
+ push @encoder_block_sizes, [$w, $h] if ($w <= 2*$h && $h <= 2*$w);
}
}
if (aom_config("CONFIG_REALTIME_ONLY") ne "yes") {
- push @block_sizes, [4, 16];
- push @block_sizes, [16, 4];
- push @block_sizes, [8, 32];
- push @block_sizes, [32, 8];
- push @block_sizes, [16, 64];
- push @block_sizes, [64, 16];
+ push @encoder_block_sizes, [4, 16];
+ push @encoder_block_sizes, [16, 4];
+ push @encoder_block_sizes, [8, 32];
+ push @encoder_block_sizes, [32, 8];
+ push @encoder_block_sizes, [16, 64];
+ push @encoder_block_sizes, [64, 16];
}
@tx_dims = (4, 8, 16, 32, 64);
@@ -309,15 +309,12 @@
specialize qw/aom_highbd_v_predictor_32x64 neon/;
specialize qw/aom_highbd_v_predictor_64x32 neon/;
specialize qw/aom_highbd_v_predictor_64x64 neon/;
-
- if (aom_config("CONFIG_REALTIME_ONLY") ne "yes") {
- specialize qw/aom_highbd_v_predictor_4x16 neon/;
- specialize qw/aom_highbd_v_predictor_8x32 neon/;
- specialize qw/aom_highbd_v_predictor_16x4 neon/;
- specialize qw/aom_highbd_v_predictor_16x64 neon/;
- specialize qw/aom_highbd_v_predictor_32x8 neon/;
- specialize qw/aom_highbd_v_predictor_64x16 neon/;
- }
+ specialize qw/aom_highbd_v_predictor_4x16 neon/;
+ specialize qw/aom_highbd_v_predictor_8x32 neon/;
+ specialize qw/aom_highbd_v_predictor_16x4 neon/;
+ specialize qw/aom_highbd_v_predictor_16x64 neon/;
+ specialize qw/aom_highbd_v_predictor_32x8 neon/;
+ specialize qw/aom_highbd_v_predictor_64x16 neon/;
# TODO(yunqingwang): optimize rectangular DC_PRED to replace division
# by multiply and shift.
@@ -387,14 +384,12 @@
specialize qw/aom_highbd_paeth_predictor_32x64 neon/;
specialize qw/aom_highbd_paeth_predictor_64x32 neon/;
specialize qw/aom_highbd_paeth_predictor_64x64 neon/;
- if (aom_config("CONFIG_REALTIME_ONLY") ne "yes") {
- specialize qw/aom_highbd_paeth_predictor_4x16 neon/;
- specialize qw/aom_highbd_paeth_predictor_8x32 neon/;
- specialize qw/aom_highbd_paeth_predictor_16x4 neon/;
- specialize qw/aom_highbd_paeth_predictor_16x64 neon/;
- specialize qw/aom_highbd_paeth_predictor_32x8 neon/;
- specialize qw/aom_highbd_paeth_predictor_64x16 neon/;
- }
+ specialize qw/aom_highbd_paeth_predictor_4x16 neon/;
+ specialize qw/aom_highbd_paeth_predictor_8x32 neon/;
+ specialize qw/aom_highbd_paeth_predictor_16x4 neon/;
+ specialize qw/aom_highbd_paeth_predictor_16x64 neon/;
+ specialize qw/aom_highbd_paeth_predictor_32x8 neon/;
+ specialize qw/aom_highbd_paeth_predictor_64x16 neon/;
specialize qw/aom_highbd_smooth_predictor_4x4 neon/;
specialize qw/aom_highbd_smooth_predictor_4x8 neon/;
@@ -409,14 +404,12 @@
specialize qw/aom_highbd_smooth_predictor_32x64 neon/;
specialize qw/aom_highbd_smooth_predictor_64x32 neon/;
specialize qw/aom_highbd_smooth_predictor_64x64 neon/;
- if (aom_config("CONFIG_REALTIME_ONLY") ne "yes") {
- specialize qw/aom_highbd_smooth_predictor_4x16 neon/;
- specialize qw/aom_highbd_smooth_predictor_8x32 neon/;
- specialize qw/aom_highbd_smooth_predictor_16x4 neon/;
- specialize qw/aom_highbd_smooth_predictor_16x64 neon/;
- specialize qw/aom_highbd_smooth_predictor_32x8 neon/;
- specialize qw/aom_highbd_smooth_predictor_64x16 neon/;
- }
+ specialize qw/aom_highbd_smooth_predictor_4x16 neon/;
+ specialize qw/aom_highbd_smooth_predictor_8x32 neon/;
+ specialize qw/aom_highbd_smooth_predictor_16x4 neon/;
+ specialize qw/aom_highbd_smooth_predictor_16x64 neon/;
+ specialize qw/aom_highbd_smooth_predictor_32x8 neon/;
+ specialize qw/aom_highbd_smooth_predictor_64x16 neon/;
specialize qw/aom_highbd_smooth_v_predictor_4x4 neon/;
specialize qw/aom_highbd_smooth_v_predictor_4x8 neon/;
@@ -431,14 +424,12 @@
specialize qw/aom_highbd_smooth_v_predictor_32x64 neon/;
specialize qw/aom_highbd_smooth_v_predictor_64x32 neon/;
specialize qw/aom_highbd_smooth_v_predictor_64x64 neon/;
- if (aom_config("CONFIG_REALTIME_ONLY") ne "yes") {
- specialize qw/aom_highbd_smooth_v_predictor_4x16 neon/;
- specialize qw/aom_highbd_smooth_v_predictor_8x32 neon/;
- specialize qw/aom_highbd_smooth_v_predictor_16x4 neon/;
- specialize qw/aom_highbd_smooth_v_predictor_16x64 neon/;
- specialize qw/aom_highbd_smooth_v_predictor_32x8 neon/;
- specialize qw/aom_highbd_smooth_v_predictor_64x16 neon/;
- }
+ specialize qw/aom_highbd_smooth_v_predictor_4x16 neon/;
+ specialize qw/aom_highbd_smooth_v_predictor_8x32 neon/;
+ specialize qw/aom_highbd_smooth_v_predictor_16x4 neon/;
+ specialize qw/aom_highbd_smooth_v_predictor_16x64 neon/;
+ specialize qw/aom_highbd_smooth_v_predictor_32x8 neon/;
+ specialize qw/aom_highbd_smooth_v_predictor_64x16 neon/;
specialize qw/aom_highbd_smooth_h_predictor_4x4 neon/;
specialize qw/aom_highbd_smooth_h_predictor_4x8 neon/;
@@ -453,14 +444,12 @@
specialize qw/aom_highbd_smooth_h_predictor_32x64 neon/;
specialize qw/aom_highbd_smooth_h_predictor_64x32 neon/;
specialize qw/aom_highbd_smooth_h_predictor_64x64 neon/;
- if (aom_config("CONFIG_REALTIME_ONLY") ne "yes") {
- specialize qw/aom_highbd_smooth_h_predictor_4x16 neon/;
- specialize qw/aom_highbd_smooth_h_predictor_8x32 neon/;
- specialize qw/aom_highbd_smooth_h_predictor_16x4 neon/;
- specialize qw/aom_highbd_smooth_h_predictor_16x64 neon/;
- specialize qw/aom_highbd_smooth_h_predictor_32x8 neon/;
- specialize qw/aom_highbd_smooth_h_predictor_64x16 neon/;
- }
+ specialize qw/aom_highbd_smooth_h_predictor_4x16 neon/;
+ specialize qw/aom_highbd_smooth_h_predictor_8x32 neon/;
+ specialize qw/aom_highbd_smooth_h_predictor_16x4 neon/;
+ specialize qw/aom_highbd_smooth_h_predictor_16x64 neon/;
+ specialize qw/aom_highbd_smooth_h_predictor_32x8 neon/;
+ specialize qw/aom_highbd_smooth_h_predictor_64x16 neon/;
}
#
# Sub Pixel Filters
@@ -771,7 +760,7 @@
#
# Single block SAD / Single block Avg SAD
#
- foreach (@block_sizes) {
+ foreach (@encoder_block_sizes) {
($w, $h) = @$_;
add_proto qw/unsigned int/, "aom_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_sad_skip_${w}x${h}", "const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride";
@@ -889,7 +878,7 @@
specialize qw/aom_sad128xh sse2/;
if (aom_config("CONFIG_AV1_HIGHBITDEPTH") eq "yes") {
- foreach (@block_sizes) {
+ 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";
@@ -970,14 +959,14 @@
#
# Masked SAD
#
- foreach (@block_sizes) {
+ foreach (@encoder_block_sizes) {
($w, $h) = @$_;
add_proto qw/unsigned int/, "aom_masked_sad${w}x${h}", "const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask";
specialize "aom_masked_sad${w}x${h}", qw/ssse3 avx2/;
}
if (aom_config("CONFIG_AV1_HIGHBITDEPTH") eq "yes") {
- foreach (@block_sizes) {
+ foreach (@encoder_block_sizes) {
($w, $h) = @$_;
add_proto qw/unsigned int/, "aom_highbd_masked_sad${w}x${h}", "const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask";
specialize "aom_highbd_masked_sad${w}x${h}", qw/ssse3 avx2/;
@@ -988,7 +977,7 @@
# OBMC SAD
#
if (aom_config("CONFIG_REALTIME_ONLY") ne "yes") {
- foreach (@block_sizes) {
+ foreach (@encoder_block_sizes) {
($w, $h) = @$_;
add_proto qw/unsigned int/, "aom_obmc_sad${w}x${h}", "const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask";
if (! (($w == 128 && $h == 32) || ($w == 32 && $h == 128))) {
@@ -997,7 +986,7 @@
}
if (aom_config("CONFIG_AV1_HIGHBITDEPTH") eq "yes") {
- foreach (@block_sizes) {
+ foreach (@encoder_block_sizes) {
($w, $h) = @$_;
add_proto qw/unsigned int/, "aom_highbd_obmc_sad${w}x${h}", "const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask";
if (! (($w == 128 && $h == 32) || ($w == 32 && $h == 128))) {
@@ -1010,7 +999,7 @@
#
# Multi-block SAD, comparing a reference to N independent blocks
#
- foreach (@block_sizes) {
+ foreach (@encoder_block_sizes) {
($w, $h) = @$_;
add_proto qw/void/, "aom_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_sad${w}x${h}x4d_avg", "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[4], int ref_stride, const uint8_t *second_pred, uint32_t sad_array[4]";
@@ -1135,7 +1124,7 @@
# Multi-block SAD, comparing a reference to N independent blocks
#
if (aom_config("CONFIG_AV1_HIGHBITDEPTH") eq "yes") {
- foreach (@block_sizes) {
+ foreach (@encoder_block_sizes) {
($w, $h) = @$_;
add_proto qw/void/, "aom_highbd_sad${w}x${h}x4d", "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array";
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[], int ref_stride, uint32_t *sad_array";
@@ -1341,7 +1330,7 @@
add_proto qw/uint64_t/, "aom_mse_wxh_16bit", "uint8_t *dst, int dstride,uint16_t *src, int sstride, int w, int h";
specialize qw/aom_mse_wxh_16bit sse2 avx2/;
- foreach (@block_sizes) {
+ foreach (@encoder_block_sizes) {
($w, $h) = @$_;
add_proto qw/unsigned int/, "aom_variance${w}x${h}", "const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse";
add_proto qw/uint32_t/, "aom_sub_pixel_variance${w}x${h}", "const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse";
@@ -1454,7 +1443,7 @@
add_proto qw/unsigned int/, "aom_highbd_${bd}_variance4x2", "const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse";
- foreach (@block_sizes) {
+ foreach (@encoder_block_sizes) {
($w, $h) = @$_;
add_proto qw/unsigned int/, "aom_highbd_${bd}_variance${w}x${h}", "const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse";
add_proto qw/uint32_t/, "aom_highbd_${bd}_sub_pixel_variance${w}x${h}", "const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse";
@@ -1500,7 +1489,7 @@
#
# Masked Variance / Masked Subpixel Variance
#
- foreach (@block_sizes) {
+ foreach (@encoder_block_sizes) {
($w, $h) = @$_;
add_proto qw/unsigned int/, "aom_masked_sub_pixel_variance${w}x${h}", "const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse";
specialize "aom_masked_sub_pixel_variance${w}x${h}", qw/ssse3/;
@@ -1508,7 +1497,7 @@
if (aom_config("CONFIG_AV1_HIGHBITDEPTH") eq "yes") {
foreach $bd ("_8_", "_10_", "_12_") {
- foreach (@block_sizes) {
+ foreach (@encoder_block_sizes) {
($w, $h) = @$_;
add_proto qw/unsigned int/, "aom_highbd${bd}masked_sub_pixel_variance${w}x${h}", "const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse";
specialize "aom_highbd${bd}masked_sub_pixel_variance${w}x${h}", qw/ssse3/;
@@ -1520,7 +1509,7 @@
# OBMC Variance / OBMC Subpixel Variance
#
if (aom_config("CONFIG_REALTIME_ONLY") ne "yes") {
- foreach (@block_sizes) {
+ foreach (@encoder_block_sizes) {
($w, $h) = @$_;
add_proto qw/unsigned int/, "aom_obmc_variance${w}x${h}", "const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse";
add_proto qw/unsigned int/, "aom_obmc_sub_pixel_variance${w}x${h}", "const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse";
@@ -1530,7 +1519,7 @@
if (aom_config("CONFIG_AV1_HIGHBITDEPTH") eq "yes") {
foreach $bd ("_", "_10_", "_12_") {
- foreach (@block_sizes) {
+ foreach (@encoder_block_sizes) {
($w, $h) = @$_;
add_proto qw/unsigned int/, "aom_highbd${bd}obmc_variance${w}x${h}", "const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse";
add_proto qw/unsigned int/, "aom_highbd${bd}obmc_sub_pixel_variance${w}x${h}", "const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse";
diff --git a/aom_dsp/arm/highbd_intrapred_neon.c b/aom_dsp/arm/highbd_intrapred_neon.c
index 7686e6b..7544777 100644
--- a/aom_dsp/arm/highbd_intrapred_neon.c
+++ b/aom_dsp/arm/highbd_intrapred_neon.c
@@ -273,14 +273,11 @@
HIGHBD_PAETH_NXM(4, 4)
HIGHBD_PAETH_NXM(4, 8)
+HIGHBD_PAETH_NXM(4, 16)
HIGHBD_PAETH_NXM(8, 4)
HIGHBD_PAETH_NXM(8, 8)
HIGHBD_PAETH_NXM(8, 16)
-
-#if !CONFIG_REALTIME_ONLY
-HIGHBD_PAETH_NXM(4, 16)
HIGHBD_PAETH_NXM(8, 32)
-#endif
// Select the closest values and collect them.
static INLINE uint16x8_t select_paeth(const uint16x8_t top,
@@ -366,22 +363,19 @@
highbd_paeth16_plus_x_h_neon(dst, stride, above, left, W, H); \
}
+HIGHBD_PAETH_NXM_WIDE(16, 4)
HIGHBD_PAETH_NXM_WIDE(16, 8)
HIGHBD_PAETH_NXM_WIDE(16, 16)
HIGHBD_PAETH_NXM_WIDE(16, 32)
+HIGHBD_PAETH_NXM_WIDE(16, 64)
+HIGHBD_PAETH_NXM_WIDE(32, 8)
HIGHBD_PAETH_NXM_WIDE(32, 16)
HIGHBD_PAETH_NXM_WIDE(32, 32)
HIGHBD_PAETH_NXM_WIDE(32, 64)
+HIGHBD_PAETH_NXM_WIDE(64, 16)
HIGHBD_PAETH_NXM_WIDE(64, 32)
HIGHBD_PAETH_NXM_WIDE(64, 64)
-#if !CONFIG_REALTIME_ONLY
-HIGHBD_PAETH_NXM_WIDE(16, 4)
-HIGHBD_PAETH_NXM_WIDE(16, 64)
-HIGHBD_PAETH_NXM_WIDE(32, 8)
-HIGHBD_PAETH_NXM_WIDE(64, 16)
-#endif
-
// -----------------------------------------------------------------------------
// SMOOTH
@@ -491,12 +485,9 @@
HIGHBD_SMOOTH_NXM(4, 8)
HIGHBD_SMOOTH_NXM(8, 4)
HIGHBD_SMOOTH_NXM(8, 8)
-HIGHBD_SMOOTH_NXM(8, 16)
-
-#if !CONFIG_REALTIME_ONLY
HIGHBD_SMOOTH_NXM(4, 16)
+HIGHBD_SMOOTH_NXM(8, 16)
HIGHBD_SMOOTH_NXM(8, 32)
-#endif
#undef HIGHBD_SMOOTH_NXM
@@ -563,22 +554,19 @@
highbd_smooth_##W##xh_neon(dst, y_stride, above, left, H); \
}
+HIGHBD_SMOOTH_NXM_WIDE(16, 4)
HIGHBD_SMOOTH_NXM_WIDE(16, 8)
HIGHBD_SMOOTH_NXM_WIDE(16, 16)
HIGHBD_SMOOTH_NXM_WIDE(16, 32)
+HIGHBD_SMOOTH_NXM_WIDE(16, 64)
+HIGHBD_SMOOTH_NXM_WIDE(32, 8)
HIGHBD_SMOOTH_NXM_WIDE(32, 16)
HIGHBD_SMOOTH_NXM_WIDE(32, 32)
HIGHBD_SMOOTH_NXM_WIDE(32, 64)
+HIGHBD_SMOOTH_NXM_WIDE(64, 16)
HIGHBD_SMOOTH_NXM_WIDE(64, 32)
HIGHBD_SMOOTH_NXM_WIDE(64, 64)
-#if !CONFIG_REALTIME_ONLY
-HIGHBD_SMOOTH_NXM_WIDE(16, 4)
-HIGHBD_SMOOTH_NXM_WIDE(16, 64)
-HIGHBD_SMOOTH_NXM_WIDE(32, 8)
-HIGHBD_SMOOTH_NXM_WIDE(64, 16)
-#endif
-
#undef HIGHBD_SMOOTH_NXM_WIDE
static void highbd_smooth_v_4xh_neon(uint16_t *dst, ptrdiff_t stride,
@@ -639,14 +627,11 @@
HIGHBD_SMOOTH_V_NXM(4, 4)
HIGHBD_SMOOTH_V_NXM(4, 8)
+HIGHBD_SMOOTH_V_NXM(4, 16)
HIGHBD_SMOOTH_V_NXM(8, 4)
HIGHBD_SMOOTH_V_NXM(8, 8)
HIGHBD_SMOOTH_V_NXM(8, 16)
-
-#if !CONFIG_REALTIME_ONLY
-HIGHBD_SMOOTH_V_NXM(4, 16)
HIGHBD_SMOOTH_V_NXM(8, 32)
-#endif
#undef HIGHBD_SMOOTH_V_NXM
@@ -701,22 +686,19 @@
highbd_smooth_v_##W##xh_neon(dst, y_stride, above, left, H); \
}
+HIGHBD_SMOOTH_V_NXM_WIDE(16, 4)
HIGHBD_SMOOTH_V_NXM_WIDE(16, 8)
HIGHBD_SMOOTH_V_NXM_WIDE(16, 16)
HIGHBD_SMOOTH_V_NXM_WIDE(16, 32)
+HIGHBD_SMOOTH_V_NXM_WIDE(16, 64)
+HIGHBD_SMOOTH_V_NXM_WIDE(32, 8)
HIGHBD_SMOOTH_V_NXM_WIDE(32, 16)
HIGHBD_SMOOTH_V_NXM_WIDE(32, 32)
HIGHBD_SMOOTH_V_NXM_WIDE(32, 64)
+HIGHBD_SMOOTH_V_NXM_WIDE(64, 16)
HIGHBD_SMOOTH_V_NXM_WIDE(64, 32)
HIGHBD_SMOOTH_V_NXM_WIDE(64, 64)
-#if !CONFIG_REALTIME_ONLY
-HIGHBD_SMOOTH_V_NXM_WIDE(16, 4)
-HIGHBD_SMOOTH_V_NXM_WIDE(16, 64)
-HIGHBD_SMOOTH_V_NXM_WIDE(32, 8)
-HIGHBD_SMOOTH_V_NXM_WIDE(64, 16)
-#endif
-
#undef HIGHBD_SMOOTH_V_NXM_WIDE
static INLINE void highbd_smooth_h_4xh_neon(uint16_t *dst, ptrdiff_t stride,
@@ -775,14 +757,11 @@
HIGHBD_SMOOTH_H_NXM(4, 4)
HIGHBD_SMOOTH_H_NXM(4, 8)
+HIGHBD_SMOOTH_H_NXM(4, 16)
HIGHBD_SMOOTH_H_NXM(8, 4)
HIGHBD_SMOOTH_H_NXM(8, 8)
HIGHBD_SMOOTH_H_NXM(8, 16)
-
-#if !CONFIG_REALTIME_ONLY
-HIGHBD_SMOOTH_H_NXM(4, 16)
HIGHBD_SMOOTH_H_NXM(8, 32)
-#endif
#undef HIGHBD_SMOOTH_H_NXM
@@ -840,20 +819,17 @@
highbd_smooth_h_##W##xh_neon(dst, y_stride, above, left, H); \
}
+HIGHBD_SMOOTH_H_NXM_WIDE(16, 4)
HIGHBD_SMOOTH_H_NXM_WIDE(16, 8)
HIGHBD_SMOOTH_H_NXM_WIDE(16, 16)
HIGHBD_SMOOTH_H_NXM_WIDE(16, 32)
+HIGHBD_SMOOTH_H_NXM_WIDE(16, 64)
+HIGHBD_SMOOTH_H_NXM_WIDE(32, 8)
HIGHBD_SMOOTH_H_NXM_WIDE(32, 16)
HIGHBD_SMOOTH_H_NXM_WIDE(32, 32)
HIGHBD_SMOOTH_H_NXM_WIDE(32, 64)
+HIGHBD_SMOOTH_H_NXM_WIDE(64, 16)
HIGHBD_SMOOTH_H_NXM_WIDE(64, 32)
HIGHBD_SMOOTH_H_NXM_WIDE(64, 64)
-#if !CONFIG_REALTIME_ONLY
-HIGHBD_SMOOTH_H_NXM_WIDE(16, 4)
-HIGHBD_SMOOTH_H_NXM_WIDE(16, 64)
-HIGHBD_SMOOTH_H_NXM_WIDE(32, 8)
-HIGHBD_SMOOTH_H_NXM_WIDE(64, 16)
-#endif
-
#undef HIGHBD_SMOOTH_H_NXM_WIDE
diff --git a/test/intrapred_test.cc b/test/intrapred_test.cc
index 5ed52c2..a219427 100644
--- a/test/intrapred_test.cc
+++ b/test/intrapred_test.cc
@@ -334,29 +334,24 @@
#if HAVE_NEON
const IntraPredFunc<IntraPred> LowbdIntraPredTestVectorNeon[] = {
lowbd_entry(smooth, 4, 4, neon), lowbd_entry(smooth, 4, 8, neon),
- lowbd_entry(smooth, 8, 4, neon), lowbd_entry(smooth, 8, 8, neon),
- lowbd_entry(smooth, 8, 16, neon), lowbd_entry(smooth, 16, 8, neon),
- lowbd_entry(smooth, 16, 16, neon), lowbd_entry(smooth, 16, 32, neon),
- lowbd_entry(smooth, 32, 16, neon), lowbd_entry(smooth, 32, 32, neon),
- lowbd_entry(smooth, 32, 64, neon), lowbd_entry(smooth, 64, 32, neon),
- lowbd_entry(smooth, 64, 64, neon),
-#if !CONFIG_REALTIME_ONLY
- lowbd_entry(smooth, 4, 16, neon), lowbd_entry(smooth, 8, 32, neon),
- lowbd_entry(smooth, 16, 4, neon), lowbd_entry(smooth, 16, 64, neon),
- lowbd_entry(smooth, 32, 8, neon), lowbd_entry(smooth, 64, 16, neon),
-#endif
- lowbd_entry(paeth, 4, 4, neon), lowbd_entry(paeth, 4, 8, neon),
+ lowbd_entry(smooth, 4, 16, neon), lowbd_entry(smooth, 8, 4, neon),
+ lowbd_entry(smooth, 8, 8, neon), lowbd_entry(smooth, 8, 16, neon),
+ lowbd_entry(smooth, 8, 32, neon), lowbd_entry(smooth, 16, 4, neon),
+ lowbd_entry(smooth, 16, 8, neon), lowbd_entry(smooth, 16, 16, neon),
+ lowbd_entry(smooth, 16, 32, neon), lowbd_entry(smooth, 16, 64, neon),
+ lowbd_entry(smooth, 32, 8, neon), lowbd_entry(smooth, 32, 16, neon),
+ lowbd_entry(smooth, 32, 32, neon), lowbd_entry(smooth, 32, 64, neon),
+ lowbd_entry(smooth, 64, 16, neon), lowbd_entry(smooth, 64, 32, neon),
+ lowbd_entry(smooth, 64, 64, neon), lowbd_entry(paeth, 4, 4, neon),
+ lowbd_entry(paeth, 4, 8, neon), lowbd_entry(paeth, 4, 16, neon),
lowbd_entry(paeth, 8, 4, neon), lowbd_entry(paeth, 8, 8, neon),
- lowbd_entry(paeth, 8, 16, neon), lowbd_entry(paeth, 16, 8, neon),
+ lowbd_entry(paeth, 8, 16, neon), lowbd_entry(paeth, 8, 32, neon),
+ lowbd_entry(paeth, 16, 4, neon), lowbd_entry(paeth, 16, 8, neon),
lowbd_entry(paeth, 16, 16, neon), lowbd_entry(paeth, 16, 32, neon),
+ lowbd_entry(paeth, 16, 64, neon), lowbd_entry(paeth, 32, 8, neon),
lowbd_entry(paeth, 32, 16, neon), lowbd_entry(paeth, 32, 32, neon),
- lowbd_entry(paeth, 32, 64, neon), lowbd_entry(paeth, 64, 32, neon),
- lowbd_entry(paeth, 64, 64, neon),
-#if !CONFIG_REALTIME_ONLY
- lowbd_entry(paeth, 4, 16, neon), lowbd_entry(paeth, 8, 32, neon),
- lowbd_entry(paeth, 16, 4, neon), lowbd_entry(paeth, 16, 64, neon),
- lowbd_entry(paeth, 32, 8, neon), lowbd_entry(paeth, 64, 16, neon),
-#endif
+ lowbd_entry(paeth, 32, 64, neon), lowbd_entry(paeth, 64, 16, neon),
+ lowbd_entry(paeth, 64, 32, neon), lowbd_entry(paeth, 64, 64, neon),
};
INSTANTIATE_TEST_SUITE_P(NEON, LowbdIntraPredTest,
@@ -402,113 +397,103 @@
highbd_entry(v, 4, 4, neon, 12),
highbd_entry(v, 4, 8, neon, 12),
+ highbd_entry(v, 4, 16, neon, 12),
highbd_entry(v, 8, 4, neon, 12),
highbd_entry(v, 8, 8, neon, 12),
highbd_entry(v, 8, 16, neon, 12),
+ highbd_entry(v, 8, 32, neon, 12),
+ highbd_entry(v, 16, 4, neon, 12),
highbd_entry(v, 16, 8, neon, 12),
highbd_entry(v, 16, 16, neon, 12),
highbd_entry(v, 16, 32, neon, 12),
+ highbd_entry(v, 16, 64, neon, 12),
+ highbd_entry(v, 32, 8, neon, 12),
highbd_entry(v, 32, 16, neon, 12),
highbd_entry(v, 32, 32, neon, 12),
highbd_entry(v, 32, 64, neon, 12),
+ highbd_entry(v, 64, 16, neon, 12),
highbd_entry(v, 64, 32, neon, 12),
highbd_entry(v, 64, 64, neon, 12),
-#if !CONFIG_REALTIME_ONLY
- highbd_entry(v, 4, 16, neon, 12),
- highbd_entry(v, 8, 32, neon, 12),
- highbd_entry(v, 16, 4, neon, 12),
- highbd_entry(v, 16, 64, neon, 12),
- highbd_entry(v, 32, 8, neon, 12),
- highbd_entry(v, 64, 16, neon, 12),
-#endif
highbd_entry(paeth, 4, 4, neon, 12),
highbd_entry(paeth, 4, 8, neon, 12),
+ highbd_entry(paeth, 4, 16, neon, 12),
highbd_entry(paeth, 8, 4, neon, 12),
highbd_entry(paeth, 8, 8, neon, 12),
highbd_entry(paeth, 8, 16, neon, 12),
+ highbd_entry(paeth, 8, 32, neon, 12),
+ highbd_entry(paeth, 16, 4, neon, 12),
highbd_entry(paeth, 16, 8, neon, 12),
highbd_entry(paeth, 16, 16, neon, 12),
highbd_entry(paeth, 16, 32, neon, 12),
+ highbd_entry(paeth, 16, 64, neon, 12),
+ highbd_entry(paeth, 32, 8, neon, 12),
highbd_entry(paeth, 32, 16, neon, 12),
highbd_entry(paeth, 32, 32, neon, 12),
highbd_entry(paeth, 32, 64, neon, 12),
+ highbd_entry(paeth, 64, 16, neon, 12),
highbd_entry(paeth, 64, 32, neon, 12),
highbd_entry(paeth, 64, 64, neon, 12),
-#if !CONFIG_REALTIME_ONLY
- highbd_entry(paeth, 4, 16, neon, 12),
- highbd_entry(paeth, 8, 32, neon, 12),
- highbd_entry(paeth, 16, 4, neon, 12),
- highbd_entry(paeth, 16, 64, neon, 12),
- highbd_entry(paeth, 32, 8, neon, 12),
- highbd_entry(paeth, 64, 16, neon, 12),
-#endif
highbd_entry(smooth, 4, 4, neon, 12),
highbd_entry(smooth, 4, 8, neon, 12),
+ highbd_entry(smooth, 4, 16, neon, 12),
highbd_entry(smooth, 8, 4, neon, 12),
highbd_entry(smooth, 8, 8, neon, 12),
highbd_entry(smooth, 8, 16, neon, 12),
+ highbd_entry(smooth, 8, 32, neon, 12),
+ highbd_entry(smooth, 16, 4, neon, 12),
highbd_entry(smooth, 16, 8, neon, 12),
highbd_entry(smooth, 16, 16, neon, 12),
highbd_entry(smooth, 16, 32, neon, 12),
+ highbd_entry(smooth, 16, 64, neon, 12),
+ highbd_entry(smooth, 32, 8, neon, 12),
highbd_entry(smooth, 32, 16, neon, 12),
highbd_entry(smooth, 32, 32, neon, 12),
highbd_entry(smooth, 32, 64, neon, 12),
+ highbd_entry(smooth, 64, 16, neon, 12),
highbd_entry(smooth, 64, 32, neon, 12),
highbd_entry(smooth, 64, 64, neon, 12),
-#if !CONFIG_REALTIME_ONLY
- highbd_entry(smooth, 4, 16, neon, 12),
- highbd_entry(smooth, 8, 32, neon, 12),
- highbd_entry(smooth, 16, 4, neon, 12),
- highbd_entry(smooth, 16, 64, neon, 12),
- highbd_entry(smooth, 32, 8, neon, 12),
- highbd_entry(smooth, 64, 16, neon, 12),
-#endif
highbd_entry(smooth_v, 4, 4, neon, 12),
highbd_entry(smooth_v, 4, 8, neon, 12),
+ highbd_entry(smooth_v, 4, 16, neon, 12),
highbd_entry(smooth_v, 8, 4, neon, 12),
highbd_entry(smooth_v, 8, 8, neon, 12),
highbd_entry(smooth_v, 8, 16, neon, 12),
+ highbd_entry(smooth_v, 8, 32, neon, 12),
+ highbd_entry(smooth_v, 16, 4, neon, 12),
highbd_entry(smooth_v, 16, 8, neon, 12),
highbd_entry(smooth_v, 16, 16, neon, 12),
highbd_entry(smooth_v, 16, 32, neon, 12),
+ highbd_entry(smooth_v, 16, 64, neon, 12),
+ highbd_entry(smooth_v, 32, 8, neon, 12),
highbd_entry(smooth_v, 32, 16, neon, 12),
highbd_entry(smooth_v, 32, 32, neon, 12),
highbd_entry(smooth_v, 32, 64, neon, 12),
+ highbd_entry(smooth_v, 64, 16, neon, 12),
highbd_entry(smooth_v, 64, 32, neon, 12),
highbd_entry(smooth_v, 64, 64, neon, 12),
-#if !CONFIG_REALTIME_ONLY
- highbd_entry(smooth_v, 4, 16, neon, 12),
- highbd_entry(smooth_v, 8, 32, neon, 12),
- highbd_entry(smooth_v, 16, 4, neon, 12),
- highbd_entry(smooth_v, 16, 64, neon, 12),
- highbd_entry(smooth_v, 32, 8, neon, 12),
- highbd_entry(smooth_v, 64, 16, neon, 12),
-#endif
highbd_entry(smooth_h, 4, 4, neon, 12),
highbd_entry(smooth_h, 4, 8, neon, 12),
+ highbd_entry(smooth_h, 4, 16, neon, 12),
highbd_entry(smooth_h, 8, 4, neon, 12),
highbd_entry(smooth_h, 8, 8, neon, 12),
highbd_entry(smooth_h, 8, 16, neon, 12),
+ highbd_entry(smooth_h, 8, 32, neon, 12),
+ highbd_entry(smooth_h, 16, 4, neon, 12),
highbd_entry(smooth_h, 16, 8, neon, 12),
highbd_entry(smooth_h, 16, 16, neon, 12),
highbd_entry(smooth_h, 16, 32, neon, 12),
+ highbd_entry(smooth_h, 16, 64, neon, 12),
+ highbd_entry(smooth_h, 32, 8, neon, 12),
highbd_entry(smooth_h, 32, 16, neon, 12),
highbd_entry(smooth_h, 32, 32, neon, 12),
highbd_entry(smooth_h, 32, 64, neon, 12),
+ highbd_entry(smooth_h, 64, 16, neon, 12),
highbd_entry(smooth_h, 64, 32, neon, 12),
highbd_entry(smooth_h, 64, 64, neon, 12),
-#if !CONFIG_REALTIME_ONLY
- highbd_entry(smooth_h, 4, 16, neon, 12),
- highbd_entry(smooth_h, 8, 32, neon, 12),
- highbd_entry(smooth_h, 16, 4, neon, 12),
- highbd_entry(smooth_h, 16, 64, neon, 12),
- highbd_entry(smooth_h, 32, 8, neon, 12),
- highbd_entry(smooth_h, 64, 16, neon, 12),
-#endif
};
INSTANTIATE_TEST_SUITE_P(NEON, HighbdIntraPredTest,
diff --git a/test/test_intra_pred_speed.cc b/test/test_intra_pred_speed.cc
index 032f508..3e1a6a9 100644
--- a/test/test_intra_pred_speed.cc
+++ b/test/test_intra_pred_speed.cc
@@ -416,21 +416,17 @@
aom_v_predictor_4x4_c, aom_h_predictor_4x4_c,
aom_paeth_predictor_4x4_c, aom_smooth_predictor_4x4_c,
aom_smooth_v_predictor_4x4_c, aom_smooth_h_predictor_4x4_c)
-
INTRA_PRED_TEST(C, TX_4X8, aom_dc_predictor_4x8_c, aom_dc_left_predictor_4x8_c,
aom_dc_top_predictor_4x8_c, aom_dc_128_predictor_4x8_c,
aom_v_predictor_4x8_c, aom_h_predictor_4x8_c,
aom_paeth_predictor_4x8_c, aom_smooth_predictor_4x8_c,
aom_smooth_v_predictor_4x8_c, aom_smooth_h_predictor_4x8_c)
-
-#if !CONFIG_REALTIME_ONLY
INTRA_PRED_TEST(C, TX_4X16, aom_dc_predictor_4x16_c,
aom_dc_left_predictor_4x16_c, aom_dc_top_predictor_4x16_c,
aom_dc_128_predictor_4x16_c, aom_v_predictor_4x16_c,
aom_h_predictor_4x16_c, aom_paeth_predictor_4x16_c,
aom_smooth_predictor_4x16_c, aom_smooth_v_predictor_4x16_c,
aom_smooth_h_predictor_4x16_c)
-#endif
#if HAVE_SSE2
INTRA_PRED_TEST(SSE2, TX_4X4, aom_dc_predictor_4x4_sse2,
@@ -441,12 +437,10 @@
aom_dc_left_predictor_4x8_sse2, aom_dc_top_predictor_4x8_sse2,
aom_dc_128_predictor_4x8_sse2, aom_v_predictor_4x8_sse2,
aom_h_predictor_4x8_sse2, NULL, NULL, NULL, NULL)
-#if !CONFIG_REALTIME_ONLY
INTRA_PRED_TEST(SSE2, TX_4X16, aom_dc_predictor_4x16_sse2,
aom_dc_left_predictor_4x16_sse2, aom_dc_top_predictor_4x16_sse2,
aom_dc_128_predictor_4x16_sse2, aom_v_predictor_4x16_sse2,
aom_h_predictor_4x16_sse2, NULL, NULL, NULL, NULL)
-#endif
#endif // HAVE_SSE2
#if HAVE_SSSE3
@@ -458,12 +452,10 @@
aom_paeth_predictor_4x8_ssse3, aom_smooth_predictor_4x8_ssse3,
aom_smooth_v_predictor_4x8_ssse3,
aom_smooth_h_predictor_4x8_ssse3)
-#if !CONFIG_REALTIME_ONLY
INTRA_PRED_TEST(SSSE3, TX_4X16, NULL, NULL, NULL, NULL, NULL, NULL,
aom_paeth_predictor_4x16_ssse3, aom_smooth_predictor_4x16_ssse3,
aom_smooth_v_predictor_4x16_ssse3,
aom_smooth_h_predictor_4x16_ssse3)
-#endif
#endif // HAVE_SSSE3
#if HAVE_DSPR2
@@ -499,22 +491,18 @@
aom_v_predictor_8x4_c, aom_h_predictor_8x4_c,
aom_paeth_predictor_8x4_c, aom_smooth_predictor_8x4_c,
aom_smooth_v_predictor_8x4_c, aom_smooth_h_predictor_8x4_c)
-
INTRA_PRED_TEST(C, TX_8X16, aom_dc_predictor_8x16_c,
aom_dc_left_predictor_8x16_c, aom_dc_top_predictor_8x16_c,
aom_dc_128_predictor_8x16_c, aom_v_predictor_8x16_c,
aom_h_predictor_8x16_c, aom_paeth_predictor_8x16_c,
aom_smooth_predictor_8x16_c, aom_smooth_v_predictor_8x16_c,
aom_smooth_h_predictor_8x16_c)
-
-#if !CONFIG_REALTIME_ONLY
INTRA_PRED_TEST(C, TX_8X32, aom_dc_predictor_8x32_c,
aom_dc_left_predictor_8x32_c, aom_dc_top_predictor_8x32_c,
aom_dc_128_predictor_8x32_c, aom_v_predictor_8x32_c,
aom_h_predictor_8x32_c, aom_paeth_predictor_8x32_c,
aom_smooth_predictor_8x32_c, aom_smooth_v_predictor_8x32_c,
aom_smooth_h_predictor_8x32_c)
-#endif
#if HAVE_SSE2
INTRA_PRED_TEST(SSE2, TX_8X8, aom_dc_predictor_8x8_sse2,
@@ -529,12 +517,10 @@
aom_dc_left_predictor_8x16_sse2, aom_dc_top_predictor_8x16_sse2,
aom_dc_128_predictor_8x16_sse2, aom_v_predictor_8x16_sse2,
aom_h_predictor_8x16_sse2, NULL, NULL, NULL, NULL)
-#if !CONFIG_REALTIME_ONLY
INTRA_PRED_TEST(SSE2, TX_8X32, aom_dc_predictor_8x32_sse2,
aom_dc_left_predictor_8x32_sse2, aom_dc_top_predictor_8x32_sse2,
aom_dc_128_predictor_8x32_sse2, aom_v_predictor_8x32_sse2,
aom_h_predictor_8x32_sse2, NULL, NULL, NULL, NULL)
-#endif
#endif // HAVE_SSE2
#if HAVE_SSSE3
@@ -550,12 +536,10 @@
aom_paeth_predictor_8x16_ssse3, aom_smooth_predictor_8x16_ssse3,
aom_smooth_v_predictor_8x16_ssse3,
aom_smooth_h_predictor_8x16_ssse3)
-#if !CONFIG_REALTIME_ONLY
INTRA_PRED_TEST(SSSE3, TX_8X32, NULL, NULL, NULL, NULL, NULL, NULL,
aom_paeth_predictor_8x32_ssse3, aom_smooth_predictor_8x32_ssse3,
aom_smooth_v_predictor_8x32_ssse3,
aom_smooth_h_predictor_8x32_ssse3)
-#endif
#endif // HAVE_SSSE3
#if HAVE_DSPR2
@@ -586,36 +570,30 @@
aom_h_predictor_16x16_c, aom_paeth_predictor_16x16_c,
aom_smooth_predictor_16x16_c, aom_smooth_v_predictor_16x16_c,
aom_smooth_h_predictor_16x16_c)
-
INTRA_PRED_TEST(C, TX_16X8, aom_dc_predictor_16x8_c,
aom_dc_left_predictor_16x8_c, aom_dc_top_predictor_16x8_c,
aom_dc_128_predictor_16x8_c, aom_v_predictor_16x8_c,
aom_h_predictor_16x8_c, aom_paeth_predictor_16x8_c,
aom_smooth_predictor_16x8_c, aom_smooth_v_predictor_16x8_c,
aom_smooth_h_predictor_16x8_c)
-
INTRA_PRED_TEST(C, TX_16X32, aom_dc_predictor_16x32_c,
aom_dc_left_predictor_16x32_c, aom_dc_top_predictor_16x32_c,
aom_dc_128_predictor_16x32_c, aom_v_predictor_16x32_c,
aom_h_predictor_16x32_c, aom_paeth_predictor_16x32_c,
aom_smooth_predictor_16x32_c, aom_smooth_v_predictor_16x32_c,
aom_smooth_h_predictor_16x32_c)
-
-#if !CONFIG_REALTIME_ONLY
INTRA_PRED_TEST(C, TX_16X4, aom_dc_predictor_16x4_c,
aom_dc_left_predictor_16x4_c, aom_dc_top_predictor_16x4_c,
aom_dc_128_predictor_16x4_c, aom_v_predictor_16x4_c,
aom_h_predictor_16x4_c, aom_paeth_predictor_16x4_c,
aom_smooth_predictor_16x4_c, aom_smooth_v_predictor_16x4_c,
aom_smooth_h_predictor_16x4_c)
-
INTRA_PRED_TEST(C, TX_16X64, aom_dc_predictor_16x64_c,
aom_dc_left_predictor_16x64_c, aom_dc_top_predictor_16x64_c,
aom_dc_128_predictor_16x64_c, aom_v_predictor_16x64_c,
aom_h_predictor_16x64_c, aom_paeth_predictor_16x64_c,
aom_smooth_predictor_16x64_c, aom_smooth_v_predictor_16x64_c,
aom_smooth_h_predictor_16x64_c)
-#endif
#if HAVE_SSE2
INTRA_PRED_TEST(SSE2, TX_16X16, aom_dc_predictor_16x16_sse2,
@@ -632,7 +610,6 @@
aom_dc_top_predictor_16x32_sse2,
aom_dc_128_predictor_16x32_sse2, aom_v_predictor_16x32_sse2,
aom_h_predictor_16x32_sse2, NULL, NULL, NULL, NULL)
-#if !CONFIG_REALTIME_ONLY
INTRA_PRED_TEST(SSE2, TX_16X64, aom_dc_predictor_16x64_sse2,
aom_dc_left_predictor_16x64_sse2,
aom_dc_top_predictor_16x64_sse2,
@@ -642,7 +619,6 @@
aom_dc_left_predictor_16x4_sse2, aom_dc_top_predictor_16x4_sse2,
aom_dc_128_predictor_16x4_sse2, aom_v_predictor_16x4_sse2,
aom_h_predictor_16x4_sse2, NULL, NULL, NULL, NULL)
-#endif
#endif // HAVE_SSE2
#if HAVE_SSSE3
@@ -660,7 +636,6 @@
aom_smooth_predictor_16x32_ssse3,
aom_smooth_v_predictor_16x32_ssse3,
aom_smooth_h_predictor_16x32_ssse3)
-#if !CONFIG_REALTIME_ONLY
INTRA_PRED_TEST(SSSE3, TX_16X64, NULL, NULL, NULL, NULL, NULL, NULL,
aom_paeth_predictor_16x64_ssse3,
aom_smooth_predictor_16x64_ssse3,
@@ -670,7 +645,6 @@
aom_paeth_predictor_16x4_ssse3, aom_smooth_predictor_16x4_ssse3,
aom_smooth_v_predictor_16x4_ssse3,
aom_smooth_h_predictor_16x4_ssse3)
-#endif
#endif // HAVE_SSSE3
#if HAVE_AVX2
@@ -680,10 +654,8 @@
aom_paeth_predictor_16x8_avx2, NULL, NULL, NULL)
INTRA_PRED_TEST(AVX2, TX_16X32, NULL, NULL, NULL, NULL, NULL, NULL,
aom_paeth_predictor_16x32_avx2, NULL, NULL, NULL)
-#if !CONFIG_REALTIME_ONLY
INTRA_PRED_TEST(AVX2, TX_16X64, NULL, NULL, NULL, NULL, NULL, NULL,
aom_paeth_predictor_16x64_avx2, NULL, NULL, NULL)
-#endif
#endif // HAVE_AVX2
#if HAVE_DSPR2
@@ -715,29 +687,24 @@
aom_h_predictor_32x32_c, aom_paeth_predictor_32x32_c,
aom_smooth_predictor_32x32_c, aom_smooth_v_predictor_32x32_c,
aom_smooth_h_predictor_32x32_c)
-
INTRA_PRED_TEST(C, TX_32X16, aom_dc_predictor_32x16_c,
aom_dc_left_predictor_32x16_c, aom_dc_top_predictor_32x16_c,
aom_dc_128_predictor_32x16_c, aom_v_predictor_32x16_c,
aom_h_predictor_32x16_c, aom_paeth_predictor_32x16_c,
aom_smooth_predictor_32x16_c, aom_smooth_v_predictor_32x16_c,
aom_smooth_h_predictor_32x16_c)
-
INTRA_PRED_TEST(C, TX_32X64, aom_dc_predictor_32x64_c,
aom_dc_left_predictor_32x64_c, aom_dc_top_predictor_32x64_c,
aom_dc_128_predictor_32x64_c, aom_v_predictor_32x64_c,
aom_h_predictor_32x64_c, aom_paeth_predictor_32x64_c,
aom_smooth_predictor_32x64_c, aom_smooth_v_predictor_32x64_c,
aom_smooth_h_predictor_32x64_c)
-
-#if !CONFIG_REALTIME_ONLY
INTRA_PRED_TEST(C, TX_32X8, aom_dc_predictor_32x8_c,
aom_dc_left_predictor_32x8_c, aom_dc_top_predictor_32x8_c,
aom_dc_128_predictor_32x8_c, aom_v_predictor_32x8_c,
aom_h_predictor_32x8_c, aom_paeth_predictor_32x8_c,
aom_smooth_predictor_32x8_c, aom_smooth_v_predictor_32x8_c,
aom_smooth_h_predictor_32x8_c)
-#endif
#if HAVE_SSE2
INTRA_PRED_TEST(SSE2, TX_32X32, aom_dc_predictor_32x32_sse2,
@@ -755,12 +722,10 @@
aom_dc_top_predictor_32x64_sse2,
aom_dc_128_predictor_32x64_sse2, aom_v_predictor_32x64_sse2,
aom_h_predictor_32x64_sse2, NULL, NULL, NULL, NULL)
-#if !CONFIG_REALTIME_ONLY
INTRA_PRED_TEST(SSE2, TX_32X8, aom_dc_predictor_32x8_sse2,
aom_dc_left_predictor_32x8_sse2, aom_dc_top_predictor_32x8_sse2,
aom_dc_128_predictor_32x8_sse2, aom_v_predictor_32x8_sse2,
aom_h_predictor_32x8_sse2, NULL, NULL, NULL, NULL)
-#endif
#endif // HAVE_SSE2
#if HAVE_SSSE3
@@ -779,12 +744,10 @@
aom_smooth_predictor_32x64_ssse3,
aom_smooth_v_predictor_32x64_ssse3,
aom_smooth_h_predictor_32x64_ssse3)
-#if !CONFIG_REALTIME_ONLY
INTRA_PRED_TEST(SSSE3, TX_32X8, NULL, NULL, NULL, NULL, NULL, NULL,
aom_paeth_predictor_32x8_ssse3, aom_smooth_predictor_32x8_ssse3,
aom_smooth_v_predictor_32x8_ssse3,
aom_smooth_h_predictor_32x8_ssse3)
-#endif
#endif // HAVE_SSSE3
#if HAVE_AVX2
@@ -830,22 +793,18 @@
aom_h_predictor_64x64_c, aom_paeth_predictor_64x64_c,
aom_smooth_predictor_64x64_c, aom_smooth_v_predictor_64x64_c,
aom_smooth_h_predictor_64x64_c)
-
INTRA_PRED_TEST(C, TX_64X32, aom_dc_predictor_64x32_c,
aom_dc_left_predictor_64x32_c, aom_dc_top_predictor_64x32_c,
aom_dc_128_predictor_64x32_c, aom_v_predictor_64x32_c,
aom_h_predictor_64x32_c, aom_paeth_predictor_64x32_c,
aom_smooth_predictor_64x32_c, aom_smooth_v_predictor_64x32_c,
aom_smooth_h_predictor_64x32_c)
-
-#if !CONFIG_REALTIME_ONLY
INTRA_PRED_TEST(C, TX_64X16, aom_dc_predictor_64x16_c,
aom_dc_left_predictor_64x16_c, aom_dc_top_predictor_64x16_c,
aom_dc_128_predictor_64x16_c, aom_v_predictor_64x16_c,
aom_h_predictor_64x16_c, aom_paeth_predictor_64x16_c,
aom_smooth_predictor_64x16_c, aom_smooth_v_predictor_64x16_c,
aom_smooth_h_predictor_64x16_c)
-#endif
#if HAVE_SSE2
INTRA_PRED_TEST(SSE2, TX_64X64, aom_dc_predictor_64x64_sse2,
@@ -858,14 +817,12 @@
aom_dc_top_predictor_64x32_sse2,
aom_dc_128_predictor_64x32_sse2, aom_v_predictor_64x32_sse2,
aom_h_predictor_64x32_sse2, NULL, NULL, NULL, NULL)
-#if !CONFIG_REALTIME_ONLY
INTRA_PRED_TEST(SSE2, TX_64X16, aom_dc_predictor_64x16_sse2,
aom_dc_left_predictor_64x16_sse2,
aom_dc_top_predictor_64x16_sse2,
aom_dc_128_predictor_64x16_sse2, aom_v_predictor_64x16_sse2,
aom_h_predictor_64x16_sse2, NULL, NULL, NULL, NULL)
#endif
-#endif
#if HAVE_SSSE3
INTRA_PRED_TEST(SSSE3, TX_64X64, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -878,14 +835,12 @@
aom_smooth_predictor_64x32_ssse3,
aom_smooth_v_predictor_64x32_ssse3,
aom_smooth_h_predictor_64x32_ssse3)
-#if !CONFIG_REALTIME_ONLY
INTRA_PRED_TEST(SSSE3, TX_64X16, NULL, NULL, NULL, NULL, NULL, NULL,
aom_paeth_predictor_64x16_ssse3,
aom_smooth_predictor_64x16_ssse3,
aom_smooth_v_predictor_64x16_ssse3,
aom_smooth_h_predictor_64x16_ssse3)
#endif
-#endif
#if HAVE_AVX2
INTRA_PRED_TEST(AVX2, TX_64X64, aom_dc_predictor_64x64_avx2,
@@ -898,14 +853,12 @@
aom_dc_top_predictor_64x32_avx2,
aom_dc_128_predictor_64x32_avx2, aom_v_predictor_64x32_avx2,
NULL, aom_paeth_predictor_64x32_avx2, NULL, NULL, NULL)
-#if !CONFIG_REALTIME_ONLY
INTRA_PRED_TEST(AVX2, TX_64X16, aom_dc_predictor_64x16_avx2,
aom_dc_left_predictor_64x16_avx2,
aom_dc_top_predictor_64x16_avx2,
aom_dc_128_predictor_64x16_avx2, aom_v_predictor_64x16_avx2,
NULL, aom_paeth_predictor_64x16_avx2, NULL, NULL, NULL)
#endif
-#endif
#if CONFIG_AV1_HIGHBITDEPTH
// -----------------------------------------------------------------------------
@@ -1228,7 +1181,6 @@
aom_highbd_h_predictor_4x8_c, aom_highbd_paeth_predictor_4x8_c,
aom_highbd_smooth_predictor_4x8_c, aom_highbd_smooth_v_predictor_4x8_c,
aom_highbd_smooth_h_predictor_4x8_c)
-#if !CONFIG_REALTIME_ONLY
HIGHBD_INTRA_PRED_TEST(
C, TX_4X16, aom_highbd_dc_predictor_4x16_c,
aom_highbd_dc_left_predictor_4x16_c, aom_highbd_dc_top_predictor_4x16_c,
@@ -1236,7 +1188,6 @@
aom_highbd_h_predictor_4x16_c, aom_highbd_paeth_predictor_4x16_c,
aom_highbd_smooth_predictor_4x16_c, aom_highbd_smooth_v_predictor_4x16_c,
aom_highbd_smooth_h_predictor_4x16_c)
-#endif
#if HAVE_SSE2
HIGHBD_INTRA_PRED_TEST(SSE2, TX_4X4, aom_highbd_dc_predictor_4x4_sse2,
aom_highbd_dc_left_predictor_4x4_sse2,
@@ -1265,14 +1216,12 @@
aom_highbd_smooth_predictor_4x8_neon,
aom_highbd_smooth_v_predictor_4x8_neon,
aom_highbd_smooth_h_predictor_4x8_neon)
-#if !CONFIG_REALTIME_ONLY
HIGHBD_INTRA_PRED_TEST(NEON, TX_4X16, NULL, NULL, NULL, NULL,
aom_highbd_v_predictor_4x16_neon, NULL,
aom_highbd_paeth_predictor_4x16_neon,
aom_highbd_smooth_predictor_4x16_neon,
aom_highbd_smooth_v_predictor_4x16_neon,
aom_highbd_smooth_h_predictor_4x16_neon)
-#endif
#endif // HAVE_NEON
// -----------------------------------------------------------------------------
@@ -1285,7 +1234,6 @@
aom_highbd_h_predictor_8x8_c, aom_highbd_paeth_predictor_8x8_c,
aom_highbd_smooth_predictor_8x8_c, aom_highbd_smooth_v_predictor_8x8_c,
aom_highbd_smooth_h_predictor_8x8_c)
-
HIGHBD_INTRA_PRED_TEST(
C, TX_8X4, aom_highbd_dc_predictor_8x4_c,
aom_highbd_dc_left_predictor_8x4_c, aom_highbd_dc_top_predictor_8x4_c,
@@ -1293,7 +1241,6 @@
aom_highbd_h_predictor_8x4_c, aom_highbd_paeth_predictor_8x4_c,
aom_highbd_smooth_predictor_8x4_c, aom_highbd_smooth_v_predictor_8x4_c,
aom_highbd_smooth_h_predictor_8x4_c)
-
HIGHBD_INTRA_PRED_TEST(
C, TX_8X16, aom_highbd_dc_predictor_8x16_c,
aom_highbd_dc_left_predictor_8x16_c, aom_highbd_dc_top_predictor_8x16_c,
@@ -1301,7 +1248,6 @@
aom_highbd_h_predictor_8x16_c, aom_highbd_paeth_predictor_8x16_c,
aom_highbd_smooth_predictor_8x16_c, aom_highbd_smooth_v_predictor_8x16_c,
aom_highbd_smooth_h_predictor_8x16_c)
-#if !CONFIG_REALTIME_ONLY
HIGHBD_INTRA_PRED_TEST(
C, TX_8X32, aom_highbd_dc_predictor_8x32_c,
aom_highbd_dc_left_predictor_8x32_c, aom_highbd_dc_top_predictor_8x32_c,
@@ -1309,7 +1255,7 @@
aom_highbd_h_predictor_8x32_c, aom_highbd_paeth_predictor_8x32_c,
aom_highbd_smooth_predictor_8x32_c, aom_highbd_smooth_v_predictor_8x32_c,
aom_highbd_smooth_h_predictor_8x32_c)
-#endif
+
#if HAVE_SSE2
HIGHBD_INTRA_PRED_TEST(SSE2, TX_8X8, aom_highbd_dc_predictor_8x8_sse2,
aom_highbd_dc_left_predictor_8x8_sse2,
@@ -1343,28 +1289,24 @@
aom_highbd_smooth_predictor_8x8_neon,
aom_highbd_smooth_v_predictor_8x8_neon,
aom_highbd_smooth_h_predictor_8x8_neon)
-
HIGHBD_INTRA_PRED_TEST(NEON, TX_8X4, NULL, NULL, NULL, NULL,
aom_highbd_v_predictor_8x4_neon, NULL,
aom_highbd_paeth_predictor_8x4_neon,
aom_highbd_smooth_predictor_8x4_neon,
aom_highbd_smooth_v_predictor_8x4_neon,
aom_highbd_smooth_h_predictor_8x4_neon)
-
HIGHBD_INTRA_PRED_TEST(NEON, TX_8X16, NULL, NULL, NULL, NULL,
aom_highbd_v_predictor_8x16_neon, NULL,
aom_highbd_paeth_predictor_8x16_neon,
aom_highbd_smooth_predictor_8x16_neon,
aom_highbd_smooth_v_predictor_8x16_neon,
aom_highbd_smooth_h_predictor_8x16_neon)
-#if !CONFIG_REALTIME_ONLY
HIGHBD_INTRA_PRED_TEST(NEON, TX_8X32, NULL, NULL, NULL, NULL,
aom_highbd_v_predictor_8x32_neon, NULL,
aom_highbd_paeth_predictor_8x32_neon,
aom_highbd_smooth_predictor_8x32_neon,
aom_highbd_smooth_v_predictor_8x32_neon,
aom_highbd_smooth_h_predictor_8x32_neon)
-#endif
#endif // HAVE_NEON
// -----------------------------------------------------------------------------
@@ -1377,7 +1319,6 @@
aom_highbd_h_predictor_16x16_c, aom_highbd_paeth_predictor_16x16_c,
aom_highbd_smooth_predictor_16x16_c, aom_highbd_smooth_v_predictor_16x16_c,
aom_highbd_smooth_h_predictor_16x16_c)
-
HIGHBD_INTRA_PRED_TEST(
C, TX_16X8, aom_highbd_dc_predictor_16x8_c,
aom_highbd_dc_left_predictor_16x8_c, aom_highbd_dc_top_predictor_16x8_c,
@@ -1385,7 +1326,6 @@
aom_highbd_h_predictor_16x8_c, aom_highbd_paeth_predictor_16x8_c,
aom_highbd_smooth_predictor_16x8_c, aom_highbd_smooth_v_predictor_16x8_c,
aom_highbd_smooth_h_predictor_16x8_c)
-
HIGHBD_INTRA_PRED_TEST(
C, TX_16X32, aom_highbd_dc_predictor_16x32_c,
aom_highbd_dc_left_predictor_16x32_c, aom_highbd_dc_top_predictor_16x32_c,
@@ -1393,8 +1333,6 @@
aom_highbd_h_predictor_16x32_c, aom_highbd_paeth_predictor_16x32_c,
aom_highbd_smooth_predictor_16x32_c, aom_highbd_smooth_v_predictor_16x32_c,
aom_highbd_smooth_h_predictor_16x32_c)
-
-#if !CONFIG_REALTIME_ONLY
HIGHBD_INTRA_PRED_TEST(
C, TX_16X4, aom_highbd_dc_predictor_16x4_c,
aom_highbd_dc_left_predictor_16x4_c, aom_highbd_dc_top_predictor_16x4_c,
@@ -1402,7 +1340,6 @@
aom_highbd_h_predictor_16x4_c, aom_highbd_paeth_predictor_16x4_c,
aom_highbd_smooth_predictor_16x4_c, aom_highbd_smooth_v_predictor_16x4_c,
aom_highbd_smooth_h_predictor_16x4_c)
-
HIGHBD_INTRA_PRED_TEST(
C, TX_16X64, aom_highbd_dc_predictor_16x64_c,
aom_highbd_dc_left_predictor_16x64_c, aom_highbd_dc_top_predictor_16x64_c,
@@ -1410,7 +1347,6 @@
aom_highbd_h_predictor_16x64_c, aom_highbd_paeth_predictor_16x64_c,
aom_highbd_smooth_predictor_16x64_c, aom_highbd_smooth_v_predictor_16x64_c,
aom_highbd_smooth_h_predictor_16x64_c)
-#endif
#if HAVE_SSE2
HIGHBD_INTRA_PRED_TEST(SSE2, TX_16X16, aom_highbd_dc_predictor_16x16_sse2,
@@ -1458,36 +1394,30 @@
aom_highbd_smooth_predictor_16x16_neon,
aom_highbd_smooth_v_predictor_16x16_neon,
aom_highbd_smooth_h_predictor_16x16_neon)
-
HIGHBD_INTRA_PRED_TEST(NEON, TX_16X8, NULL, NULL, NULL, NULL,
aom_highbd_v_predictor_16x8_neon, NULL,
aom_highbd_paeth_predictor_16x8_neon,
aom_highbd_smooth_predictor_16x8_neon,
aom_highbd_smooth_v_predictor_16x8_neon,
aom_highbd_smooth_h_predictor_16x8_neon)
-
HIGHBD_INTRA_PRED_TEST(NEON, TX_16X32, NULL, NULL, NULL, NULL,
aom_highbd_v_predictor_16x32_neon, NULL,
aom_highbd_paeth_predictor_16x32_neon,
aom_highbd_smooth_predictor_16x32_neon,
aom_highbd_smooth_v_predictor_16x32_neon,
aom_highbd_smooth_h_predictor_16x32_neon)
-
-#if !CONFIG_REALTIME_ONLY
HIGHBD_INTRA_PRED_TEST(NEON, TX_16X4, NULL, NULL, NULL, NULL,
aom_highbd_v_predictor_16x4_neon, NULL,
aom_highbd_paeth_predictor_16x4_neon,
aom_highbd_smooth_predictor_16x4_neon,
aom_highbd_smooth_v_predictor_16x4_neon,
aom_highbd_smooth_h_predictor_16x4_neon)
-
HIGHBD_INTRA_PRED_TEST(NEON, TX_16X64, NULL, NULL, NULL, NULL,
aom_highbd_v_predictor_16x64_neon, NULL,
aom_highbd_paeth_predictor_16x64_neon,
aom_highbd_smooth_predictor_16x64_neon,
aom_highbd_smooth_v_predictor_16x64_neon,
aom_highbd_smooth_h_predictor_16x64_neon)
-#endif
#endif // HAVE_NEON
// -----------------------------------------------------------------------------
@@ -1500,7 +1430,6 @@
aom_highbd_h_predictor_32x32_c, aom_highbd_paeth_predictor_32x32_c,
aom_highbd_smooth_predictor_32x32_c, aom_highbd_smooth_v_predictor_32x32_c,
aom_highbd_smooth_h_predictor_32x32_c)
-
HIGHBD_INTRA_PRED_TEST(
C, TX_32X16, aom_highbd_dc_predictor_32x16_c,
aom_highbd_dc_left_predictor_32x16_c, aom_highbd_dc_top_predictor_32x16_c,
@@ -1508,7 +1437,6 @@
aom_highbd_h_predictor_32x16_c, aom_highbd_paeth_predictor_32x16_c,
aom_highbd_smooth_predictor_32x16_c, aom_highbd_smooth_v_predictor_32x16_c,
aom_highbd_smooth_h_predictor_32x16_c)
-
HIGHBD_INTRA_PRED_TEST(
C, TX_32X64, aom_highbd_dc_predictor_32x64_c,
aom_highbd_dc_left_predictor_32x64_c, aom_highbd_dc_top_predictor_32x64_c,
@@ -1516,8 +1444,6 @@
aom_highbd_h_predictor_32x64_c, aom_highbd_paeth_predictor_32x64_c,
aom_highbd_smooth_predictor_32x64_c, aom_highbd_smooth_v_predictor_32x64_c,
aom_highbd_smooth_h_predictor_32x64_c)
-
-#if !CONFIG_REALTIME_ONLY
HIGHBD_INTRA_PRED_TEST(
C, TX_32X8, aom_highbd_dc_predictor_32x8_c,
aom_highbd_dc_left_predictor_32x8_c, aom_highbd_dc_top_predictor_32x8_c,
@@ -1525,7 +1451,6 @@
aom_highbd_h_predictor_32x8_c, aom_highbd_paeth_predictor_32x8_c,
aom_highbd_smooth_predictor_32x8_c, aom_highbd_smooth_v_predictor_32x8_c,
aom_highbd_smooth_h_predictor_32x8_c)
-#endif
#if HAVE_SSE2
HIGHBD_INTRA_PRED_TEST(SSE2, TX_32X32, aom_highbd_dc_predictor_32x32_sse2,
@@ -1564,29 +1489,24 @@
aom_highbd_smooth_predictor_32x32_neon,
aom_highbd_smooth_v_predictor_32x32_neon,
aom_highbd_smooth_h_predictor_32x32_neon)
-
HIGHBD_INTRA_PRED_TEST(NEON, TX_32X16, NULL, NULL, NULL, NULL,
aom_highbd_v_predictor_32x16_neon, NULL,
aom_highbd_paeth_predictor_32x16_neon,
aom_highbd_smooth_predictor_32x16_neon,
aom_highbd_smooth_v_predictor_32x16_neon,
aom_highbd_smooth_h_predictor_32x16_neon)
-
HIGHBD_INTRA_PRED_TEST(NEON, TX_32X64, NULL, NULL, NULL, NULL,
aom_highbd_v_predictor_32x64_neon, NULL,
aom_highbd_paeth_predictor_32x64_neon,
aom_highbd_smooth_predictor_32x64_neon,
aom_highbd_smooth_v_predictor_32x64_neon,
aom_highbd_smooth_h_predictor_32x64_neon)
-
-#if !CONFIG_REALTIME_ONLY
HIGHBD_INTRA_PRED_TEST(NEON, TX_32X8, NULL, NULL, NULL, NULL,
aom_highbd_v_predictor_32x8_neon, NULL,
aom_highbd_paeth_predictor_32x8_neon,
aom_highbd_smooth_predictor_32x8_neon,
aom_highbd_smooth_v_predictor_32x8_neon,
aom_highbd_smooth_h_predictor_32x8_neon)
-#endif
#endif // HAVE_NEON
// -----------------------------------------------------------------------------
@@ -1599,7 +1519,6 @@
aom_highbd_h_predictor_64x64_c, aom_highbd_paeth_predictor_64x64_c,
aom_highbd_smooth_predictor_64x64_c, aom_highbd_smooth_v_predictor_64x64_c,
aom_highbd_smooth_h_predictor_64x64_c)
-
HIGHBD_INTRA_PRED_TEST(
C, TX_64X32, aom_highbd_dc_predictor_64x32_c,
aom_highbd_dc_left_predictor_64x32_c, aom_highbd_dc_top_predictor_64x32_c,
@@ -1607,8 +1526,6 @@
aom_highbd_h_predictor_64x32_c, aom_highbd_paeth_predictor_64x32_c,
aom_highbd_smooth_predictor_64x32_c, aom_highbd_smooth_v_predictor_64x32_c,
aom_highbd_smooth_h_predictor_64x32_c)
-
-#if !CONFIG_REALTIME_ONLY
HIGHBD_INTRA_PRED_TEST(
C, TX_64X16, aom_highbd_dc_predictor_64x16_c,
aom_highbd_dc_left_predictor_64x16_c, aom_highbd_dc_top_predictor_64x16_c,
@@ -1616,7 +1533,6 @@
aom_highbd_h_predictor_64x16_c, aom_highbd_paeth_predictor_64x16_c,
aom_highbd_smooth_predictor_64x16_c, aom_highbd_smooth_v_predictor_64x16_c,
aom_highbd_smooth_h_predictor_64x16_c)
-#endif
#if HAVE_NEON
HIGHBD_INTRA_PRED_TEST(NEON, TX_64X64, aom_highbd_dc_predictor_64x64_neon, NULL,
@@ -1625,22 +1541,18 @@
aom_highbd_smooth_predictor_64x64_neon,
aom_highbd_smooth_v_predictor_64x64_neon,
aom_highbd_smooth_h_predictor_64x64_neon)
-
HIGHBD_INTRA_PRED_TEST(NEON, TX_64X32, NULL, NULL, NULL, NULL,
aom_highbd_v_predictor_64x32_neon, NULL,
aom_highbd_paeth_predictor_64x32_neon,
aom_highbd_smooth_predictor_64x32_neon,
aom_highbd_smooth_v_predictor_64x32_neon,
aom_highbd_smooth_h_predictor_64x32_neon)
-
-#if !CONFIG_REALTIME_ONLY
HIGHBD_INTRA_PRED_TEST(NEON, TX_64X16, NULL, NULL, NULL, NULL,
aom_highbd_v_predictor_64x16_neon, NULL,
aom_highbd_paeth_predictor_64x16_neon,
aom_highbd_smooth_predictor_64x16_neon,
aom_highbd_smooth_v_predictor_64x16_neon,
aom_highbd_smooth_h_predictor_64x16_neon)
-#endif
#endif // HAVE_NEON
// -----------------------------------------------------------------------------
