1 files changed, 58 insertions, 15 deletions
diff --git a/media/libaom/sources.mozbuild b/media/libaom/sources.mozbuild
index 3578e1186..d9c5c15a9 100644
--- a/media/libaom/sources.mozbuild
+++ b/media/libaom/sources.mozbuild
@@ -54,6 +54,8 @@ files = {
     '../../third_party/aom/aom_dsp/variance.c',
     '../../third_party/aom/aom_dsp/x86/aom_asm_stubs.c',
     '../../third_party/aom/aom_dsp/x86/aom_convolve_copy_sse2.asm',
+    '../../third_party/aom/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm',
+    '../../third_party/aom/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c',
     '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c',
     '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_sse2.asm',
@@ -71,13 +73,27 @@ files = {
     '../../third_party/aom/aom_dsp/x86/fwd_txfm_ssse3_x86_64.asm',
     '../../third_party/aom/aom_dsp/x86/halfpix_variance_impl_sse2.asm',
     '../../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_sse2.asm',
+    '../../third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c',
+    '../../third_party/aom/aom_dsp/x86/highbd_quantize_intrin_sse2.c',
+    '../../third_party/aom/aom_dsp/x86/highbd_sad4d_sse2.asm',
+    '../../third_party/aom/aom_dsp/x86/highbd_sad_sse2.asm',
+    '../../third_party/aom/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm',
+    '../../third_party/aom/aom_dsp/x86/highbd_subtract_sse2.c',
+    '../../third_party/aom/aom_dsp/x86/highbd_variance_impl_sse2.asm',
+    '../../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_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/intrapred_ssse3.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',
     '../../third_party/aom/aom_dsp/x86/inv_wht_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/loopfilter_avx2.c',
     '../../third_party/aom/aom_dsp/x86/loopfilter_sse2.c',
+    '../../third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c',
+    '../../third_party/aom/aom_dsp/x86/masked_variance_intrin_ssse3.c',
     '../../third_party/aom/aom_dsp/x86/obmc_sad_sse4.c',
     '../../third_party/aom/aom_dsp/x86/obmc_variance_sse4.c',
     '../../third_party/aom/aom_dsp/x86/quantize_avx_x86_64.asm',
@@ -86,6 +102,7 @@ files = {
     '../../third_party/aom/aom_dsp/x86/sad4d_avx2.c',
     '../../third_party/aom/aom_dsp/x86/sad4d_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/sad_avx2.c',
+    '../../third_party/aom/aom_dsp/x86/sad_highbd_avx2.c',
     '../../third_party/aom/aom_dsp/x86/sad_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/sad_sse3.asm',
     '../../third_party/aom/aom_dsp/x86/sad_sse4.asm',
@@ -152,9 +169,14 @@ files = {
     '../../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',
+    '../../third_party/aom/av1/common/x86/av1_highbd_convolve_sse4.c',
+    '../../third_party/aom/av1/common/x86/highbd_inv_txfm_avx2.c',
+    '../../third_party/aom/av1/common/x86/highbd_inv_txfm_sse4.c',
+    '../../third_party/aom/av1/common/x86/highbd_warp_plane_ssse3.c',
     '../../third_party/aom/av1/common/x86/hybrid_inv_txfm_avx2.c',
     '../../third_party/aom/av1/common/x86/idct_intrin_sse2.c',
     '../../third_party/aom/av1/common/x86/warp_plane_sse2.c',
+    '../../third_party/aom/av1/common/x86/warp_plane_ssse3.c',
     '../../third_party/aom/av1/decoder/decodeframe.c',
     '../../third_party/aom/av1/decoder/decodemv.c',
     '../../third_party/aom/av1/decoder/decoder.c',
@@ -196,16 +218,21 @@ files = {
     '../../third_party/aom/av1/encoder/temporal_filter.c',
     '../../third_party/aom/av1/encoder/tokenize.c',
     '../../third_party/aom/av1/encoder/treewriter.c',
-    '../../third_party/aom/av1/encoder/variance_tree.c',
+    '../../third_party/aom/av1/encoder/wedge_utils.c',
+    '../../third_party/aom/av1/encoder/x86/av1_highbd_quantize_sse4.c',
     '../../third_party/aom/av1/encoder/x86/av1_quantize_sse2.c',
     '../../third_party/aom/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm',
+    '../../third_party/aom/av1/encoder/x86/corner_match_sse4.c',
     '../../third_party/aom/av1/encoder/x86/dct_intrin_sse2.c',
     '../../third_party/aom/av1/encoder/x86/dct_sse2.asm',
     '../../third_party/aom/av1/encoder/x86/dct_ssse3.c',
     '../../third_party/aom/av1/encoder/x86/error_intrin_avx2.c',
     '../../third_party/aom/av1/encoder/x86/error_sse2.asm',
+    '../../third_party/aom/av1/encoder/x86/highbd_block_error_intrin_sse2.c',
+    '../../third_party/aom/av1/encoder/x86/highbd_fwd_txfm_sse4.c',
     '../../third_party/aom/av1/encoder/x86/hybrid_fwd_txfm_avx2.c',
     '../../third_party/aom/av1/encoder/x86/temporal_filter_apply_sse2.asm',
+    '../../third_party/aom/av1/encoder/x86/wedge_utils_sse2.c',
 ],
   'IA32_EXPORTS': [
     '../../third_party/aom/aom/aom.h',
@@ -260,6 +287,8 @@ files = {
     '../../third_party/aom/aom_dsp/variance.c',
     '../../third_party/aom/aom_dsp/x86/aom_asm_stubs.c',
     '../../third_party/aom/aom_dsp/x86/aom_convolve_copy_sse2.asm',
+    '../../third_party/aom/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm',
+    '../../third_party/aom/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c',
     '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c',
     '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_sse2.asm',
@@ -275,19 +304,34 @@ files = {
     '../../third_party/aom/aom_dsp/x86/fwd_txfm_sse2.c',
     '../../third_party/aom/aom_dsp/x86/halfpix_variance_impl_sse2.asm',
     '../../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_sse2.asm',
+    '../../third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c',
+    '../../third_party/aom/aom_dsp/x86/highbd_quantize_intrin_sse2.c',
+    '../../third_party/aom/aom_dsp/x86/highbd_sad4d_sse2.asm',
+    '../../third_party/aom/aom_dsp/x86/highbd_sad_sse2.asm',
+    '../../third_party/aom/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm',
+    '../../third_party/aom/aom_dsp/x86/highbd_subtract_sse2.c',
+    '../../third_party/aom/aom_dsp/x86/highbd_variance_impl_sse2.asm',
+    '../../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_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/intrapred_ssse3.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',
     '../../third_party/aom/aom_dsp/x86/inv_wht_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/loopfilter_avx2.c',
     '../../third_party/aom/aom_dsp/x86/loopfilter_sse2.c',
+    '../../third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c',
+    '../../third_party/aom/aom_dsp/x86/masked_variance_intrin_ssse3.c',
     '../../third_party/aom/aom_dsp/x86/obmc_sad_sse4.c',
     '../../third_party/aom/aom_dsp/x86/obmc_variance_sse4.c',
     '../../third_party/aom/aom_dsp/x86/quantize_sse2.c',
     '../../third_party/aom/aom_dsp/x86/sad4d_avx2.c',
     '../../third_party/aom/aom_dsp/x86/sad4d_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/sad_avx2.c',
+    '../../third_party/aom/aom_dsp/x86/sad_highbd_avx2.c',
     '../../third_party/aom/aom_dsp/x86/sad_sse2.asm',
     '../../third_party/aom/aom_dsp/x86/sad_sse3.asm',
     '../../third_party/aom/aom_dsp/x86/sad_sse4.asm',
@@ -353,9 +397,14 @@ files = {
     '../../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',
+    '../../third_party/aom/av1/common/x86/av1_highbd_convolve_sse4.c',
+    '../../third_party/aom/av1/common/x86/highbd_inv_txfm_avx2.c',
+    '../../third_party/aom/av1/common/x86/highbd_inv_txfm_sse4.c',
+    '../../third_party/aom/av1/common/x86/highbd_warp_plane_ssse3.c',
     '../../third_party/aom/av1/common/x86/hybrid_inv_txfm_avx2.c',
     '../../third_party/aom/av1/common/x86/idct_intrin_sse2.c',
     '../../third_party/aom/av1/common/x86/warp_plane_sse2.c',
+    '../../third_party/aom/av1/common/x86/warp_plane_ssse3.c',
     '../../third_party/aom/av1/decoder/decodeframe.c',
     '../../third_party/aom/av1/decoder/decodemv.c',
     '../../third_party/aom/av1/decoder/decoder.c',
@@ -397,15 +446,20 @@ files = {
     '../../third_party/aom/av1/encoder/temporal_filter.c',
     '../../third_party/aom/av1/encoder/tokenize.c',
     '../../third_party/aom/av1/encoder/treewriter.c',
-    '../../third_party/aom/av1/encoder/variance_tree.c',
+    '../../third_party/aom/av1/encoder/wedge_utils.c',
+    '../../third_party/aom/av1/encoder/x86/av1_highbd_quantize_sse4.c',
     '../../third_party/aom/av1/encoder/x86/av1_quantize_sse2.c',
+    '../../third_party/aom/av1/encoder/x86/corner_match_sse4.c',
     '../../third_party/aom/av1/encoder/x86/dct_intrin_sse2.c',
     '../../third_party/aom/av1/encoder/x86/dct_sse2.asm',
     '../../third_party/aom/av1/encoder/x86/dct_ssse3.c',
     '../../third_party/aom/av1/encoder/x86/error_intrin_avx2.c',
     '../../third_party/aom/av1/encoder/x86/error_sse2.asm',
+    '../../third_party/aom/av1/encoder/x86/highbd_block_error_intrin_sse2.c',
+    '../../third_party/aom/av1/encoder/x86/highbd_fwd_txfm_sse4.c',
     '../../third_party/aom/av1/encoder/x86/hybrid_fwd_txfm_avx2.c',
     '../../third_party/aom/av1/encoder/x86/temporal_filter_apply_sse2.asm',
+    '../../third_party/aom/av1/encoder/x86/wedge_utils_sse2.c',
 ],
   'ARM_EXPORTS': [
     '../../third_party/aom/aom/aom.h',
@@ -440,7 +494,6 @@ files = {
     '../../third_party/aom/aom_dsp/arm/aom_convolve_copy_neon_asm.asm',
     '../../third_party/aom/aom_dsp/arm/aom_convolve_neon.c',
     '../../third_party/aom/aom_dsp/arm/avg_neon.c',
-    '../../third_party/aom/aom_dsp/arm/bilinear_filter_media.asm',
     '../../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',
@@ -460,16 +513,10 @@ files = {
     '../../third_party/aom/aom_dsp/arm/loopfilter_mb_neon.asm',
     '../../third_party/aom/aom_dsp/arm/loopfilter_neon.c',
     '../../third_party/aom/aom_dsp/arm/sad4d_neon.c',
-    '../../third_party/aom/aom_dsp/arm/sad_media.asm',
     '../../third_party/aom/aom_dsp/arm/sad_neon.c',
     '../../third_party/aom/aom_dsp/arm/save_reg_neon.asm',
-    '../../third_party/aom/aom_dsp/arm/subpel_variance_media.c',
     '../../third_party/aom/aom_dsp/arm/subpel_variance_neon.c',
     '../../third_party/aom/aom_dsp/arm/subtract_neon.c',
-    '../../third_party/aom/aom_dsp/arm/variance_halfpixvar16x16_h_media.asm',
-    '../../third_party/aom/aom_dsp/arm/variance_halfpixvar16x16_hv_media.asm',
-    '../../third_party/aom/aom_dsp/arm/variance_halfpixvar16x16_v_media.asm',
-    '../../third_party/aom/aom_dsp/arm/variance_media.asm',
     '../../third_party/aom/aom_dsp/arm/variance_neon.c',
     '../../third_party/aom/aom_dsp/avg.c',
     '../../third_party/aom/aom_dsp/binary_codes_reader.c',
@@ -509,8 +556,6 @@ files = {
     '../../third_party/aom/av1/av1_cx_iface.c',
     '../../third_party/aom/av1/av1_dx_iface.c',
     '../../third_party/aom/av1/common/alloccommon.c',
-    '../../third_party/aom/av1/common/arm/neon/iht4x4_add_neon.c',
-    '../../third_party/aom/av1/common/arm/neon/iht8x8_add_neon.c',
     '../../third_party/aom/av1/common/av1_fwd_txfm1d.c',
     '../../third_party/aom/av1/common/av1_fwd_txfm2d.c',
     '../../third_party/aom/av1/common/av1_inv_txfm1d.c',
@@ -553,8 +598,6 @@ files = {
     '../../third_party/aom/av1/encoder/aq_complexity.c',
     '../../third_party/aom/av1/encoder/aq_cyclicrefresh.c',
     '../../third_party/aom/av1/encoder/aq_variance.c',
-    '../../third_party/aom/av1/encoder/arm/neon/dct_neon.c',
-    '../../third_party/aom/av1/encoder/arm/neon/error_neon.c',
     '../../third_party/aom/av1/encoder/arm/neon/quantize_neon.c',
     '../../third_party/aom/av1/encoder/av1_quantize.c',
     '../../third_party/aom/av1/encoder/bitstream.c',
@@ -588,7 +631,7 @@ files = {
     '../../third_party/aom/av1/encoder/temporal_filter.c',
     '../../third_party/aom/av1/encoder/tokenize.c',
     '../../third_party/aom/av1/encoder/treewriter.c',
-    '../../third_party/aom/av1/encoder/variance_tree.c',
+    '../../third_party/aom/av1/encoder/wedge_utils.c',
 ],
   'GENERIC_EXPORTS': [
     '../../third_party/aom/aom/aom.h',
@@ -725,6 +768,6 @@ files = {
     '../../third_party/aom/av1/encoder/temporal_filter.c',
     '../../third_party/aom/av1/encoder/tokenize.c',
     '../../third_party/aom/av1/encoder/treewriter.c',
-    '../../third_party/aom/av1/encoder/variance_tree.c',
+    '../../third_party/aom/av1/encoder/wedge_utils.c',
 ],
 }