Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 11 deletions

diff --git a/media/libaom/sources.mozbuild b/media/libaom/sources.mozbuild
index b29ddd5c97..187bf97f8a 100644
--- a/media/libaom/sources.mozbuild
+++ b/media/libaom/sources.mozbuild
@@ -506,6 +506,7 @@ files = {
     '../../third_party/aom/aom_dsp/flow_estimation/ransac.c',
     '../../third_party/aom/aom_dsp/flow_estimation/x86/corner_match_avx2.c',
     '../../third_party/aom/aom_dsp/flow_estimation/x86/corner_match_sse4.c',
+    '../../third_party/aom/aom_dsp/flow_estimation/x86/disflow_avx2.c',
     '../../third_party/aom/aom_dsp/flow_estimation/x86/disflow_sse4.c',
     '../../third_party/aom/aom_dsp/fwd_txfm.c',
     '../../third_party/aom/aom_dsp/grain_table.c',
@@ -533,11 +534,8 @@ files = {
     '../../third_party/aom/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/aom_quantize_avx.c',
     '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_sse2.c',
     '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_ssse3.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm',
     '../../third_party/aom/aom_dsp/x86/avg_intrin_avx2.c',
     '../../third_party/aom/aom_dsp/x86/avg_intrin_sse2.c',
@@ -599,7 +597,7 @@ files = {
     '../../third_party/aom/aom_dsp/x86/sad_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/sse_avx2.c',
     '../../third_party/aom/aom_dsp/x86/sse_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/subpel_variance_sse2.asm',
+    '../../third_party/aom/aom_dsp/x86/subpel_variance_ssse3.asm',
     '../../third_party/aom/aom_dsp/x86/subtract_avx2.c',
     '../../third_party/aom/aom_dsp/x86/subtract_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/sum_squares_avx2.c',
@@ -658,7 +656,6 @@ files = {
     '../../third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.c',
     '../../third_party/aom/av1/common/x86/av1_txfm_sse4.c',
     '../../third_party/aom/av1/common/x86/cdef_block_avx2.c',
-    '../../third_party/aom/av1/common/x86/cdef_block_sse2.c',
     '../../third_party/aom/av1/common/x86/cdef_block_sse4.c',
     '../../third_party/aom/av1/common/x86/cdef_block_ssse3.c',
     '../../third_party/aom/av1/common/x86/cfl_avx2.c',
@@ -859,6 +856,7 @@ files = {
     '../../third_party/aom/aom_dsp/flow_estimation/ransac.c',
     '../../third_party/aom/aom_dsp/flow_estimation/x86/corner_match_avx2.c',
     '../../third_party/aom/aom_dsp/flow_estimation/x86/corner_match_sse4.c',
+    '../../third_party/aom/aom_dsp/flow_estimation/x86/disflow_avx2.c',
     '../../third_party/aom/aom_dsp/flow_estimation/x86/disflow_sse4.c',
     '../../third_party/aom/aom_dsp/fwd_txfm.c',
     '../../third_party/aom/aom_dsp/grain_table.c',
@@ -886,11 +884,8 @@ files = {
     '../../third_party/aom/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/aom_quantize_avx.c',
     '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_sse2.c',
     '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_ssse3.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm',
     '../../third_party/aom/aom_dsp/x86/avg_intrin_avx2.c',
     '../../third_party/aom/aom_dsp/x86/avg_intrin_sse2.c',
@@ -955,7 +950,7 @@ files = {
     '../../third_party/aom/aom_dsp/x86/sse_avx2.c',
     '../../third_party/aom/aom_dsp/x86/sse_sse4.c',
     '../../third_party/aom/aom_dsp/x86/ssim_sse2_x86_64.asm',
-    '../../third_party/aom/aom_dsp/x86/subpel_variance_sse2.asm',
+    '../../third_party/aom/aom_dsp/x86/subpel_variance_ssse3.asm',
     '../../third_party/aom/aom_dsp/x86/subtract_avx2.c',
     '../../third_party/aom/aom_dsp/x86/subtract_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/sum_squares_avx2.c',
@@ -1014,9 +1009,7 @@ files = {
     '../../third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.c',
     '../../third_party/aom/av1/common/x86/av1_txfm_sse4.c',
     '../../third_party/aom/av1/common/x86/cdef_block_avx2.c',
-    '../../third_party/aom/av1/common/x86/cdef_block_sse2.c',
     '../../third_party/aom/av1/common/x86/cdef_block_sse4.c',
-    '../../third_party/aom/av1/common/x86/cdef_block_ssse3.c',
     '../../third_party/aom/av1/common/x86/cfl_avx2.c',
     '../../third_party/aom/av1/common/x86/cfl_sse2.c',
     '../../third_party/aom/av1/common/x86/cfl_ssse3.c',