commit b19d72f0018e2d032be0e3c37a87ecf65888d4f2
author James Zern <jzern@google.com> Thu Apr 21 18:55:23 2022 -0700
committer James Zern <jzern@google.com> Tue Apr 26 20:51:45 2022 +0000
tree fa6a29879911911c54d1f16cb0d695fec4e499e4
parent ada19d6085addfb7507651d08caf2d9b908c3c84

add aom_highbd_smooth_predictor_NxM_neon

ported from libgav1 @ v0.17.0-76-g1818fd47

Bug: b/217461825
Change-Id: I4b168c1bede94428257ca9a52b1c31b8dfe5b71d

test/test_intra_pred_speed.cc

diff --git a/test/test_intra_pred_speed.cc b/test/test_intra_pred_speed.cc
index 79b07f4..14dc988 100644
--- a/test/test_intra_pred_speed.cc
+++ b/test/test_intra_pred_speed.cc
@@ -1255,14 +1255,17 @@
 #if HAVE_NEON
 HIGHBD_INTRA_PRED_TEST(NEON, TX_4X4, aom_highbd_dc_predictor_4x4_neon, NULL,
                        NULL, NULL, aom_highbd_v_predictor_4x4_neon, NULL,
-                       aom_highbd_paeth_predictor_4x4_neon, NULL, NULL, NULL)
+                       aom_highbd_paeth_predictor_4x4_neon,
+                       aom_highbd_smooth_predictor_4x4_neon, NULL, NULL)
 HIGHBD_INTRA_PRED_TEST(NEON, TX_4X8, NULL, NULL, NULL, NULL,
                        aom_highbd_v_predictor_4x8_neon, NULL,
-                       aom_highbd_paeth_predictor_4x8_neon, NULL, NULL, NULL)
+                       aom_highbd_paeth_predictor_4x8_neon,
+                       aom_highbd_smooth_predictor_4x8_neon, NULL, NULL)
 #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, NULL, NULL, NULL)
+                       aom_highbd_paeth_predictor_4x16_neon,
+                       aom_highbd_smooth_predictor_4x16_neon, NULL, NULL)
 #endif
 #endif  // HAVE_NEON
 
@@ -1330,19 +1333,23 @@
 #if HAVE_NEON
 HIGHBD_INTRA_PRED_TEST(NEON, TX_8X8, aom_highbd_dc_predictor_8x8_neon, NULL,
                        NULL, NULL, aom_highbd_v_predictor_8x8_neon, NULL,
-                       aom_highbd_paeth_predictor_8x8_neon, NULL, NULL, NULL)
+                       aom_highbd_paeth_predictor_8x8_neon,
+                       aom_highbd_smooth_predictor_8x8_neon, NULL, NULL)
 
 HIGHBD_INTRA_PRED_TEST(NEON, TX_8X4, NULL, NULL, NULL, NULL,
                        aom_highbd_v_predictor_8x4_neon, NULL,
-                       aom_highbd_paeth_predictor_8x4_neon, NULL, NULL, NULL)
+                       aom_highbd_paeth_predictor_8x4_neon,
+                       aom_highbd_smooth_predictor_8x4_neon, NULL, NULL)
 
 HIGHBD_INTRA_PRED_TEST(NEON, TX_8X16, NULL, NULL, NULL, NULL,
                        aom_highbd_v_predictor_8x16_neon, NULL,
-                       aom_highbd_paeth_predictor_8x16_neon, NULL, NULL, NULL)
+                       aom_highbd_paeth_predictor_8x16_neon,
+                       aom_highbd_smooth_predictor_8x16_neon, NULL, NULL)
 #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, NULL, NULL, NULL)
+                       aom_highbd_paeth_predictor_8x32_neon,
+                       aom_highbd_smooth_predictor_8x32_neon, NULL, NULL)
 #endif
 #endif  // HAVE_NEON
 
