Merge "external/libaom: disable av1_(apply_|)selfguided_restoration_neon"android-mainline-11.0.0_r35android-mainline-11.0.0_r2android-mainline-11.0.0_r1android-11.0.0_r16android11-devandroid11-d1-b-release

4 files changed, 12 insertions, 14 deletions

diff --git a/README.version b/README.version
index b9762fbe4..95519e8c3 100644
--- a/README.version
+++ b/README.version
@@ -11,3 +11,5 @@ adfc4b7f8 av1_dec_fuzzer: Remove fmemopen dependency
 338f1e688 av1_dec_fuzzer: Remove dependency on ivfdec.o and tools_common.o
 690a08a34 av1_dec_fuzzer: Updated fsanitize flags in build script
 c2632bb3f av1_dec_fuzzer: Fix missing field initializer for 'cfg'
+cherry-picks:
+0e07ea54d disable av1_(apply_|)selfguided_restoration_neon
diff --git a/config/arm/config/av1_rtcd.h b/config/arm/config/av1_rtcd.h
index 6f4266638..8ed0faad8 100644
--- a/config/arm/config/av1_rtcd.h
+++ b/config/arm/config/av1_rtcd.h
@@ -54,8 +54,7 @@ extern "C" {
 #endif
 
 void apply_selfguided_restoration_c(const uint8_t *dat, int width, int height, int stride, int eps, const int *xqd, uint8_t *dst, int dst_stride, int32_t *tmpbuf, int bit_depth, int highbd);
-void apply_selfguided_restoration_neon(const uint8_t *dat, int width, int height, int stride, int eps, const int *xqd, uint8_t *dst, int dst_stride, int32_t *tmpbuf, int bit_depth, int highbd);
-#define apply_selfguided_restoration apply_selfguided_restoration_neon
+#define apply_selfguided_restoration apply_selfguided_restoration_c
 
 void av1_build_compound_diffwtd_mask_c(uint8_t *mask, DIFFWTD_MASK_TYPE mask_type, const uint8_t *src0, int src0_stride, const uint8_t *src1, int src1_stride, int h, int w);
 #define av1_build_compound_diffwtd_mask av1_build_compound_diffwtd_mask_c
@@ -278,10 +277,7 @@ void av1_round_shift_array_neon(int32_t *arr, int size, int bit);
 int av1_selfguided_restoration_c(const uint8_t *dgd8, int width, int height,
                                  int dgd_stride, int32_t *flt0, int32_t *flt1, int flt_stride,
                                  int sgr_params_idx, int bit_depth, int highbd);
-int av1_selfguided_restoration_neon(const uint8_t *dgd8, int width, int height,
-                                 int dgd_stride, int32_t *flt0, int32_t *flt1, int flt_stride,
-                                 int sgr_params_idx, int bit_depth, int highbd);
-#define av1_selfguided_restoration av1_selfguided_restoration_neon
+#define av1_selfguided_restoration av1_selfguided_restoration_c
 
 void av1_upsample_intra_edge_c(uint8_t *p, int sz);
 #define av1_upsample_intra_edge av1_upsample_intra_edge_c
diff --git a/config/arm64/config/av1_rtcd.h b/config/arm64/config/av1_rtcd.h
index 6f4266638..8ed0faad8 100644
--- a/config/arm64/config/av1_rtcd.h
+++ b/config/arm64/config/av1_rtcd.h
@@ -54,8 +54,7 @@ extern "C" {
 #endif
 
 void apply_selfguided_restoration_c(const uint8_t *dat, int width, int height, int stride, int eps, const int *xqd, uint8_t *dst, int dst_stride, int32_t *tmpbuf, int bit_depth, int highbd);
-void apply_selfguided_restoration_neon(const uint8_t *dat, int width, int height, int stride, int eps, const int *xqd, uint8_t *dst, int dst_stride, int32_t *tmpbuf, int bit_depth, int highbd);
-#define apply_selfguided_restoration apply_selfguided_restoration_neon
+#define apply_selfguided_restoration apply_selfguided_restoration_c
 
 void av1_build_compound_diffwtd_mask_c(uint8_t *mask, DIFFWTD_MASK_TYPE mask_type, const uint8_t *src0, int src0_stride, const uint8_t *src1, int src1_stride, int h, int w);
 #define av1_build_compound_diffwtd_mask av1_build_compound_diffwtd_mask_c
@@ -278,10 +277,7 @@ void av1_round_shift_array_neon(int32_t *arr, int size, int bit);
 int av1_selfguided_restoration_c(const uint8_t *dgd8, int width, int height,
                                  int dgd_stride, int32_t *flt0, int32_t *flt1, int flt_stride,
                                  int sgr_params_idx, int bit_depth, int highbd);
-int av1_selfguided_restoration_neon(const uint8_t *dgd8, int width, int height,
-                                 int dgd_stride, int32_t *flt0, int32_t *flt1, int flt_stride,
-                                 int sgr_params_idx, int bit_depth, int highbd);
-#define av1_selfguided_restoration av1_selfguided_restoration_neon
+#define av1_selfguided_restoration av1_selfguided_restoration_c
 
 void av1_upsample_intra_edge_c(uint8_t *p, int sz);
 #define av1_upsample_intra_edge av1_upsample_intra_edge_c
diff --git a/libaom/av1/common/av1_rtcd_defs.pl b/libaom/av1/common/av1_rtcd_defs.pl
index aca5ec7de..d0e50309a 100644
--- a/libaom/av1/common/av1_rtcd_defs.pl
+++ b/libaom/av1/common/av1_rtcd_defs.pl
@@ -351,12 +351,16 @@ if (aom_config("CONFIG_AV1_ENCODER") eq "yes") {
 # LOOP_RESTORATION functions
 
 add_proto qw/void apply_selfguided_restoration/, "const uint8_t *dat, int width, int height, int stride, int eps, const int *xqd, uint8_t *dst, int dst_stride, int32_t *tmpbuf, int bit_depth, int highbd";
-specialize qw/apply_selfguided_restoration sse4_1 avx2 neon/;
+# TODO(b/141858830,b/141859709): neon is currently disabled due to use of
+# uninitialized memory.
+specialize qw/apply_selfguided_restoration sse4_1 avx2/;
 
 add_proto qw/int av1_selfguided_restoration/, "const uint8_t *dgd8, int width, int height,
                                  int dgd_stride, int32_t *flt0, int32_t *flt1, int flt_stride,
                                  int sgr_params_idx, int bit_depth, int highbd";
-specialize qw/av1_selfguided_restoration sse4_1 avx2 neon/;
+# TODO(b/141858830,b/141859709): neon is currently disabled due to use of
+# uninitialized memory.
+specialize qw/av1_selfguided_restoration sse4_1 avx2/;
 
 # CONVOLVE_ROUND/COMPOUND_ROUND functions