Update aom to v1.0.0

Update aom to commit id d14c5bb4f336ef1842046089849dee4a301fbbf0.

1 files changed, 217 insertions, 499 deletions

diff --git a/media/libaom/sources.mozbuild b/media/libaom/sources.mozbuild
index de355b8eb..cbceecda9 100644
--- a/media/libaom/sources.mozbuild
+++ b/media/libaom/sources.mozbuild
@@ -1,7 +1,7 @@
 # This file is automatically generated. Do not edit.
 
 files = {
-  'X64_EXPORTS': [
+  'ARM_EXPORTS': [
     '../../third_party/aom/aom/aom.h',
     '../../third_party/aom/aom/aom_codec.h',
     '../../third_party/aom/aom/aom_decoder.h',
@@ -12,147 +12,72 @@ files = {
     '../../third_party/aom/aom/aomcx.h',
     '../../third_party/aom/aom/aomdx.h',
     '../../third_party/aom/aom_mem/aom_mem.h',
-    '../../third_party/aom/aom_mem/include/aom_mem_intrnl.h',
     '../../third_party/aom/aom_ports/aom_timer.h',
+    '../../third_party/aom/aom_ports/arm.h',
     '../../third_party/aom/aom_ports/bitops.h',
     '../../third_party/aom/aom_ports/mem.h',
+    '../../third_party/aom/aom_ports/sanitizer.h',
     '../../third_party/aom/aom_ports/system_state.h',
-    '../../third_party/aom/aom_ports/x86.h',
     '../../third_party/aom/aom_scale/aom_scale.h',
     '../../third_party/aom/aom_scale/yv12config.h',
-],
-  'X64_SOURCES': [
+  ],
+  'ARM_SOURCES': [
     '../../third_party/aom/aom/src/aom_codec.c',
     '../../third_party/aom/aom/src/aom_decoder.c',
     '../../third_party/aom/aom/src/aom_encoder.c',
     '../../third_party/aom/aom/src/aom_image.c',
+    '../../third_party/aom/aom/src/aom_integer.c',
     '../../third_party/aom/aom_dsp/aom_convolve.c',
     '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c',
-    '../../third_party/aom/aom_dsp/avg.c',
+    '../../third_party/aom/aom_dsp/arm/blend_a64_mask_neon.c',
+    '../../third_party/aom/aom_dsp/arm/fwd_txfm_neon.c',
+    '../../third_party/aom/aom_dsp/arm/intrapred_neon.c',
+    '../../third_party/aom/aom_dsp/arm/loopfilter_neon.c',
+    '../../third_party/aom/aom_dsp/arm/subtract_neon.c',
     '../../third_party/aom/aom_dsp/binary_codes_reader.c',
-    '../../third_party/aom/aom_dsp/binary_codes_writer.c',
     '../../third_party/aom/aom_dsp/bitreader_buffer.c',
-    '../../third_party/aom/aom_dsp/bitwriter_buffer.c',
     '../../third_party/aom/aom_dsp/blend_a64_hmask.c',
     '../../third_party/aom/aom_dsp/blend_a64_mask.c',
     '../../third_party/aom/aom_dsp/blend_a64_vmask.c',
     '../../third_party/aom/aom_dsp/daalaboolreader.c',
-    '../../third_party/aom/aom_dsp/daalaboolwriter.c',
     '../../third_party/aom/aom_dsp/entcode.c',
     '../../third_party/aom/aom_dsp/entdec.c',
-    '../../third_party/aom/aom_dsp/entenc.c',
-    '../../third_party/aom/aom_dsp/fwd_txfm.c',
+    '../../third_party/aom/aom_dsp/fft.c',
+    '../../third_party/aom/aom_dsp/grain_synthesis.c',
     '../../third_party/aom/aom_dsp/intrapred.c',
-    '../../third_party/aom/aom_dsp/inv_txfm.c',
     '../../third_party/aom/aom_dsp/loopfilter.c',
-    '../../third_party/aom/aom_dsp/prob.c',
-    '../../third_party/aom/aom_dsp/psnr.c',
-    '../../third_party/aom/aom_dsp/quantize.c',
-    '../../third_party/aom/aom_dsp/sad.c',
     '../../third_party/aom/aom_dsp/subtract.c',
-    '../../third_party/aom/aom_dsp/sum_squares.c',
-    '../../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_convolve_hip_sse2.c',
-    '../../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_highbd_convolve_hip_ssse3.c',
-    '../../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',
-    '../../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_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/avg_ssse3_x86_64.asm',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_hmask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_mask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_vmask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/fwd_dct32_8cols_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/fwd_txfm_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/fwd_txfm_sse2.c',
-    '../../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_avx2.c',
-    '../../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',
-    '../../third_party/aom/aom_dsp/x86/highbd_quantize_intrin_avx2.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_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_sse2.c',
-    '../../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',
-    '../../third_party/aom/aom_dsp/x86/inv_wht_sse2.asm',
-    '../../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',
-    '../../third_party/aom/aom_dsp/x86/quantize_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/quantize_ssse3_x86_64.asm',
-    '../../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',
-    '../../third_party/aom/aom_dsp/x86/sad_ssse3.asm',
-    '../../third_party/aom/aom_dsp/x86/ssim_opt_x86_64.asm',
-    '../../third_party/aom/aom_dsp/x86/subpel_variance_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/subtract_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/sum_squares_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/variance_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/variance_impl_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/variance_sse2.c',
     '../../third_party/aom/aom_mem/aom_mem.c',
-    '../../third_party/aom/aom_ports/emms.asm',
-    '../../third_party/aom/aom_ports/x86_abi_support.asm',
+    '../../third_party/aom/aom_ports/arm_cpudetect.c',
     '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
     '../../third_party/aom/aom_scale/generic/aom_scale.c',
     '../../third_party/aom/aom_scale/generic/gen_scalers.c',
     '../../third_party/aom/aom_scale/generic/yv12config.c',
     '../../third_party/aom/aom_scale/generic/yv12extend.c',
     '../../third_party/aom/aom_util/aom_thread.c',
-    '../../third_party/aom/av1/../third_party/fastfeat/fast.c',
-    '../../third_party/aom/av1/../third_party/fastfeat/fast_9.c',
-    '../../third_party/aom/av1/../third_party/fastfeat/nonmax.c',
-    '../../third_party/aom/av1/av1_cx_iface.c',
+    '../../third_party/aom/aom_util/debug_util.c',
     '../../third_party/aom/av1/av1_dx_iface.c',
     '../../third_party/aom/av1/common/alloccommon.c',
-    '../../third_party/aom/av1/common/av1_fwd_txfm1d.c',
-    '../../third_party/aom/av1/common/av1_fwd_txfm2d.c',
+    '../../third_party/aom/av1/common/arm/av1_txfm_neon.c',
+    '../../third_party/aom/av1/common/arm/blend_a64_hmask_neon.c',
+    '../../third_party/aom/av1/common/arm/blend_a64_vmask_neon.c',
+    '../../third_party/aom/av1/common/arm/cfl_neon.c',
+    '../../third_party/aom/av1/common/arm/convolve_neon.c',
+    '../../third_party/aom/av1/common/arm/intrapred_neon.c',
+    '../../third_party/aom/av1/common/arm/jnt_convolve_neon.c',
+    '../../third_party/aom/av1/common/arm/reconinter_neon.c',
+    '../../third_party/aom/av1/common/arm/wiener_convolve_neon.c',
     '../../third_party/aom/av1/common/av1_inv_txfm1d.c',
     '../../third_party/aom/av1/common/av1_inv_txfm2d.c',
     '../../third_party/aom/av1/common/av1_loopfilter.c',
     '../../third_party/aom/av1/common/av1_rtcd.c',
+    '../../third_party/aom/av1/common/av1_txfm.c',
     '../../third_party/aom/av1/common/blockd.c',
     '../../third_party/aom/av1/common/cdef.c',
     '../../third_party/aom/av1/common/cdef_block.c',
-    '../../third_party/aom/av1/common/cdef_block_avx2.c',
-    '../../third_party/aom/av1/common/cdef_block_sse2.c',
-    '../../third_party/aom/av1/common/cdef_block_sse4.c',
-    '../../third_party/aom/av1/common/cdef_block_ssse3.c',
+    '../../third_party/aom/av1/common/cdef_block_neon.c',
+    '../../third_party/aom/av1/common/cfl.c',
     '../../third_party/aom/av1/common/convolve.c',
-    '../../third_party/aom/av1/common/daala_tx.c',
     '../../third_party/aom/av1/common/debugmodes.c',
     '../../third_party/aom/av1/common/entropy.c',
     '../../third_party/aom/av1/common/entropymode.c',
@@ -173,85 +98,19 @@ files = {
     '../../third_party/aom/av1/common/seg_common.c',
     '../../third_party/aom/av1/common/thread_common.c',
     '../../third_party/aom/av1/common/tile_common.c',
+    '../../third_party/aom/av1/common/timing.c',
+    '../../third_party/aom/av1/common/txb_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',
-    '../../third_party/aom/av1/common/x86/av1_highbd_convolve_sse4.c',
-    '../../third_party/aom/av1/common/x86/convolve_2d_sse2.c',
-    '../../third_party/aom/av1/common/x86/convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_ssse3.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/intra_edge_sse4.c',
-    '../../third_party/aom/av1/common/x86/selfguided_sse4.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',
+    '../../third_party/aom/av1/decoder/decodetxb.c',
     '../../third_party/aom/av1/decoder/detokenize.c',
-    '../../third_party/aom/av1/decoder/dsubexp.c',
     '../../third_party/aom/av1/decoder/dthread.c',
-    '../../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/av1_quantize.c',
-    '../../third_party/aom/av1/encoder/bitstream.c',
-    '../../third_party/aom/av1/encoder/context_tree.c',
-    '../../third_party/aom/av1/encoder/corner_detect.c',
-    '../../third_party/aom/av1/encoder/corner_match.c',
-    '../../third_party/aom/av1/encoder/cost.c',
-    '../../third_party/aom/av1/encoder/dct.c',
-    '../../third_party/aom/av1/encoder/encodeframe.c',
-    '../../third_party/aom/av1/encoder/encodemb.c',
-    '../../third_party/aom/av1/encoder/encodemv.c',
-    '../../third_party/aom/av1/encoder/encoder.c',
-    '../../third_party/aom/av1/encoder/ethread.c',
-    '../../third_party/aom/av1/encoder/extend.c',
-    '../../third_party/aom/av1/encoder/firstpass.c',
-    '../../third_party/aom/av1/encoder/global_motion.c',
-    '../../third_party/aom/av1/encoder/hash.c',
-    '../../third_party/aom/av1/encoder/hybrid_fwd_txfm.c',
-    '../../third_party/aom/av1/encoder/lookahead.c',
-    '../../third_party/aom/av1/encoder/mbgraph.c',
-    '../../third_party/aom/av1/encoder/mcomp.c',
-    '../../third_party/aom/av1/encoder/palette.c',
-    '../../third_party/aom/av1/encoder/pickcdef.c',
-    '../../third_party/aom/av1/encoder/picklpf.c',
-    '../../third_party/aom/av1/encoder/pickrst.c',
-    '../../third_party/aom/av1/encoder/ransac.c',
-    '../../third_party/aom/av1/encoder/ratectrl.c',
-    '../../third_party/aom/av1/encoder/rd.c',
-    '../../third_party/aom/av1/encoder/rdopt.c',
-    '../../third_party/aom/av1/encoder/segmentation.c',
-    '../../third_party/aom/av1/encoder/speed_features.c',
-    '../../third_party/aom/av1/encoder/subexp.c',
-    '../../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/wedge_utils.c',
-    '../../third_party/aom/av1/encoder/x86/av1_highbd_quantize_avx2.c',
-    '../../third_party/aom/av1/encoder/x86/av1_highbd_quantize_sse4.c',
-    '../../third_party/aom/av1/encoder/x86/av1_quantize_avx2.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/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/av1/decoder/obu.c',
+    '../../third_party/aom/av1/encoder/arm/neon/quantize_neon.c',
+  ],
+  'GENERIC_EXPORTS': [
     '../../third_party/aom/aom/aom.h',
     '../../third_party/aom/aom/aom_codec.h',
     '../../third_party/aom/aom/aom_decoder.h',
@@ -262,142 +121,55 @@ files = {
     '../../third_party/aom/aom/aomcx.h',
     '../../third_party/aom/aom/aomdx.h',
     '../../third_party/aom/aom_mem/aom_mem.h',
-    '../../third_party/aom/aom_mem/include/aom_mem_intrnl.h',
     '../../third_party/aom/aom_ports/aom_timer.h',
     '../../third_party/aom/aom_ports/bitops.h',
     '../../third_party/aom/aom_ports/mem.h',
+    '../../third_party/aom/aom_ports/sanitizer.h',
     '../../third_party/aom/aom_ports/system_state.h',
-    '../../third_party/aom/aom_ports/x86.h',
     '../../third_party/aom/aom_scale/aom_scale.h',
     '../../third_party/aom/aom_scale/yv12config.h',
-],
-  'IA32_SOURCES': [
+  ],
+  'GENERIC_SOURCES': [
     '../../third_party/aom/aom/src/aom_codec.c',
     '../../third_party/aom/aom/src/aom_decoder.c',
     '../../third_party/aom/aom/src/aom_encoder.c',
     '../../third_party/aom/aom/src/aom_image.c',
+    '../../third_party/aom/aom/src/aom_integer.c',
     '../../third_party/aom/aom_dsp/aom_convolve.c',
     '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c',
-    '../../third_party/aom/aom_dsp/avg.c',
     '../../third_party/aom/aom_dsp/binary_codes_reader.c',
-    '../../third_party/aom/aom_dsp/binary_codes_writer.c',
     '../../third_party/aom/aom_dsp/bitreader_buffer.c',
-    '../../third_party/aom/aom_dsp/bitwriter_buffer.c',
     '../../third_party/aom/aom_dsp/blend_a64_hmask.c',
     '../../third_party/aom/aom_dsp/blend_a64_mask.c',
     '../../third_party/aom/aom_dsp/blend_a64_vmask.c',
     '../../third_party/aom/aom_dsp/daalaboolreader.c',
-    '../../third_party/aom/aom_dsp/daalaboolwriter.c',
     '../../third_party/aom/aom_dsp/entcode.c',
     '../../third_party/aom/aom_dsp/entdec.c',
-    '../../third_party/aom/aom_dsp/entenc.c',
-    '../../third_party/aom/aom_dsp/fwd_txfm.c',
+    '../../third_party/aom/aom_dsp/fft.c',
+    '../../third_party/aom/aom_dsp/grain_synthesis.c',
     '../../third_party/aom/aom_dsp/intrapred.c',
-    '../../third_party/aom/aom_dsp/inv_txfm.c',
     '../../third_party/aom/aom_dsp/loopfilter.c',
-    '../../third_party/aom/aom_dsp/prob.c',
-    '../../third_party/aom/aom_dsp/psnr.c',
-    '../../third_party/aom/aom_dsp/quantize.c',
-    '../../third_party/aom/aom_dsp/sad.c',
     '../../third_party/aom/aom_dsp/subtract.c',
-    '../../third_party/aom/aom_dsp/sum_squares.c',
-    '../../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_convolve_hip_sse2.c',
-    '../../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_highbd_convolve_hip_ssse3.c',
-    '../../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',
-    '../../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_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_hmask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_mask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_vmask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/fwd_dct32_8cols_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/fwd_txfm_avx2.c',
-    '../../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_avx2.c',
-    '../../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',
-    '../../third_party/aom/aom_dsp/x86/highbd_quantize_intrin_avx2.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_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_sse2.c',
-    '../../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',
-    '../../third_party/aom/aom_dsp/x86/inv_wht_sse2.asm',
-    '../../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',
-    '../../third_party/aom/aom_dsp/x86/sad_ssse3.asm',
-    '../../third_party/aom/aom_dsp/x86/subpel_variance_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/subtract_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/sum_squares_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/variance_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/variance_impl_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/variance_sse2.c',
     '../../third_party/aom/aom_mem/aom_mem.c',
-    '../../third_party/aom/aom_ports/emms.asm',
-    '../../third_party/aom/aom_ports/x86_abi_support.asm',
     '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
     '../../third_party/aom/aom_scale/generic/aom_scale.c',
     '../../third_party/aom/aom_scale/generic/gen_scalers.c',
     '../../third_party/aom/aom_scale/generic/yv12config.c',
     '../../third_party/aom/aom_scale/generic/yv12extend.c',
     '../../third_party/aom/aom_util/aom_thread.c',
-    '../../third_party/aom/av1/../third_party/fastfeat/fast.c',
-    '../../third_party/aom/av1/../third_party/fastfeat/fast_9.c',
-    '../../third_party/aom/av1/../third_party/fastfeat/nonmax.c',
-    '../../third_party/aom/av1/av1_cx_iface.c',
+    '../../third_party/aom/aom_util/debug_util.c',
     '../../third_party/aom/av1/av1_dx_iface.c',
     '../../third_party/aom/av1/common/alloccommon.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',
     '../../third_party/aom/av1/common/av1_inv_txfm2d.c',
     '../../third_party/aom/av1/common/av1_loopfilter.c',
     '../../third_party/aom/av1/common/av1_rtcd.c',
+    '../../third_party/aom/av1/common/av1_txfm.c',
     '../../third_party/aom/av1/common/blockd.c',
     '../../third_party/aom/av1/common/cdef.c',
     '../../third_party/aom/av1/common/cdef_block.c',
-    '../../third_party/aom/av1/common/cdef_block_avx2.c',
-    '../../third_party/aom/av1/common/cdef_block_sse2.c',
-    '../../third_party/aom/av1/common/cdef_block_sse4.c',
-    '../../third_party/aom/av1/common/cdef_block_ssse3.c',
+    '../../third_party/aom/av1/common/cfl.c',
     '../../third_party/aom/av1/common/convolve.c',
-    '../../third_party/aom/av1/common/daala_tx.c',
     '../../third_party/aom/av1/common/debugmodes.c',
     '../../third_party/aom/av1/common/entropy.c',
     '../../third_party/aom/av1/common/entropymode.c',
@@ -418,84 +190,18 @@ files = {
     '../../third_party/aom/av1/common/seg_common.c',
     '../../third_party/aom/av1/common/thread_common.c',
     '../../third_party/aom/av1/common/tile_common.c',
+    '../../third_party/aom/av1/common/timing.c',
+    '../../third_party/aom/av1/common/txb_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',
-    '../../third_party/aom/av1/common/x86/av1_highbd_convolve_sse4.c',
-    '../../third_party/aom/av1/common/x86/convolve_2d_sse2.c',
-    '../../third_party/aom/av1/common/x86/convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_ssse3.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/intra_edge_sse4.c',
-    '../../third_party/aom/av1/common/x86/selfguided_sse4.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',
+    '../../third_party/aom/av1/decoder/decodetxb.c',
     '../../third_party/aom/av1/decoder/detokenize.c',
-    '../../third_party/aom/av1/decoder/dsubexp.c',
     '../../third_party/aom/av1/decoder/dthread.c',
-    '../../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/av1_quantize.c',
-    '../../third_party/aom/av1/encoder/bitstream.c',
-    '../../third_party/aom/av1/encoder/context_tree.c',
-    '../../third_party/aom/av1/encoder/corner_detect.c',
-    '../../third_party/aom/av1/encoder/corner_match.c',
-    '../../third_party/aom/av1/encoder/cost.c',
-    '../../third_party/aom/av1/encoder/dct.c',
-    '../../third_party/aom/av1/encoder/encodeframe.c',
-    '../../third_party/aom/av1/encoder/encodemb.c',
-    '../../third_party/aom/av1/encoder/encodemv.c',
-    '../../third_party/aom/av1/encoder/encoder.c',
-    '../../third_party/aom/av1/encoder/ethread.c',
-    '../../third_party/aom/av1/encoder/extend.c',
-    '../../third_party/aom/av1/encoder/firstpass.c',
-    '../../third_party/aom/av1/encoder/global_motion.c',
-    '../../third_party/aom/av1/encoder/hash.c',
-    '../../third_party/aom/av1/encoder/hybrid_fwd_txfm.c',
-    '../../third_party/aom/av1/encoder/lookahead.c',
-    '../../third_party/aom/av1/encoder/mbgraph.c',
-    '../../third_party/aom/av1/encoder/mcomp.c',
-    '../../third_party/aom/av1/encoder/palette.c',
-    '../../third_party/aom/av1/encoder/pickcdef.c',
-    '../../third_party/aom/av1/encoder/picklpf.c',
-    '../../third_party/aom/av1/encoder/pickrst.c',
-    '../../third_party/aom/av1/encoder/ransac.c',
-    '../../third_party/aom/av1/encoder/ratectrl.c',
-    '../../third_party/aom/av1/encoder/rd.c',
-    '../../third_party/aom/av1/encoder/rdopt.c',
-    '../../third_party/aom/av1/encoder/segmentation.c',
-    '../../third_party/aom/av1/encoder/speed_features.c',
-    '../../third_party/aom/av1/encoder/subexp.c',
-    '../../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/wedge_utils.c',
-    '../../third_party/aom/av1/encoder/x86/av1_highbd_quantize_avx2.c',
-    '../../third_party/aom/av1/encoder/x86/av1_highbd_quantize_sse4.c',
-    '../../third_party/aom/av1/encoder/x86/av1_quantize_avx2.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/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/av1/decoder/obu.c',
+  ],
+  'IA32_EXPORTS': [
     '../../third_party/aom/aom/aom.h',
     '../../third_party/aom/aom/aom_codec.h',
     '../../third_party/aom/aom/aom_decoder.h',
@@ -506,97 +212,88 @@ files = {
     '../../third_party/aom/aom/aomcx.h',
     '../../third_party/aom/aom/aomdx.h',
     '../../third_party/aom/aom_mem/aom_mem.h',
-    '../../third_party/aom/aom_mem/include/aom_mem_intrnl.h',
     '../../third_party/aom/aom_ports/aom_timer.h',
-    '../../third_party/aom/aom_ports/arm.h',
     '../../third_party/aom/aom_ports/bitops.h',
     '../../third_party/aom/aom_ports/mem.h',
+    '../../third_party/aom/aom_ports/sanitizer.h',
     '../../third_party/aom/aom_ports/system_state.h',
     '../../third_party/aom/aom_scale/aom_scale.h',
     '../../third_party/aom/aom_scale/yv12config.h',
-],
-  'ARM_SOURCES': [
+  ],
+  'IA32_SOURCES': [
     '../../third_party/aom/aom/src/aom_codec.c',
     '../../third_party/aom/aom/src/aom_decoder.c',
     '../../third_party/aom/aom/src/aom_encoder.c',
     '../../third_party/aom/aom/src/aom_image.c',
+    '../../third_party/aom/aom/src/aom_integer.c',
     '../../third_party/aom/aom_dsp/aom_convolve.c',
     '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c',
-    '../../third_party/aom/aom_dsp/arm/aom_convolve8_avg_neon_asm.asm',
-    '../../third_party/aom/aom_dsp/arm/aom_convolve8_neon_asm.asm',
-    '../../third_party/aom/aom_dsp/arm/aom_convolve_avg_neon_asm.asm',
-    '../../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/fwd_txfm_neon.c',
-    '../../third_party/aom/aom_dsp/arm/hadamard_neon.c',
-    '../../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.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',
-    '../../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_neon.c',
-    '../../third_party/aom/aom_dsp/arm/subtract_neon.c',
-    '../../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',
-    '../../third_party/aom/aom_dsp/binary_codes_writer.c',
     '../../third_party/aom/aom_dsp/bitreader_buffer.c',
-    '../../third_party/aom/aom_dsp/bitwriter_buffer.c',
     '../../third_party/aom/aom_dsp/blend_a64_hmask.c',
     '../../third_party/aom/aom_dsp/blend_a64_mask.c',
     '../../third_party/aom/aom_dsp/blend_a64_vmask.c',
     '../../third_party/aom/aom_dsp/daalaboolreader.c',
-    '../../third_party/aom/aom_dsp/daalaboolwriter.c',
     '../../third_party/aom/aom_dsp/entcode.c',
     '../../third_party/aom/aom_dsp/entdec.c',
-    '../../third_party/aom/aom_dsp/entenc.c',
-    '../../third_party/aom/aom_dsp/fwd_txfm.c',
+    '../../third_party/aom/aom_dsp/fft.c',
+    '../../third_party/aom/aom_dsp/grain_synthesis.c',
     '../../third_party/aom/aom_dsp/intrapred.c',
-    '../../third_party/aom/aom_dsp/inv_txfm.c',
     '../../third_party/aom/aom_dsp/loopfilter.c',
-    '../../third_party/aom/aom_dsp/prob.c',
-    '../../third_party/aom/aom_dsp/psnr.c',
-    '../../third_party/aom/aom_dsp/quantize.c',
-    '../../third_party/aom/aom_dsp/sad.c',
     '../../third_party/aom/aom_dsp/subtract.c',
-    '../../third_party/aom/aom_dsp/sum_squares.c',
-    '../../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',
+    '../../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/blend_a64_hmask_sse4.c',
+    '../../third_party/aom/aom_dsp/x86/blend_a64_mask_sse4.c',
+    '../../third_party/aom/aom_dsp/x86/blend_a64_vmask_sse4.c',
+    '../../third_party/aom/aom_dsp/x86/fft_avx2.c',
+    '../../third_party/aom/aom_dsp/x86/fft_sse2.c',
+    '../../third_party/aom/aom_dsp/x86/highbd_convolve_avx2.c',
+    '../../third_party/aom/aom_dsp/x86/highbd_convolve_ssse3.c',
+    '../../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_loopfilter_avx2.c',
+    '../../third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c',
+    '../../third_party/aom/aom_dsp/x86/intrapred_avx2.c',
+    '../../third_party/aom/aom_dsp/x86/intrapred_sse2.c',
+    '../../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/inv_wht_sse2.asm',
+    '../../third_party/aom/aom_dsp/x86/loopfilter_sse2.c',
     '../../third_party/aom/aom_mem/aom_mem.c',
-    '../../third_party/aom/aom_ports/arm_cpudetect.c',
+    '../../third_party/aom/aom_ports/emms.asm',
+    '../../third_party/aom/aom_ports/x86_abi_support.asm',
     '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
     '../../third_party/aom/aom_scale/generic/aom_scale.c',
     '../../third_party/aom/aom_scale/generic/gen_scalers.c',
     '../../third_party/aom/aom_scale/generic/yv12config.c',
     '../../third_party/aom/aom_scale/generic/yv12extend.c',
     '../../third_party/aom/aom_util/aom_thread.c',
-    '../../third_party/aom/av1/../third_party/fastfeat/fast.c',
-    '../../third_party/aom/av1/../third_party/fastfeat/fast_9.c',
-    '../../third_party/aom/av1/../third_party/fastfeat/nonmax.c',
-    '../../third_party/aom/av1/av1_cx_iface.c',
+    '../../third_party/aom/aom_util/debug_util.c',
     '../../third_party/aom/av1/av1_dx_iface.c',
     '../../third_party/aom/av1/common/alloccommon.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',
     '../../third_party/aom/av1/common/av1_inv_txfm2d.c',
     '../../third_party/aom/av1/common/av1_loopfilter.c',
     '../../third_party/aom/av1/common/av1_rtcd.c',
+    '../../third_party/aom/av1/common/av1_txfm.c',
     '../../third_party/aom/av1/common/blockd.c',
     '../../third_party/aom/av1/common/cdef.c',
     '../../third_party/aom/av1/common/cdef_block.c',
-    '../../third_party/aom/av1/common/cdef_block_neon.c',
+    '../../third_party/aom/av1/common/cdef_block_avx2.c',
+    '../../third_party/aom/av1/common/cdef_block_sse2.c',
+    '../../third_party/aom/av1/common/cdef_block_sse4.c',
+    '../../third_party/aom/av1/common/cdef_block_ssse3.c',
+    '../../third_party/aom/av1/common/cfl.c',
     '../../third_party/aom/av1/common/convolve.c',
-    '../../third_party/aom/av1/common/daala_tx.c',
     '../../third_party/aom/av1/common/debugmodes.c',
     '../../third_party/aom/av1/common/entropy.c',
     '../../third_party/aom/av1/common/entropymode.c',
@@ -617,54 +314,55 @@ files = {
     '../../third_party/aom/av1/common/seg_common.c',
     '../../third_party/aom/av1/common/thread_common.c',
     '../../third_party/aom/av1/common/tile_common.c',
+    '../../third_party/aom/av1/common/timing.c',
+    '../../third_party/aom/av1/common/txb_common.c',
     '../../third_party/aom/av1/common/warped_motion.c',
+    '../../third_party/aom/av1/common/x86/av1_convolve_horiz_rs_sse4.c',
+    '../../third_party/aom/av1/common/x86/av1_convolve_scale_sse4.c',
+    '../../third_party/aom/av1/common/x86/av1_highbd_convolve_sse4.c',
+    '../../third_party/aom/av1/common/x86/av1_inv_txfm_avx2.c',
+    '../../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/cfl_avx2.c',
+    '../../third_party/aom/av1/common/x86/cfl_sse2.c',
+    '../../third_party/aom/av1/common/x86/cfl_ssse3.c',
+    '../../third_party/aom/av1/common/x86/convolve_2d_avx2.c',
+    '../../third_party/aom/av1/common/x86/convolve_2d_sse2.c',
+    '../../third_party/aom/av1/common/x86/convolve_avx2.c',
+    '../../third_party/aom/av1/common/x86/convolve_sse2.c',
+    '../../third_party/aom/av1/common/x86/filterintra_sse4.c',
+    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_avx2.c',
+    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_sse2.c',
+    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_sse4.c',
+    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_ssse3.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_jnt_convolve_avx2.c',
+    '../../third_party/aom/av1/common/x86/highbd_jnt_convolve_sse4.c',
+    '../../third_party/aom/av1/common/x86/highbd_warp_plane_sse4.c',
+    '../../third_party/aom/av1/common/x86/highbd_wiener_convolve_avx2.c',
+    '../../third_party/aom/av1/common/x86/highbd_wiener_convolve_ssse3.c',
+    '../../third_party/aom/av1/common/x86/intra_edge_sse4.c',
+    '../../third_party/aom/av1/common/x86/jnt_convolve_avx2.c',
+    '../../third_party/aom/av1/common/x86/jnt_convolve_sse2.c',
+    '../../third_party/aom/av1/common/x86/jnt_convolve_ssse3.c',
+    '../../third_party/aom/av1/common/x86/reconinter_avx2.c',
+    '../../third_party/aom/av1/common/x86/reconinter_sse4.c',
+    '../../third_party/aom/av1/common/x86/reconinter_ssse3.c',
+    '../../third_party/aom/av1/common/x86/selfguided_avx2.c',
+    '../../third_party/aom/av1/common/x86/selfguided_sse4.c',
+    '../../third_party/aom/av1/common/x86/warp_plane_sse4.c',
+    '../../third_party/aom/av1/common/x86/wiener_convolve_avx2.c',
+    '../../third_party/aom/av1/common/x86/wiener_convolve_sse2.c',
     '../../third_party/aom/av1/decoder/decodeframe.c',
     '../../third_party/aom/av1/decoder/decodemv.c',
     '../../third_party/aom/av1/decoder/decoder.c',
+    '../../third_party/aom/av1/decoder/decodetxb.c',
     '../../third_party/aom/av1/decoder/detokenize.c',
-    '../../third_party/aom/av1/decoder/dsubexp.c',
     '../../third_party/aom/av1/decoder/dthread.c',
-    '../../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/quantize_neon.c',
-    '../../third_party/aom/av1/encoder/av1_quantize.c',
-    '../../third_party/aom/av1/encoder/bitstream.c',
-    '../../third_party/aom/av1/encoder/context_tree.c',
-    '../../third_party/aom/av1/encoder/corner_detect.c',
-    '../../third_party/aom/av1/encoder/corner_match.c',
-    '../../third_party/aom/av1/encoder/cost.c',
-    '../../third_party/aom/av1/encoder/dct.c',
-    '../../third_party/aom/av1/encoder/encodeframe.c',
-    '../../third_party/aom/av1/encoder/encodemb.c',
-    '../../third_party/aom/av1/encoder/encodemv.c',
-    '../../third_party/aom/av1/encoder/encoder.c',
-    '../../third_party/aom/av1/encoder/ethread.c',
-    '../../third_party/aom/av1/encoder/extend.c',
-    '../../third_party/aom/av1/encoder/firstpass.c',
-    '../../third_party/aom/av1/encoder/global_motion.c',
-    '../../third_party/aom/av1/encoder/hash.c',
-    '../../third_party/aom/av1/encoder/hybrid_fwd_txfm.c',
-    '../../third_party/aom/av1/encoder/lookahead.c',
-    '../../third_party/aom/av1/encoder/mbgraph.c',
-    '../../third_party/aom/av1/encoder/mcomp.c',
-    '../../third_party/aom/av1/encoder/palette.c',
-    '../../third_party/aom/av1/encoder/pickcdef.c',
-    '../../third_party/aom/av1/encoder/picklpf.c',
-    '../../third_party/aom/av1/encoder/pickrst.c',
-    '../../third_party/aom/av1/encoder/ransac.c',
-    '../../third_party/aom/av1/encoder/ratectrl.c',
-    '../../third_party/aom/av1/encoder/rd.c',
-    '../../third_party/aom/av1/encoder/rdopt.c',
-    '../../third_party/aom/av1/encoder/segmentation.c',
-    '../../third_party/aom/av1/encoder/speed_features.c',
-    '../../third_party/aom/av1/encoder/subexp.c',
-    '../../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/wedge_utils.c',
-],
-  'GENERIC_EXPORTS': [
+    '../../third_party/aom/av1/decoder/obu.c',
+  ],
+  'X64_EXPORTS': [
     '../../third_party/aom/aom/aom.h',
     '../../third_party/aom/aom/aom_codec.h',
     '../../third_party/aom/aom/aom_decoder.h',
@@ -675,69 +373,87 @@ files = {
     '../../third_party/aom/aom/aomcx.h',
     '../../third_party/aom/aom/aomdx.h',
     '../../third_party/aom/aom_mem/aom_mem.h',
-    '../../third_party/aom/aom_mem/include/aom_mem_intrnl.h',
     '../../third_party/aom/aom_ports/aom_timer.h',
     '../../third_party/aom/aom_ports/bitops.h',
     '../../third_party/aom/aom_ports/mem.h',
+    '../../third_party/aom/aom_ports/sanitizer.h',
     '../../third_party/aom/aom_ports/system_state.h',
     '../../third_party/aom/aom_scale/aom_scale.h',
     '../../third_party/aom/aom_scale/yv12config.h',
-],
-  'GENERIC_SOURCES': [
+  ],
+  'X64_SOURCES': [
     '../../third_party/aom/aom/src/aom_codec.c',
     '../../third_party/aom/aom/src/aom_decoder.c',
     '../../third_party/aom/aom/src/aom_encoder.c',
     '../../third_party/aom/aom/src/aom_image.c',
+    '../../third_party/aom/aom/src/aom_integer.c',
     '../../third_party/aom/aom_dsp/aom_convolve.c',
     '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c',
-    '../../third_party/aom/aom_dsp/avg.c',
     '../../third_party/aom/aom_dsp/binary_codes_reader.c',
-    '../../third_party/aom/aom_dsp/binary_codes_writer.c',
     '../../third_party/aom/aom_dsp/bitreader_buffer.c',
-    '../../third_party/aom/aom_dsp/bitwriter_buffer.c',
     '../../third_party/aom/aom_dsp/blend_a64_hmask.c',
     '../../third_party/aom/aom_dsp/blend_a64_mask.c',
     '../../third_party/aom/aom_dsp/blend_a64_vmask.c',
     '../../third_party/aom/aom_dsp/daalaboolreader.c',
-    '../../third_party/aom/aom_dsp/daalaboolwriter.c',
     '../../third_party/aom/aom_dsp/entcode.c',
     '../../third_party/aom/aom_dsp/entdec.c',
-    '../../third_party/aom/aom_dsp/entenc.c',
-    '../../third_party/aom/aom_dsp/fwd_txfm.c',
+    '../../third_party/aom/aom_dsp/fft.c',
+    '../../third_party/aom/aom_dsp/grain_synthesis.c',
     '../../third_party/aom/aom_dsp/intrapred.c',
-    '../../third_party/aom/aom_dsp/inv_txfm.c',
     '../../third_party/aom/aom_dsp/loopfilter.c',
-    '../../third_party/aom/aom_dsp/prob.c',
-    '../../third_party/aom/aom_dsp/psnr.c',
-    '../../third_party/aom/aom_dsp/quantize.c',
-    '../../third_party/aom/aom_dsp/sad.c',
     '../../third_party/aom/aom_dsp/subtract.c',
-    '../../third_party/aom/aom_dsp/sum_squares.c',
-    '../../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',
+    '../../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/blend_a64_hmask_sse4.c',
+    '../../third_party/aom/aom_dsp/x86/blend_a64_mask_sse4.c',
+    '../../third_party/aom/aom_dsp/x86/blend_a64_vmask_sse4.c',
+    '../../third_party/aom/aom_dsp/x86/fft_avx2.c',
+    '../../third_party/aom/aom_dsp/x86/fft_sse2.c',
+    '../../third_party/aom/aom_dsp/x86/highbd_convolve_avx2.c',
+    '../../third_party/aom/aom_dsp/x86/highbd_convolve_ssse3.c',
+    '../../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_loopfilter_avx2.c',
+    '../../third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c',
+    '../../third_party/aom/aom_dsp/x86/intrapred_avx2.c',
+    '../../third_party/aom/aom_dsp/x86/intrapred_sse2.c',
+    '../../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/inv_wht_sse2.asm',
+    '../../third_party/aom/aom_dsp/x86/loopfilter_sse2.c',
     '../../third_party/aom/aom_mem/aom_mem.c',
+    '../../third_party/aom/aom_ports/emms.asm',
     '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
     '../../third_party/aom/aom_scale/generic/aom_scale.c',
     '../../third_party/aom/aom_scale/generic/gen_scalers.c',
     '../../third_party/aom/aom_scale/generic/yv12config.c',
     '../../third_party/aom/aom_scale/generic/yv12extend.c',
     '../../third_party/aom/aom_util/aom_thread.c',
-    '../../third_party/aom/av1/../third_party/fastfeat/fast.c',
-    '../../third_party/aom/av1/../third_party/fastfeat/fast_9.c',
-    '../../third_party/aom/av1/../third_party/fastfeat/nonmax.c',
-    '../../third_party/aom/av1/av1_cx_iface.c',
+    '../../third_party/aom/aom_util/debug_util.c',
     '../../third_party/aom/av1/av1_dx_iface.c',
     '../../third_party/aom/av1/common/alloccommon.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',
     '../../third_party/aom/av1/common/av1_inv_txfm2d.c',
     '../../third_party/aom/av1/common/av1_loopfilter.c',
     '../../third_party/aom/av1/common/av1_rtcd.c',
+    '../../third_party/aom/av1/common/av1_txfm.c',
     '../../third_party/aom/av1/common/blockd.c',
     '../../third_party/aom/av1/common/cdef.c',
     '../../third_party/aom/av1/common/cdef_block.c',
+    '../../third_party/aom/av1/common/cdef_block_avx2.c',
+    '../../third_party/aom/av1/common/cdef_block_sse2.c',
+    '../../third_party/aom/av1/common/cdef_block_sse4.c',
+    '../../third_party/aom/av1/common/cdef_block_ssse3.c',
+    '../../third_party/aom/av1/common/cfl.c',
     '../../third_party/aom/av1/common/convolve.c',
-    '../../third_party/aom/av1/common/daala_tx.c',
     '../../third_party/aom/av1/common/debugmodes.c',
     '../../third_party/aom/av1/common/entropy.c',
     '../../third_party/aom/av1/common/entropymode.c',
@@ -758,50 +474,52 @@ files = {
     '../../third_party/aom/av1/common/seg_common.c',
     '../../third_party/aom/av1/common/thread_common.c',
     '../../third_party/aom/av1/common/tile_common.c',
+    '../../third_party/aom/av1/common/timing.c',
+    '../../third_party/aom/av1/common/txb_common.c',
     '../../third_party/aom/av1/common/warped_motion.c',
+    '../../third_party/aom/av1/common/x86/av1_convolve_horiz_rs_sse4.c',
+    '../../third_party/aom/av1/common/x86/av1_convolve_scale_sse4.c',
+    '../../third_party/aom/av1/common/x86/av1_highbd_convolve_sse4.c',
+    '../../third_party/aom/av1/common/x86/av1_inv_txfm_avx2.c',
+    '../../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/cfl_avx2.c',
+    '../../third_party/aom/av1/common/x86/cfl_sse2.c',
+    '../../third_party/aom/av1/common/x86/cfl_ssse3.c',
+    '../../third_party/aom/av1/common/x86/convolve_2d_avx2.c',
+    '../../third_party/aom/av1/common/x86/convolve_2d_sse2.c',
+    '../../third_party/aom/av1/common/x86/convolve_avx2.c',
+    '../../third_party/aom/av1/common/x86/convolve_sse2.c',
+    '../../third_party/aom/av1/common/x86/filterintra_sse4.c',
+    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_avx2.c',
+    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_sse2.c',
+    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_sse4.c',
+    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_ssse3.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_jnt_convolve_avx2.c',
+    '../../third_party/aom/av1/common/x86/highbd_jnt_convolve_sse4.c',
+    '../../third_party/aom/av1/common/x86/highbd_warp_plane_sse4.c',
+    '../../third_party/aom/av1/common/x86/highbd_wiener_convolve_avx2.c',
+    '../../third_party/aom/av1/common/x86/highbd_wiener_convolve_ssse3.c',
+    '../../third_party/aom/av1/common/x86/intra_edge_sse4.c',
+    '../../third_party/aom/av1/common/x86/jnt_convolve_avx2.c',
+    '../../third_party/aom/av1/common/x86/jnt_convolve_sse2.c',
+    '../../third_party/aom/av1/common/x86/jnt_convolve_ssse3.c',
+    '../../third_party/aom/av1/common/x86/reconinter_avx2.c',
+    '../../third_party/aom/av1/common/x86/reconinter_sse4.c',
+    '../../third_party/aom/av1/common/x86/reconinter_ssse3.c',
+    '../../third_party/aom/av1/common/x86/selfguided_avx2.c',
+    '../../third_party/aom/av1/common/x86/selfguided_sse4.c',
+    '../../third_party/aom/av1/common/x86/warp_plane_sse4.c',
+    '../../third_party/aom/av1/common/x86/wiener_convolve_avx2.c',
+    '../../third_party/aom/av1/common/x86/wiener_convolve_sse2.c',
     '../../third_party/aom/av1/decoder/decodeframe.c',
     '../../third_party/aom/av1/decoder/decodemv.c',
     '../../third_party/aom/av1/decoder/decoder.c',
+    '../../third_party/aom/av1/decoder/decodetxb.c',
     '../../third_party/aom/av1/decoder/detokenize.c',
-    '../../third_party/aom/av1/decoder/dsubexp.c',
     '../../third_party/aom/av1/decoder/dthread.c',
-    '../../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/av1_quantize.c',
-    '../../third_party/aom/av1/encoder/bitstream.c',
-    '../../third_party/aom/av1/encoder/context_tree.c',
-    '../../third_party/aom/av1/encoder/corner_detect.c',
-    '../../third_party/aom/av1/encoder/corner_match.c',
-    '../../third_party/aom/av1/encoder/cost.c',
-    '../../third_party/aom/av1/encoder/dct.c',
-    '../../third_party/aom/av1/encoder/encodeframe.c',
-    '../../third_party/aom/av1/encoder/encodemb.c',
-    '../../third_party/aom/av1/encoder/encodemv.c',
-    '../../third_party/aom/av1/encoder/encoder.c',
-    '../../third_party/aom/av1/encoder/ethread.c',
-    '../../third_party/aom/av1/encoder/extend.c',
-    '../../third_party/aom/av1/encoder/firstpass.c',
-    '../../third_party/aom/av1/encoder/global_motion.c',
-    '../../third_party/aom/av1/encoder/hash.c',
-    '../../third_party/aom/av1/encoder/hybrid_fwd_txfm.c',
-    '../../third_party/aom/av1/encoder/lookahead.c',
-    '../../third_party/aom/av1/encoder/mbgraph.c',
-    '../../third_party/aom/av1/encoder/mcomp.c',
-    '../../third_party/aom/av1/encoder/palette.c',
-    '../../third_party/aom/av1/encoder/pickcdef.c',
-    '../../third_party/aom/av1/encoder/picklpf.c',
-    '../../third_party/aom/av1/encoder/pickrst.c',
-    '../../third_party/aom/av1/encoder/ransac.c',
-    '../../third_party/aom/av1/encoder/ratectrl.c',
-    '../../third_party/aom/av1/encoder/rd.c',
-    '../../third_party/aom/av1/encoder/rdopt.c',
-    '../../third_party/aom/av1/encoder/segmentation.c',
-    '../../third_party/aom/av1/encoder/speed_features.c',
-    '../../third_party/aom/av1/encoder/subexp.c',
-    '../../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/wedge_utils.c',
-],
+    '../../third_party/aom/av1/decoder/obu.c',
+  ],
 }