@@ -1433,24 +1440,29 @@
 #if HAVE_NEON
 HIGHBD_INTRA_PRED_TEST(NEON, TX_16X16, aom_highbd_dc_predictor_16x16_neon, NULL,
                        NULL, NULL, aom_highbd_v_predictor_16x16_neon, NULL,
-                       aom_highbd_paeth_predictor_16x16_neon, NULL, NULL, NULL)
+                       aom_highbd_paeth_predictor_16x16_neon,
+                       aom_highbd_smooth_predictor_16x16_neon, NULL, NULL)
 
 HIGHBD_INTRA_PRED_TEST(NEON, TX_16X8, NULL, NULL, NULL, NULL,
                        aom_highbd_v_predictor_16x8_neon, NULL,
-                       aom_highbd_paeth_predictor_16x8_neon, NULL, NULL, NULL)
+                       aom_highbd_paeth_predictor_16x8_neon,
+                       aom_highbd_smooth_predictor_16x8_neon, NULL, NULL)
 
 HIGHBD_INTRA_PRED_TEST(NEON, TX_16X32, NULL, NULL, NULL, NULL,
                        aom_highbd_v_predictor_16x32_neon, NULL,
-                       aom_highbd_paeth_predictor_16x32_neon, NULL, NULL, NULL)
+                       aom_highbd_paeth_predictor_16x32_neon,
+                       aom_highbd_smooth_predictor_16x32_neon, NULL, NULL)
 
 #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, NULL, NULL, NULL)
+                       aom_highbd_paeth_predictor_16x4_neon,
+                       aom_highbd_smooth_predictor_16x4_neon, NULL, NULL)
 
 HIGHBD_INTRA_PRED_TEST(NEON, TX_16X64, NULL, NULL, NULL, NULL,
                        aom_highbd_v_predictor_16x64_neon, NULL,
-                       aom_highbd_paeth_predictor_16x64_neon, NULL, NULL, NULL)
+                       aom_highbd_paeth_predictor_16x64_neon,
+                       aom_highbd_smooth_predictor_16x64_neon, NULL, NULL)
 #endif
 #endif  // HAVE_NEON
 
@@ -1524,20 +1536,24 @@
 #if HAVE_NEON
 HIGHBD_INTRA_PRED_TEST(NEON, TX_32X32, aom_highbd_dc_predictor_32x32_neon, NULL,
                        NULL, NULL, aom_highbd_v_predictor_32x32_neon, NULL,
-                       aom_highbd_paeth_predictor_32x32_neon, NULL, NULL, NULL)
+                       aom_highbd_paeth_predictor_32x32_neon,
+                       aom_highbd_smooth_predictor_32x32_neon, NULL, NULL)
 
 HIGHBD_INTRA_PRED_TEST(NEON, TX_32X16, NULL, NULL, NULL, NULL,
                        aom_highbd_v_predictor_32x16_neon, NULL,
-                       aom_highbd_paeth_predictor_32x16_neon, NULL, NULL, NULL)
+                       aom_highbd_paeth_predictor_32x16_neon,
+                       aom_highbd_smooth_predictor_32x16_neon, NULL, NULL)
 
 HIGHBD_INTRA_PRED_TEST(NEON, TX_32X64, NULL, NULL, NULL, NULL,
                        aom_highbd_v_predictor_32x64_neon, NULL,
-                       aom_highbd_paeth_predictor_32x64_neon, NULL, NULL, NULL)
+                       aom_highbd_paeth_predictor_32x64_neon,
+                       aom_highbd_smooth_predictor_32x64_neon, NULL, NULL)
 
 #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, NULL, NULL, NULL)
+                       aom_highbd_paeth_predictor_32x8_neon,
+                       aom_highbd_smooth_predictor_32x8_neon, NULL, NULL)
 #endif
 #endif  // HAVE_NEON
 
@@ -1573,16 +1589,19 @@
 #if HAVE_NEON
 HIGHBD_INTRA_PRED_TEST(NEON, TX_64X64, aom_highbd_dc_predictor_64x64_neon, NULL,
                        NULL, NULL, aom_highbd_v_predictor_64x64_neon, NULL,
-                       aom_highbd_paeth_predictor_64x64_neon, NULL, NULL, NULL)
+                       aom_highbd_paeth_predictor_64x64_neon,
+                       aom_highbd_smooth_predictor_64x64_neon, NULL, NULL)
 
 HIGHBD_INTRA_PRED_TEST(NEON, TX_64X32, NULL, NULL, NULL, NULL,
                        aom_highbd_v_predictor_64x32_neon, NULL,
-                       aom_highbd_paeth_predictor_64x32_neon, NULL, NULL, NULL)
+                       aom_highbd_paeth_predictor_64x32_neon,
+                       aom_highbd_smooth_predictor_64x32_neon, NULL, NULL)
 
 #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, NULL, NULL, NULL)
+                       aom_highbd_paeth_predictor_64x16_neon,
+                       aom_highbd_smooth_predictor_64x16_neon, NULL, NULL)
 #endif
 #endif  // HAVE_NEON