Issue #1937 - Follow-up: Add missing sources, and remove unneeded ones in sources.mozbuild

This should (hopefully) fix building for Windows.
The ones I removed are not used for decoding, but for encoding, which
 we don't need.

1 files changed, 17 insertions, 226 deletions

diff --git a/media/libaom/sources.mozbuild b/media/libaom/sources.mozbuild
index b64b665c1d..eade7ab9e6 100644
--- a/media/libaom/sources.mozbuild
+++ b/media/libaom/sources.mozbuild
@@ -14,28 +14,18 @@ files = {
     '/media/libaom/src/aom_dsp/arm/mem_neon.h',
     '/media/libaom/src/aom_dsp/arm/transpose_neon.h',
     '/media/libaom/src/aom_dsp/binary_codes_reader.h',
-    '/media/libaom/src/aom_dsp/binary_codes_writer.h',
     '/media/libaom/src/aom_dsp/bitreader.h',
     '/media/libaom/src/aom_dsp/bitreader_buffer.h',
     '/media/libaom/src/aom_dsp/bitwriter_buffer.h',
     '/media/libaom/src/aom_dsp/blend.h',
-    '/media/libaom/src/aom_dsp/butteraugli.h',
     '/media/libaom/src/aom_dsp/entcode.h',
     '/media/libaom/src/aom_dsp/entdec.h',
     '/media/libaom/src/aom_dsp/fft_common.h',
-    '/media/libaom/src/aom_dsp/grain_params.h',
-    '/media/libaom/src/aom_dsp/grain_table.h',
     '/media/libaom/src/aom_dsp/intrapred_common.h',
-    '/media/libaom/src/aom_dsp/mathutils.h',
     '/media/libaom/src/aom_dsp/odintrin.h',
     '/media/libaom/src/aom_dsp/prob.h',
-    '/media/libaom/src/aom_dsp/psnr.h',
-    '/media/libaom/src/aom_dsp/quantize.h',
     '/media/libaom/src/aom_dsp/recenter.h',
-    '/media/libaom/src/aom_dsp/ssim.h',
     '/media/libaom/src/aom_dsp/txfm_common.h',
-    '/media/libaom/src/aom_dsp/variance.h',
-    '/media/libaom/src/aom_dsp/vmaf.h',
     '/media/libaom/src/aom_mem/aom_mem.h',
     '/media/libaom/src/aom_ports/aom_timer.h',
     '/media/libaom/src/aom_ports/arm.h',
@@ -44,8 +34,10 @@ files = {
     '/media/libaom/src/aom_ports/sanitizer.h',
     '/media/libaom/src/aom_scale/aom_scale.h',
     '/media/libaom/src/aom_scale/yv12config.h',
+    '/media/libaom/src/av1/arg_defs.h',
     '/media/libaom/src/av1/common/cdef_block_simd.h',
     '/media/libaom/src/av1/decoder/grain_synthesis.h',
+    '/media/libaom/src/common/args_helper.h',
   ],
   'ARM_SOURCES': [
     '/media/libaom/src/aom/src/aom_codec.c',
@@ -55,46 +47,28 @@ files = {
     '/media/libaom/src/aom/src/aom_integer.c',
     '/media/libaom/src/aom_dsp/aom_convolve.c',
     '/media/libaom/src/aom_dsp/aom_dsp_rtcd.c',
-    '/media/libaom/src/aom_dsp/arm/aom_convolve_copy_neon.c'
+    '/media/libaom/src/aom_dsp/arm/aom_convolve_copy_neon.c',
     '/media/libaom/src/aom_dsp/arm/blend_a64_mask_neon.c',
     '/media/libaom/src/aom_dsp/arm/fwd_txfm_neon.c',
     '/media/libaom/src/aom_dsp/arm/highbd_intrapred_neon.c',
     '/media/libaom/src/aom_dsp/arm/highbd_loopfilter_neon.c',
-    '/media/libaom/src/aom_dsp/arm/highbd_quantize_neon.c',
-    '/media/libaom/src/aom_dsp/arm/highbd_variance_neon.c',
     '/media/libaom/src/aom_dsp/arm/intrapred_neon.c',
     '/media/libaom/src/aom_dsp/arm/loopfilter_neon.c',
     '/media/libaom/src/aom_dsp/arm/subtract_neon.c',
-    '/media/libaom/src/aom_dsp/arm/sum_squares_neon.c',
-    '/media/libaom/src/aom_dsp/avg.c',
     '/media/libaom/src/aom_dsp/binary_codes_reader.c',
-    '/media/libaom/src/aom_dsp/binary_codes_writer.c',
     '/media/libaom/src/aom_dsp/bitreader.c',
     '/media/libaom/src/aom_dsp/bitreader_buffer.c',
     '/media/libaom/src/aom_dsp/bitwriter_buffer.c',
     '/media/libaom/src/aom_dsp/blend_a64_hmask.c',
     '/media/libaom/src/aom_dsp/blend_a64_mask.c',
     '/media/libaom/src/aom_dsp/blend_a64_vmask.c',
-    '/media/libaom/src/aom_dsp/blk_sse_sum.c',
-    '/media/libaom/src/aom_dsp/butteraugli.c',
     '/media/libaom/src/aom_dsp/entcode.c',
     '/media/libaom/src/aom_dsp/entdec.c',
-    '/media/libaom/src/aom_dsp/fastssim.c',
     '/media/libaom/src/aom_dsp/fft.c',
-    '/media/libaom/src/aom_dsp/fwd_txfm.c',
-    '/media/libaom/src/aom_dsp/grain_table.c',
     '/media/libaom/src/aom_dsp/intrapred.c',
     '/media/libaom/src/aom_dsp/loopfilter.c',
     '/media/libaom/src/aom_dsp/odintrin.c',
-    '/media/libaom/src/aom_dsp/psnr.c',
-    '/media/libaom/src/aom_dsp/psnrhvs.c',
-    '/media/libaom/src/aom_dsp/quantize.c',
-    '/media/libaom/src/aom_dsp/sad.c',
-    '/media/libaom/src/aom_dsp/sad_av1.c',
-    '/media/libaom/src/aom_dsp/sse.c',
     '/media/libaom/src/aom_dsp/subtract.c',
-    '/media/libaom/src/aom_dsp/sum_squares.c',
-    '/media/libaom/src/aom_dsp/variance.c',
     '/media/libaom/src/aom_mem/aom_mem.c',
     '/media/libaom/src/aom_ports/arm_cpudetect.c',
     '/media/libaom/src/aom_scale/aom_scale_rtcd.c',
@@ -104,6 +78,7 @@ files = {
     '/media/libaom/src/aom_scale/generic/yv12extend.c',
     '/media/libaom/src/aom_util/aom_thread.c',
     '/media/libaom/src/aom_util/debug_util.c',
+    '/media/libaom/src/av1/arg_defs.c',
     '/media/libaom/src/av1/av1_dx_iface.c',
     '/media/libaom/src/av1/common/alloccommon.c',
     '/media/libaom/src/av1/common/arm/av1_inv_txfm_neon.c',
@@ -160,8 +135,7 @@ files = {
     '/media/libaom/src/av1/decoder/detokenize.c',
     '/media/libaom/src/av1/decoder/grain_synthesis.c',
     '/media/libaom/src/av1/decoder/obu.c',
-    '/media/libaom/src/av1/encoder/arm/neon/av1_error_neon.c',
-    '/media/libaom/src/av1/encoder/arm/neon/quantize_neon.c',
+    '/media/libaom/src/common/args_helper.c',
   ],
   'GENERIC_EXPORTS': [
     '/media/libaom/src/aom/aom.h',
@@ -176,28 +150,18 @@ files = {
     '/media/libaom/src/aom/aomdx.h',
     '/media/libaom/src/aom_dsp/aom_dsp_common.h',
     '/media/libaom/src/aom_dsp/binary_codes_reader.h',
-    '/media/libaom/src/aom_dsp/binary_codes_writer.h',
     '/media/libaom/src/aom_dsp/bitreader.h',
     '/media/libaom/src/aom_dsp/bitreader_buffer.h',
     '/media/libaom/src/aom_dsp/bitwriter_buffer.h',
     '/media/libaom/src/aom_dsp/blend.h',
-    '/media/libaom/src/aom_dsp/butteraugli.h',
     '/media/libaom/src/aom_dsp/entcode.h',
     '/media/libaom/src/aom_dsp/entdec.h',
     '/media/libaom/src/aom_dsp/fft_common.h',
-    '/media/libaom/src/aom_dsp/grain_params.h',
-    '/media/libaom/src/aom_dsp/grain_table.h',
     '/media/libaom/src/aom_dsp/intrapred_common.h',
-    '/media/libaom/src/aom_dsp/mathutils.h',
     '/media/libaom/src/aom_dsp/odintrin.h',
     '/media/libaom/src/aom_dsp/prob.h',
-    '/media/libaom/src/aom_dsp/psnr.h',
-    '/media/libaom/src/aom_dsp/quantize.h',
     '/media/libaom/src/aom_dsp/recenter.h',
-    '/media/libaom/src/aom_dsp/ssim.h',
     '/media/libaom/src/aom_dsp/txfm_common.h',
-    '/media/libaom/src/aom_dsp/variance.h',
-    '/media/libaom/src/aom_dsp/vmaf.h',
     '/media/libaom/src/aom_mem/aom_mem.h',
     '/media/libaom/src/aom_ports/aom_timer.h',
     '/media/libaom/src/aom_ports/bitops.h',
@@ -205,7 +169,9 @@ files = {
     '/media/libaom/src/aom_ports/sanitizer.h',
     '/media/libaom/src/aom_scale/aom_scale.h',
     '/media/libaom/src/aom_scale/yv12config.h',
+    '/media/libaom/src/av1/arg_defs.h',
     '/media/libaom/src/av1/decoder/grain_synthesis.h',
+    '/media/libaom/src/common/args_helper.h',
   ],
   'GENERIC_SOURCES': [
     '/media/libaom/src/aom/src/aom_codec.c',
@@ -215,34 +181,20 @@ files = {
     '/media/libaom/src/aom/src/aom_integer.c',
     '/media/libaom/src/aom_dsp/aom_convolve.c',
     '/media/libaom/src/aom_dsp/aom_dsp_rtcd.c',
-    '/media/libaom/src/aom_dsp/avg.c',
     '/media/libaom/src/aom_dsp/binary_codes_reader.c',
-    '/media/libaom/src/aom_dsp/binary_codes_writer.c',
     '/media/libaom/src/aom_dsp/bitreader.c',
     '/media/libaom/src/aom_dsp/bitreader_buffer.c',
     '/media/libaom/src/aom_dsp/bitwriter_buffer.c',
     '/media/libaom/src/aom_dsp/blend_a64_hmask.c',
     '/media/libaom/src/aom_dsp/blend_a64_mask.c',
     '/media/libaom/src/aom_dsp/blend_a64_vmask.c',
-    '/media/libaom/src/aom_dsp/blk_sse_sum.c',
     '/media/libaom/src/aom_dsp/entcode.c',
     '/media/libaom/src/aom_dsp/entdec.c',
-    '/media/libaom/src/aom_dsp/fastssim.c',
     '/media/libaom/src/aom_dsp/fft.c',
-    '/media/libaom/src/aom_dsp/fwd_txfm.c',
-    '/media/libaom/src/aom_dsp/grain_table.c',
     '/media/libaom/src/aom_dsp/intrapred.c',
     '/media/libaom/src/aom_dsp/loopfilter.c',
     '/media/libaom/src/aom_dsp/odintrin.c',
-    '/media/libaom/src/aom_dsp/psnr.c',
-    '/media/libaom/src/aom_dsp/psnrhvs.c',
-    '/media/libaom/src/aom_dsp/quantize.c',
-    '/media/libaom/src/aom_dsp/sad.c',
-    '/media/libaom/src/aom_dsp/sad_av1.c',
-    '/media/libaom/src/aom_dsp/sse.c',
     '/media/libaom/src/aom_dsp/subtract.c',
-    '/media/libaom/src/aom_dsp/sum_squares.c',
-    '/media/libaom/src/aom_dsp/variance.c',
     '/media/libaom/src/aom_mem/aom_mem.c',
     '/media/libaom/src/aom_scale/aom_scale_rtcd.c',
     '/media/libaom/src/aom_scale/generic/aom_scale.c',
@@ -251,6 +203,7 @@ files = {
     '/media/libaom/src/aom_scale/generic/yv12extend.c',
     '/media/libaom/src/aom_util/aom_thread.c',
     '/media/libaom/src/aom_util/debug_util.c',
+    '/media/libaom/src/av1/arg_defs.c',
     '/media/libaom/src/av1/av1_dx_iface.c',
     '/media/libaom/src/av1/common/alloccommon.c',
     '/media/libaom/src/av1/common/av1_inv_txfm1d.c',
@@ -292,6 +245,7 @@ files = {
     '/media/libaom/src/av1/decoder/detokenize.c',
     '/media/libaom/src/av1/decoder/grain_synthesis.c',
     '/media/libaom/src/av1/decoder/obu.c',
+    '/media/libaom/src/common/args_helper.c',
   ],
   'IA32_EXPORTS': [
     '/media/libaom/src/aom/aom.h',
@@ -309,30 +263,18 @@ files = {
     '/media/libaom/src/aom_dsp/aom_simd.h',
     '/media/libaom/src/aom_dsp/aom_simd_inline.h',
     '/media/libaom/src/aom_dsp/binary_codes_reader.h',
-    '/media/libaom/src/aom_dsp/binary_codes_writer.h',
     '/media/libaom/src/aom_dsp/bitreader.h',
     '/media/libaom/src/aom_dsp/bitreader_buffer.h',
     '/media/libaom/src/aom_dsp/bitwriter_buffer.h',
     '/media/libaom/src/aom_dsp/blend.h',
-    '/media/libaom/src/aom_dsp/butteraugli.h',
     '/media/libaom/src/aom_dsp/entcode.h',
     '/media/libaom/src/aom_dsp/entdec.h',
     '/media/libaom/src/aom_dsp/fft_common.h',
-    '/media/libaom/src/aom_dsp/grain_params.h',
-    '/media/libaom/src/aom_dsp/grain_table.h',
     '/media/libaom/src/aom_dsp/intrapred_common.h',
-    '/media/libaom/src/aom_dsp/mathutils.h',
     '/media/libaom/src/aom_dsp/odintrin.h',
     '/media/libaom/src/aom_dsp/prob.h',
-    '/media/libaom/src/aom_dsp/psnr.h',
-    '/media/libaom/src/aom_dsp/quantize.h',
     '/media/libaom/src/aom_dsp/recenter.h',
-    '/media/libaom/src/aom_dsp/ssim.h',
     '/media/libaom/src/aom_dsp/txfm_common.h',
-    '/media/libaom/src/aom_dsp/variance.h',
-    '/media/libaom/src/aom_dsp/vmaf.h',
-    '/media/libaom/src/aom_dsp/x86/bitdepth_conversion_avx2.h',
-    '/media/libaom/src/aom_dsp/x86/bitdepth_conversion_sse2.h',
     '/media/libaom/src/aom_dsp/x86/blend_mask_sse4.h',
     '/media/libaom/src/aom_dsp/x86/blend_sse4.h',
     '/media/libaom/src/aom_dsp/x86/common_avx2.h',
@@ -342,18 +284,10 @@ files = {
     '/media/libaom/src/aom_dsp/x86/convolve_sse2.h',
     '/media/libaom/src/aom_dsp/x86/convolve_sse4_1.h',
     '/media/libaom/src/aom_dsp/x86/convolve_ssse3.h',
-    '/media/libaom/src/aom_dsp/x86/fwd_txfm_impl_sse2.h',
-    '/media/libaom/src/aom_dsp/x86/fwd_txfm_sse2.h',
     '/media/libaom/src/aom_dsp/x86/intrapred_utils.h',
     '/media/libaom/src/aom_dsp/x86/intrapred_x86.h',
     '/media/libaom/src/aom_dsp/x86/lpf_common_sse2.h',
-    '/media/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.h',
-    '/media/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.h',
     '/media/libaom/src/aom_dsp/x86/mem_sse2.h',
-    '/media/libaom/src/aom_dsp/x86/obmc_intrinsic_sse4.h',
-    '/media/libaom/src/aom_dsp/x86/obmc_intrinsic_ssse3.h',
-    '/media/libaom/src/aom_dsp/x86/quantize_x86.h',
-    '/media/libaom/src/aom_dsp/x86/sum_squares_sse2.h',
     '/media/libaom/src/aom_dsp/x86/synonyms.h',
     '/media/libaom/src/aom_dsp/x86/synonyms_avx2.h',
     '/media/libaom/src/aom_dsp/x86/transpose_sse2.h',
@@ -367,8 +301,10 @@ files = {
     '/media/libaom/src/aom_ports/x86.h',
     '/media/libaom/src/aom_scale/aom_scale.h',
     '/media/libaom/src/aom_scale/yv12config.h',
+    '/media/libaom/src/av1/arg_defs.h',
     '/media/libaom/src/av1/common/cdef_block_simd.h',
     '/media/libaom/src/av1/decoder/grain_synthesis.h',
+    '/media/libaom/src/common/args_helper.h',
   ],
   'IA32_SOURCES': [
     '/media/libaom/src/aom/src/aom_codec.c',
@@ -378,42 +314,25 @@ files = {
     '/media/libaom/src/aom/src/aom_integer.c',
     '/media/libaom/src/aom_dsp/aom_convolve.c',
     '/media/libaom/src/aom_dsp/aom_dsp_rtcd.c',
-    '/media/libaom/src/aom_dsp/avg.c',
     '/media/libaom/src/aom_dsp/binary_codes_reader.c',
-    '/media/libaom/src/aom_dsp/binary_codes_writer.c',
     '/media/libaom/src/aom_dsp/bitreader.c',
     '/media/libaom/src/aom_dsp/bitreader_buffer.c',
     '/media/libaom/src/aom_dsp/bitwriter_buffer.c',
     '/media/libaom/src/aom_dsp/blend_a64_hmask.c',
     '/media/libaom/src/aom_dsp/blend_a64_mask.c',
     '/media/libaom/src/aom_dsp/blend_a64_vmask.c',
-    '/media/libaom/src/aom_dsp/blk_sse_sum.c',
     '/media/libaom/src/aom_dsp/entcode.c',
     '/media/libaom/src/aom_dsp/entdec.c',
-    '/media/libaom/src/aom_dsp/fastssim.c',
     '/media/libaom/src/aom_dsp/fft.c',
-    '/media/libaom/src/aom_dsp/fwd_txfm.c',
-    '/media/libaom/src/aom_dsp/grain_table.c',
     '/media/libaom/src/aom_dsp/intrapred.c',
     '/media/libaom/src/aom_dsp/loopfilter.c',
     '/media/libaom/src/aom_dsp/odintrin.c',
-    '/media/libaom/src/aom_dsp/psnr.c',
-    '/media/libaom/src/aom_dsp/psnrhvs.c',
-    '/media/libaom/src/aom_dsp/quantize.c',
-    '/media/libaom/src/aom_dsp/sad.c',
-    '/media/libaom/src/aom_dsp/sad_av1.c',
-    '/media/libaom/src/aom_dsp/sse.c',
     '/media/libaom/src/aom_dsp/subtract.c',
-    '/media/libaom/src/aom_dsp/sum_squares.c',
-    '/media/libaom/src/aom_dsp/variance.c',
-    '/media/libaom/src/aom_dsp/x86/adaptive_quantize_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/adaptive_quantize_sse2.c',
     '/media/libaom/src/aom_dsp/x86/aom_asm_stubs.c',
     '/media/libaom/src/aom_dsp/x86/aom_convolve_copy_avx2.c',
     '/media/libaom/src/aom_dsp/x86/aom_convolve_copy_sse2.c',
     '/media/libaom/src/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm',
     '/media/libaom/src/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/aom_quantize_avx.c',
     '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c',
     '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_sse2.c',
     '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c',
@@ -421,19 +340,12 @@ files = {
     '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_ssse3.asm',
     '/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm',
     '/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm',
-    '/media/libaom/src/aom_dsp/x86/avg_intrin_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/avg_intrin_sse2.c',
     '/media/libaom/src/aom_dsp/x86/blend_a64_hmask_sse4.c',
     '/media/libaom/src/aom_dsp/x86/blend_a64_mask_avx2.c',
     '/media/libaom/src/aom_dsp/x86/blend_a64_mask_sse4.c',
     '/media/libaom/src/aom_dsp/x86/blend_a64_vmask_sse4.c',
-    '/media/libaom/src/aom_dsp/x86/blk_sse_sum_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/blk_sse_sum_sse2.c',
     '/media/libaom/src/aom_dsp/x86/fft_avx2.c',
     '/media/libaom/src/aom_dsp/x86/fft_sse2.c',
-    '/media/libaom/src/aom_dsp/x86/fwd_txfm_sse2.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_adaptive_quantize_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_adaptive_quantize_sse2.c',
     '/media/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c',
     '/media/libaom/src/aom_dsp/x86/highbd_convolve_sse2.c',
     '/media/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c',
@@ -441,55 +353,15 @@ files = {
     '/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c',
     '/media/libaom/src/aom_dsp/x86/highbd_loopfilter_avx2.c',
     '/media/libaom/src/aom_dsp/x86/highbd_loopfilter_sse2.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_quantize_intrin_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_quantize_intrin_sse2.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_sad4d_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/highbd_sad_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_sad_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/highbd_subtract_sse2.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_variance_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_variance_impl_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/highbd_variance_sse2.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_variance_sse4.c',
     '/media/libaom/src/aom_dsp/x86/intrapred_asm_sse2.asm',
     '/media/libaom/src/aom_dsp/x86/intrapred_avx2.c',
     '/media/libaom/src/aom_dsp/x86/intrapred_sse2.c',
     '/media/libaom/src/aom_dsp/x86/intrapred_sse4.c',
     '/media/libaom/src/aom_dsp/x86/intrapred_ssse3.c',
     '/media/libaom/src/aom_dsp/x86/inv_wht_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/jnt_sad_ssse3.c',
-    '/media/libaom/src/aom_dsp/x86/jnt_variance_ssse3.c',
     '/media/libaom/src/aom_dsp/x86/loopfilter_avx2.c',
     '/media/libaom/src/aom_dsp/x86/loopfilter_sse2.c',
-    '/media/libaom/src/aom_dsp/x86/masked_sad4d_ssse3.c',
-    '/media/libaom/src/aom_dsp/x86/masked_sad_intrin_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.c',
-    '/media/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.c',
-    '/media/libaom/src/aom_dsp/x86/obmc_sad_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/obmc_sad_sse4.c',
-    '/media/libaom/src/aom_dsp/x86/obmc_variance_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/obmc_variance_sse4.c',
-    '/media/libaom/src/aom_dsp/x86/quantize_sse2.c',
-    '/media/libaom/src/aom_dsp/x86/quantize_ssse3.c',
-    '/media/libaom/src/aom_dsp/x86/sad4d_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/sad4d_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/sad_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/sad_impl_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/sad_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/sse_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/sse_sse4.c',
-    '/media/libaom/src/aom_dsp/x86/subpel_variance_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/subtract_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/subtract_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/sum_squares_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/sum_squares_sse2.c',
-    '/media/libaom/src/aom_dsp/x86/variance_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/variance_impl_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/variance_impl_ssse3.c',
-    '/media/libaom/src/aom_dsp/x86/variance_sse2.c',
     '/media/libaom/src/aom_mem/aom_mem.c',
-    '/media/libaom/src/aom_ports/x86_abi_support.asm',
     '/media/libaom/src/aom_scale/aom_scale_rtcd.c',
     '/media/libaom/src/aom_scale/generic/aom_scale.c',
     '/media/libaom/src/aom_scale/generic/gen_scalers.c',
@@ -497,6 +369,7 @@ files = {
     '/media/libaom/src/aom_scale/generic/yv12extend.c',
     '/media/libaom/src/aom_util/aom_thread.c',
     '/media/libaom/src/aom_util/debug_util.c',
+    '/media/libaom/src/av1/arg_defs.c',
     '/media/libaom/src/av1/av1_dx_iface.c',
     '/media/libaom/src/av1/common/alloccommon.c',
     '/media/libaom/src/av1/common/av1_inv_txfm1d.c',
@@ -581,6 +454,7 @@ files = {
     '/media/libaom/src/av1/decoder/detokenize.c',
     '/media/libaom/src/av1/decoder/grain_synthesis.c',
     '/media/libaom/src/av1/decoder/obu.c',
+    '/media/libaom/src/common/args_helper.c',
   ],
   'X64_EXPORTS': [
     '/media/libaom/src/aom/aom.h',
@@ -598,30 +472,18 @@ files = {
     '/media/libaom/src/aom_dsp/aom_simd.h',
     '/media/libaom/src/aom_dsp/aom_simd_inline.h',
     '/media/libaom/src/aom_dsp/binary_codes_reader.h',
-    '/media/libaom/src/aom_dsp/binary_codes_writer.h',
     '/media/libaom/src/aom_dsp/bitreader.h',
     '/media/libaom/src/aom_dsp/bitreader_buffer.h',
     '/media/libaom/src/aom_dsp/bitwriter_buffer.h',
     '/media/libaom/src/aom_dsp/blend.h',
-    '/media/libaom/src/aom_dsp/butteraugli.h',
     '/media/libaom/src/aom_dsp/entcode.h',
     '/media/libaom/src/aom_dsp/entdec.h',
     '/media/libaom/src/aom_dsp/fft_common.h',
-    '/media/libaom/src/aom_dsp/grain_params.h',
-    '/media/libaom/src/aom_dsp/grain_table.h',
     '/media/libaom/src/aom_dsp/intrapred_common.h',
-    '/media/libaom/src/aom_dsp/mathutils.h',
     '/media/libaom/src/aom_dsp/odintrin.h',
     '/media/libaom/src/aom_dsp/prob.h',
-    '/media/libaom/src/aom_dsp/psnr.h',
-    '/media/libaom/src/aom_dsp/quantize.h',
     '/media/libaom/src/aom_dsp/recenter.h',
-    '/media/libaom/src/aom_dsp/ssim.h',
     '/media/libaom/src/aom_dsp/txfm_common.h',
-    '/media/libaom/src/aom_dsp/variance.h',
-    '/media/libaom/src/aom_dsp/vmaf.h',
-    '/media/libaom/src/aom_dsp/x86/bitdepth_conversion_avx2.h',
-    '/media/libaom/src/aom_dsp/x86/bitdepth_conversion_sse2.h',
     '/media/libaom/src/aom_dsp/x86/blend_mask_sse4.h',
     '/media/libaom/src/aom_dsp/x86/blend_sse4.h',
     '/media/libaom/src/aom_dsp/x86/common_avx2.h',
@@ -631,18 +493,10 @@ files = {
     '/media/libaom/src/aom_dsp/x86/convolve_sse2.h',
     '/media/libaom/src/aom_dsp/x86/convolve_sse4_1.h',
     '/media/libaom/src/aom_dsp/x86/convolve_ssse3.h',
-    '/media/libaom/src/aom_dsp/x86/fwd_txfm_impl_sse2.h',
-    '/media/libaom/src/aom_dsp/x86/fwd_txfm_sse2.h',
     '/media/libaom/src/aom_dsp/x86/intrapred_utils.h',
     '/media/libaom/src/aom_dsp/x86/intrapred_x86.h',
     '/media/libaom/src/aom_dsp/x86/lpf_common_sse2.h',
-    '/media/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.h',
-    '/media/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.h',
     '/media/libaom/src/aom_dsp/x86/mem_sse2.h',
-    '/media/libaom/src/aom_dsp/x86/obmc_intrinsic_sse4.h',
-    '/media/libaom/src/aom_dsp/x86/obmc_intrinsic_ssse3.h',
-    '/media/libaom/src/aom_dsp/x86/quantize_x86.h',
-    '/media/libaom/src/aom_dsp/x86/sum_squares_sse2.h',
     '/media/libaom/src/aom_dsp/x86/synonyms.h',
     '/media/libaom/src/aom_dsp/x86/synonyms_avx2.h',
     '/media/libaom/src/aom_dsp/x86/transpose_sse2.h',
@@ -656,8 +510,10 @@ files = {
     '/media/libaom/src/aom_ports/x86.h',
     '/media/libaom/src/aom_scale/aom_scale.h',
     '/media/libaom/src/aom_scale/yv12config.h',
+    '/media/libaom/src/av1/arg_defs.h',
     '/media/libaom/src/av1/common/cdef_block_simd.h',
     '/media/libaom/src/av1/decoder/grain_synthesis.h',
+    '/media/libaom/src/common/args_helper.h',
   ],
   'X64_SOURCES': [
     '/media/libaom/src/aom/src/aom_codec.c',
@@ -667,42 +523,25 @@ files = {
     '/media/libaom/src/aom/src/aom_integer.c',
     '/media/libaom/src/aom_dsp/aom_convolve.c',
     '/media/libaom/src/aom_dsp/aom_dsp_rtcd.c',
-    '/media/libaom/src/aom_dsp/avg.c',
     '/media/libaom/src/aom_dsp/binary_codes_reader.c',
-    '/media/libaom/src/aom_dsp/binary_codes_writer.c',
     '/media/libaom/src/aom_dsp/bitreader.c',
     '/media/libaom/src/aom_dsp/bitreader_buffer.c',
     '/media/libaom/src/aom_dsp/bitwriter_buffer.c',
     '/media/libaom/src/aom_dsp/blend_a64_hmask.c',
     '/media/libaom/src/aom_dsp/blend_a64_mask.c',
     '/media/libaom/src/aom_dsp/blend_a64_vmask.c',
-    '/media/libaom/src/aom_dsp/blk_sse_sum.c',
     '/media/libaom/src/aom_dsp/entcode.c',
     '/media/libaom/src/aom_dsp/entdec.c',
-    '/media/libaom/src/aom_dsp/fastssim.c',
     '/media/libaom/src/aom_dsp/fft.c',
-    '/media/libaom/src/aom_dsp/fwd_txfm.c',
-    '/media/libaom/src/aom_dsp/grain_table.c',
     '/media/libaom/src/aom_dsp/intrapred.c',
     '/media/libaom/src/aom_dsp/loopfilter.c',
     '/media/libaom/src/aom_dsp/odintrin.c',
-    '/media/libaom/src/aom_dsp/psnr.c',
-    '/media/libaom/src/aom_dsp/psnrhvs.c',
-    '/media/libaom/src/aom_dsp/quantize.c',
-    '/media/libaom/src/aom_dsp/sad.c',
-    '/media/libaom/src/aom_dsp/sad_av1.c',
-    '/media/libaom/src/aom_dsp/sse.c',
     '/media/libaom/src/aom_dsp/subtract.c',
-    '/media/libaom/src/aom_dsp/sum_squares.c',
-    '/media/libaom/src/aom_dsp/variance.c',
-    '/media/libaom/src/aom_dsp/x86/adaptive_quantize_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/adaptive_quantize_sse2.c',
     '/media/libaom/src/aom_dsp/x86/aom_asm_stubs.c',
     '/media/libaom/src/aom_dsp/x86/aom_convolve_copy_avx2.c',
     '/media/libaom/src/aom_dsp/x86/aom_convolve_copy_sse2.c',
     '/media/libaom/src/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm',
     '/media/libaom/src/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/aom_quantize_avx.c',
     '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c',
     '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_sse2.c',
     '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c',
@@ -710,20 +549,12 @@ files = {
     '/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_ssse3.asm',
     '/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm',
     '/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm',
-    '/media/libaom/src/aom_dsp/x86/avg_intrin_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/avg_intrin_sse2.c',
     '/media/libaom/src/aom_dsp/x86/blend_a64_hmask_sse4.c',
     '/media/libaom/src/aom_dsp/x86/blend_a64_mask_avx2.c',
     '/media/libaom/src/aom_dsp/x86/blend_a64_mask_sse4.c',
     '/media/libaom/src/aom_dsp/x86/blend_a64_vmask_sse4.c',
-    '/media/libaom/src/aom_dsp/x86/blk_sse_sum_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/blk_sse_sum_sse2.c',
     '/media/libaom/src/aom_dsp/x86/fft_avx2.c',
     '/media/libaom/src/aom_dsp/x86/fft_sse2.c',
-    '/media/libaom/src/aom_dsp/x86/fwd_txfm_sse2.c',
-    '/media/libaom/src/aom_dsp/x86/fwd_txfm_ssse3_x86_64.asm',
-    '/media/libaom/src/aom_dsp/x86/highbd_adaptive_quantize_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_adaptive_quantize_sse2.c',
     '/media/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c',
     '/media/libaom/src/aom_dsp/x86/highbd_convolve_sse2.c',
     '/media/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c',
@@ -731,57 +562,15 @@ files = {
     '/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c',
     '/media/libaom/src/aom_dsp/x86/highbd_loopfilter_avx2.c',
     '/media/libaom/src/aom_dsp/x86/highbd_loopfilter_sse2.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_quantize_intrin_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_quantize_intrin_sse2.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_sad4d_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/highbd_sad_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_sad_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/highbd_subtract_sse2.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_variance_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_variance_impl_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/highbd_variance_sse2.c',
-    '/media/libaom/src/aom_dsp/x86/highbd_variance_sse4.c',
     '/media/libaom/src/aom_dsp/x86/intrapred_asm_sse2.asm',
     '/media/libaom/src/aom_dsp/x86/intrapred_avx2.c',
     '/media/libaom/src/aom_dsp/x86/intrapred_sse2.c',
     '/media/libaom/src/aom_dsp/x86/intrapred_sse4.c',
     '/media/libaom/src/aom_dsp/x86/intrapred_ssse3.c',
     '/media/libaom/src/aom_dsp/x86/inv_wht_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/jnt_sad_ssse3.c',
-    '/media/libaom/src/aom_dsp/x86/jnt_variance_ssse3.c',
     '/media/libaom/src/aom_dsp/x86/loopfilter_avx2.c',
     '/media/libaom/src/aom_dsp/x86/loopfilter_sse2.c',
-    '/media/libaom/src/aom_dsp/x86/masked_sad4d_ssse3.c',
-    '/media/libaom/src/aom_dsp/x86/masked_sad_intrin_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.c',
-    '/media/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.c',
-    '/media/libaom/src/aom_dsp/x86/obmc_sad_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/obmc_sad_sse4.c',
-    '/media/libaom/src/aom_dsp/x86/obmc_variance_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/obmc_variance_sse4.c',
-    '/media/libaom/src/aom_dsp/x86/quantize_sse2.c',
-    '/media/libaom/src/aom_dsp/x86/quantize_ssse3.c',
-    '/media/libaom/src/aom_dsp/x86/quantize_ssse3_x86_64.asm',
-    '/media/libaom/src/aom_dsp/x86/sad4d_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/sad4d_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/sad_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/sad_impl_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/sad_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/sse_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/sse_sse4.c',
-    '/media/libaom/src/aom_dsp/x86/ssim_sse2_x86_64.asm',
-    '/media/libaom/src/aom_dsp/x86/subpel_variance_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/subtract_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/subtract_sse2.asm',
-    '/media/libaom/src/aom_dsp/x86/sum_squares_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/sum_squares_sse2.c',
-    '/media/libaom/src/aom_dsp/x86/variance_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/variance_impl_avx2.c',
-    '/media/libaom/src/aom_dsp/x86/variance_impl_ssse3.c',
-    '/media/libaom/src/aom_dsp/x86/variance_sse2.c',
     '/media/libaom/src/aom_mem/aom_mem.c',
-    '/media/libaom/src/aom_ports/x86_abi_support.asm',
     '/media/libaom/src/aom_scale/aom_scale_rtcd.c',
     '/media/libaom/src/aom_scale/generic/aom_scale.c',
     '/media/libaom/src/aom_scale/generic/gen_scalers.c',
@@ -789,6 +578,7 @@ files = {
     '/media/libaom/src/aom_scale/generic/yv12extend.c',
     '/media/libaom/src/aom_util/aom_thread.c',
     '/media/libaom/src/aom_util/debug_util.c',
+    '/media/libaom/src/av1/arg_defs.c',
     '/media/libaom/src/av1/av1_dx_iface.c',
     '/media/libaom/src/av1/common/alloccommon.c',
     '/media/libaom/src/av1/common/av1_inv_txfm1d.c',
@@ -873,5 +663,6 @@ files = {
     '/media/libaom/src/av1/decoder/detokenize.c',
     '/media/libaom/src/av1/decoder/grain_synthesis.c',
     '/media/libaom/src/av1/decoder/obu.c',
+    '/media/libaom/src/common/args_helper.c',
   ],
 }