[av1] Fix build issues

This revision of libaom has some conflicts with our vendor script
and build system. A number of new .asm files have the same basename
as .c files, which our build system cannot handle.

To work around this, I manually renamed the conflicting
files in the filesystem and sources.mozbuild.

Also add av1_convolve_scale_sse4.c to sources.mozbuild manually.
This is needed by the build but for some reason isn't picked up
by generate_sources_mozbuild.sh.

1 files changed, 16 insertions, 14 deletions

diff --git a/media/libaom/sources.mozbuild b/media/libaom/sources.mozbuild
index 2c9df6d03..de355b8eb 100644
--- a/media/libaom/sources.mozbuild
+++ b/media/libaom/sources.mozbuild
@@ -77,8 +77,8 @@ files = {
     '../../third_party/aom/aom_dsp/x86/halfpix_variance_sse2.c',
     '../../third_party/aom/aom_dsp/x86/highbd_convolve_avx2.c',
     '../../third_party/aom/aom_dsp/x86/highbd_intrapred_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.c',
+    '../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2_asm.asm',
     '../../third_party/aom/aom_dsp/x86/highbd_intrapred_ssse3.c',
     '../../third_party/aom/aom_dsp/x86/highbd_loopfilter_avx2.c',
     '../../third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c',
@@ -92,10 +92,10 @@ files = {
     '../../third_party/aom/aom_dsp/x86/highbd_variance_sse2.c',
     '../../third_party/aom/aom_dsp/x86/highbd_variance_sse4.c',
     '../../third_party/aom/aom_dsp/x86/intrapred_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/intrapred_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_ssse3.asm',
+    '../../third_party/aom/aom_dsp/x86/intrapred_sse2_asm.asm',
     '../../third_party/aom/aom_dsp/x86/intrapred_ssse3.c',
+    '../../third_party/aom/aom_dsp/x86/intrapred_ssse3_asm.asm',
     '../../third_party/aom/aom_dsp/x86/inv_txfm_avx2.c',
     '../../third_party/aom/aom_dsp/x86/inv_txfm_sse2.c',
     '../../third_party/aom/aom_dsp/x86/inv_txfm_ssse3.c',
@@ -174,6 +174,7 @@ files = {
     '../../third_party/aom/av1/common/thread_common.c',
     '../../third_party/aom/av1/common/tile_common.c',
     '../../third_party/aom/av1/common/warped_motion.c',
+    '../../third_party/aom/av1/common/x86/av1_convolve_scale_sse4.c',
     '../../third_party/aom/av1/common/x86/av1_convolve_ssse3.c',
     '../../third_party/aom/av1/common/x86/av1_fwd_txfm1d_sse4.c',
     '../../third_party/aom/av1/common/x86/av1_fwd_txfm2d_sse4.c',
@@ -324,8 +325,8 @@ files = {
     '../../third_party/aom/aom_dsp/x86/halfpix_variance_sse2.c',
     '../../third_party/aom/aom_dsp/x86/highbd_convolve_avx2.c',
     '../../third_party/aom/aom_dsp/x86/highbd_intrapred_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.c',
+    '../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2_asm.asm',
     '../../third_party/aom/aom_dsp/x86/highbd_intrapred_ssse3.c',
     '../../third_party/aom/aom_dsp/x86/highbd_loopfilter_avx2.c',
     '../../third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c',
@@ -339,10 +340,10 @@ files = {
     '../../third_party/aom/aom_dsp/x86/highbd_variance_sse2.c',
     '../../third_party/aom/aom_dsp/x86/highbd_variance_sse4.c',
     '../../third_party/aom/aom_dsp/x86/intrapred_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/intrapred_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_ssse3.asm',
+    '../../third_party/aom/aom_dsp/x86/intrapred_sse2_asm.asm',
     '../../third_party/aom/aom_dsp/x86/intrapred_ssse3.c',
+    '../../third_party/aom/aom_dsp/x86/intrapred_ssse3_asm.asm',
     '../../third_party/aom/aom_dsp/x86/inv_txfm_avx2.c',
     '../../third_party/aom/aom_dsp/x86/inv_txfm_sse2.c',
     '../../third_party/aom/aom_dsp/x86/inv_txfm_ssse3.c',
@@ -418,6 +419,7 @@ files = {
     '../../third_party/aom/av1/common/thread_common.c',
     '../../third_party/aom/av1/common/tile_common.c',
     '../../third_party/aom/av1/common/warped_motion.c',
+    '../../third_party/aom/av1/common/x86/av1_convolve_scale_sse4.c',
     '../../third_party/aom/av1/common/x86/av1_convolve_ssse3.c',
     '../../third_party/aom/av1/common/x86/av1_fwd_txfm1d_sse4.c',
     '../../third_party/aom/av1/common/x86/av1_fwd_txfm2d_sse4.c',
@@ -528,15 +530,15 @@ files = {
     '../../third_party/aom/aom_dsp/arm/avg_neon.c',
     '../../third_party/aom/aom_dsp/arm/fwd_txfm_neon.c',
     '../../third_party/aom/aom_dsp/arm/hadamard_neon.c',
-    '../../third_party/aom/aom_dsp/arm/idct16x16_1_add_neon.asm',
-    '../../third_party/aom/aom_dsp/arm/idct16x16_add_neon.asm',
+    '../../third_party/aom/aom_dsp/arm/idct16x16_1_add_neon_asm_asm.asm',
+    '../../third_party/aom/aom_dsp/arm/idct16x16_add_neon_asm.asm',
     '../../third_party/aom/aom_dsp/arm/idct16x16_neon.c',
-    '../../third_party/aom/aom_dsp/arm/idct32x32_1_add_neon.asm',
-    '../../third_party/aom/aom_dsp/arm/idct32x32_add_neon.asm',
-    '../../third_party/aom/aom_dsp/arm/idct4x4_1_add_neon.asm',
-    '../../third_party/aom/aom_dsp/arm/idct4x4_add_neon.asm',
-    '../../third_party/aom/aom_dsp/arm/idct8x8_1_add_neon.asm',
-    '../../third_party/aom/aom_dsp/arm/idct8x8_add_neon.asm',
+    '../../third_party/aom/aom_dsp/arm/idct32x32_1_add_neon_asm.asm',
+    '../../third_party/aom/aom_dsp/arm/idct32x32_add_neon_asm.asm',
+    '../../third_party/aom/aom_dsp/arm/idct4x4_1_add_neon_asm.asm',
+    '../../third_party/aom/aom_dsp/arm/idct4x4_add_neon_asm.asm',
+    '../../third_party/aom/aom_dsp/arm/idct8x8_1_add_neon_asm.asm',
+    '../../third_party/aom/aom_dsp/arm/idct8x8_add_neon_asm.asm',
     '../../third_party/aom/aom_dsp/arm/intrapred_neon.c',
     '../../third_party/aom/aom_dsp/arm/intrapred_neon_asm.asm',
     '../../third_party/aom/aom_dsp/arm/sad4d_neon.c',