Enable multi-res encoding feature in libvpx.

BUG=

Review URL: https://webrtc-codereview.appspot.com/761005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2697 4adac7df-926f-26a2-2b94-8c16560cd09d

28 files changed, 109 insertions, 101 deletions

diff --git a/third_party/libvpx/libvpx_srcs_arm.gypi b/third_party/libvpx/libvpx_srcs_arm.gypi
index d9ea829110..3fc2c41c91 100644
--- a/third_party/libvpx/libvpx_srcs_arm.gypi
+++ b/third_party/libvpx/libvpx_srcs_arm.gypi
@@ -37,16 +37,16 @@
     'source/libvpx/vp8/common/idctllm.c',
     'source/libvpx/vp8/common/invtrans.h',
     'source/libvpx/vp8/common/loopfilter.c',
-    'source/libvpx/vp8/common/loopfilter.h',
     'source/libvpx/vp8/common/loopfilter_filters.c',
+    'source/libvpx/vp8/common/loopfilter.h',
     'source/libvpx/vp8/common/mbpitch.c',
     'source/libvpx/vp8/common/mfqe.c',
     'source/libvpx/vp8/common/modecont.c',
     'source/libvpx/vp8/common/modecont.h',
     'source/libvpx/vp8/common/mv.h',
-    'source/libvpx/vp8/common/onyx.h',
     'source/libvpx/vp8/common/onyxc_int.h',
     'source/libvpx/vp8/common/onyxd.h',
+    'source/libvpx/vp8/common/onyx.h',
     'source/libvpx/vp8/common/postproc.c',
     'source/libvpx/vp8/common/postproc.h',
     'source/libvpx/vp8/common/ppflags.h',
@@ -55,9 +55,9 @@
     'source/libvpx/vp8/common/quant_common.h',
     'source/libvpx/vp8/common/reconinter.c',
     'source/libvpx/vp8/common/reconinter.h',
-    'source/libvpx/vp8/common/reconintra.c',
     'source/libvpx/vp8/common/reconintra4x4.c',
     'source/libvpx/vp8/common/reconintra4x4.h',
+    'source/libvpx/vp8/common/reconintra.c',
     'source/libvpx/vp8/common/rtcd.c',
     'source/libvpx/vp8/common/sad_c.c',
     'source/libvpx/vp8/common/setupintrarecon.c',
@@ -68,8 +68,8 @@
     'source/libvpx/vp8/common/threading.h',
     'source/libvpx/vp8/common/treecoder.c',
     'source/libvpx/vp8/common/treecoder.h',
-    'source/libvpx/vp8/common/variance.h',
     'source/libvpx/vp8/common/variance_c.c',
+    'source/libvpx/vp8/common/variance.h',
     'source/libvpx/vp8/common/vp8_entropymodedata.h',
     'source/libvpx/vp8/decoder/dboolhuff.c',
     'source/libvpx/vp8/decoder/dboolhuff.h',
@@ -119,6 +119,8 @@
     'source/libvpx/vp8/encoder/mcomp.h',
     'source/libvpx/vp8/encoder/modecosts.c',
     'source/libvpx/vp8/encoder/modecosts.h',
+    'source/libvpx/vp8/encoder/mr_dissim.c',
+    'source/libvpx/vp8/encoder/mr_dissim.h',
     'source/libvpx/vp8/encoder/onyx_if.c',
     'source/libvpx/vp8/encoder/onyx_int.h',
     'source/libvpx/vp8/encoder/pickinter.c',
@@ -141,25 +143,11 @@
     'source/libvpx/vp8/vp8_cx_iface.c',
     'source/libvpx/vp8/vp8_dx_iface.c',
     'source/libvpx/vpx/internal/vpx_codec_internal.h',
-    'source/libvpx/vpx/src/vpx_codec.c',
-    'source/libvpx/vpx/src/vpx_decoder.c',
-    'source/libvpx/vpx/src/vpx_encoder.c',
-    'source/libvpx/vpx/src/vpx_image.c',
-    'source/libvpx/vpx/vp8.h',
-    'source/libvpx/vpx/vp8cx.h',
-    'source/libvpx/vpx/vp8dx.h',
-    'source/libvpx/vpx/vpx_codec.h',
-    'source/libvpx/vpx/vpx_codec_impl_bottom.h',
-    'source/libvpx/vpx/vpx_codec_impl_top.h',
-    'source/libvpx/vpx/vpx_decoder.h',
-    'source/libvpx/vpx/vpx_encoder.h',
-    'source/libvpx/vpx/vpx_image.h',
-    'source/libvpx/vpx/vpx_integer.h',
     'source/libvpx/vpx_mem/include/vpx_mem_intrnl.h',
     'source/libvpx/vpx_mem/vpx_mem.c',
     'source/libvpx/vpx_mem/vpx_mem.h',
-    'source/libvpx/vpx_ports/arm.h',
     'source/libvpx/vpx_ports/arm_cpudetect.c',
+    'source/libvpx/vpx_ports/arm.h',
     'source/libvpx/vpx_ports/asm_offsets.h',
     'source/libvpx/vpx_ports/mem.h',
     'source/libvpx/vpx_ports/vpx_timer.h',
@@ -171,5 +159,19 @@
     'source/libvpx/vpx_scale/scale_mode.h',
     'source/libvpx/vpx_scale/vpxscale.h',
     'source/libvpx/vpx_scale/yv12config.h',
+    'source/libvpx/vpx/src/vpx_codec.c',
+    'source/libvpx/vpx/src/vpx_decoder.c',
+    'source/libvpx/vpx/src/vpx_encoder.c',
+    'source/libvpx/vpx/src/vpx_image.c',
+    'source/libvpx/vpx/vp8cx.h',
+    'source/libvpx/vpx/vp8dx.h',
+    'source/libvpx/vpx/vp8.h',
+    'source/libvpx/vpx/vpx_codec.h',
+    'source/libvpx/vpx/vpx_codec_impl_bottom.h',
+    'source/libvpx/vpx/vpx_codec_impl_top.h',
+    'source/libvpx/vpx/vpx_decoder.h',
+    'source/libvpx/vpx/vpx_encoder.h',
+    'source/libvpx/vpx/vpx_image.h',
+    'source/libvpx/vpx/vpx_integer.h',
   ],
 }
diff --git a/third_party/libvpx/libvpx_srcs_arm_neon.gypi b/third_party/libvpx/libvpx_srcs_arm_neon.gypi
index d6e857b238..1d5174f58b 100644
--- a/third_party/libvpx/libvpx_srcs_arm_neon.gypi
+++ b/third_party/libvpx/libvpx_srcs_arm_neon.gypi
@@ -91,16 +91,16 @@
     'source/libvpx/vp8/common/idctllm.c',
     'source/libvpx/vp8/common/invtrans.h',
     'source/libvpx/vp8/common/loopfilter.c',
-    'source/libvpx/vp8/common/loopfilter.h',
     'source/libvpx/vp8/common/loopfilter_filters.c',
+    'source/libvpx/vp8/common/loopfilter.h',
     'source/libvpx/vp8/common/mbpitch.c',
     'source/libvpx/vp8/common/mfqe.c',
     'source/libvpx/vp8/common/modecont.c',
     'source/libvpx/vp8/common/modecont.h',
     'source/libvpx/vp8/common/mv.h',
-    'source/libvpx/vp8/common/onyx.h',
     'source/libvpx/vp8/common/onyxc_int.h',
     'source/libvpx/vp8/common/onyxd.h',
+    'source/libvpx/vp8/common/onyx.h',
     'source/libvpx/vp8/common/postproc.c',
     'source/libvpx/vp8/common/postproc.h',
     'source/libvpx/vp8/common/ppflags.h',
@@ -109,9 +109,9 @@
     'source/libvpx/vp8/common/quant_common.h',
     'source/libvpx/vp8/common/reconinter.c',
     'source/libvpx/vp8/common/reconinter.h',
-    'source/libvpx/vp8/common/reconintra.c',
     'source/libvpx/vp8/common/reconintra4x4.c',
     'source/libvpx/vp8/common/reconintra4x4.h',
+    'source/libvpx/vp8/common/reconintra.c',
     'source/libvpx/vp8/common/rtcd.c',
     'source/libvpx/vp8/common/sad_c.c',
     'source/libvpx/vp8/common/setupintrarecon.c',
@@ -122,8 +122,8 @@
     'source/libvpx/vp8/common/threading.h',
     'source/libvpx/vp8/common/treecoder.c',
     'source/libvpx/vp8/common/treecoder.h',
-    'source/libvpx/vp8/common/variance.h',
     'source/libvpx/vp8/common/variance_c.c',
+    'source/libvpx/vp8/common/variance.h',
     'source/libvpx/vp8/common/vp8_entropymodedata.h',
     'source/libvpx/vp8/decoder/dboolhuff.c',
     'source/libvpx/vp8/decoder/dboolhuff.h',
@@ -185,6 +185,8 @@
     'source/libvpx/vp8/encoder/mcomp.h',
     'source/libvpx/vp8/encoder/modecosts.c',
     'source/libvpx/vp8/encoder/modecosts.h',
+    'source/libvpx/vp8/encoder/mr_dissim.c',
+    'source/libvpx/vp8/encoder/mr_dissim.h',
     'source/libvpx/vp8/encoder/onyx_if.c',
     'source/libvpx/vp8/encoder/onyx_int.h',
     'source/libvpx/vp8/encoder/pickinter.c',
@@ -207,31 +209,17 @@
     'source/libvpx/vp8/vp8_cx_iface.c',
     'source/libvpx/vp8/vp8_dx_iface.c',
     'source/libvpx/vpx/internal/vpx_codec_internal.h',
-    'source/libvpx/vpx/src/vpx_codec.c',
-    'source/libvpx/vpx/src/vpx_decoder.c',
-    'source/libvpx/vpx/src/vpx_encoder.c',
-    'source/libvpx/vpx/src/vpx_image.c',
-    'source/libvpx/vpx/vp8.h',
-    'source/libvpx/vpx/vp8cx.h',
-    'source/libvpx/vpx/vp8dx.h',
-    'source/libvpx/vpx/vpx_codec.h',
-    'source/libvpx/vpx/vpx_codec_impl_bottom.h',
-    'source/libvpx/vpx/vpx_codec_impl_top.h',
-    'source/libvpx/vpx/vpx_decoder.h',
-    'source/libvpx/vpx/vpx_encoder.h',
-    'source/libvpx/vpx/vpx_image.h',
-    'source/libvpx/vpx/vpx_integer.h',
     'source/libvpx/vpx_mem/include/vpx_mem_intrnl.h',
     'source/libvpx/vpx_mem/vpx_mem.c',
     'source/libvpx/vpx_mem/vpx_mem.h',
-    'source/libvpx/vpx_ports/arm.h',
     'source/libvpx/vpx_ports/arm_cpudetect.c',
+    'source/libvpx/vpx_ports/arm.h',
     'source/libvpx/vpx_ports/asm_offsets.h',
     'source/libvpx/vpx_ports/mem.h',
     'source/libvpx/vpx_ports/vpx_timer.h',
-    'source/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copy_y_neon.asm',
     'source/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon.asm',
     'source/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copysrcframe_func_neon.asm',
+    'source/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copy_y_neon.asm',
     'source/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon.asm',
     'source/libvpx/vpx_scale/arm/neon/yv12extend_arm.c',
     'source/libvpx/vpx_scale/generic/gen_scalers.c',
@@ -242,5 +230,19 @@
     'source/libvpx/vpx_scale/scale_mode.h',
     'source/libvpx/vpx_scale/vpxscale.h',
     'source/libvpx/vpx_scale/yv12config.h',
+    'source/libvpx/vpx/src/vpx_codec.c',
+    'source/libvpx/vpx/src/vpx_decoder.c',
+    'source/libvpx/vpx/src/vpx_encoder.c',
+    'source/libvpx/vpx/src/vpx_image.c',
+    'source/libvpx/vpx/vp8cx.h',
+    'source/libvpx/vpx/vp8dx.h',
+    'source/libvpx/vpx/vp8.h',
+    'source/libvpx/vpx/vpx_codec.h',
+    'source/libvpx/vpx/vpx_codec_impl_bottom.h',
+    'source/libvpx/vpx/vpx_codec_impl_top.h',
+    'source/libvpx/vpx/vpx_decoder.h',
+    'source/libvpx/vpx/vpx_encoder.h',
+    'source/libvpx/vpx/vpx_image.h',
+    'source/libvpx/vpx/vpx_integer.h',
   ],
 }
diff --git a/third_party/libvpx/libvpx_srcs_x86.gypi b/third_party/libvpx/libvpx_srcs_x86.gypi
index ca28fda336..f4737f4230 100644
--- a/third_party/libvpx/libvpx_srcs_x86.gypi
+++ b/third_party/libvpx/libvpx_srcs_x86.gypi
@@ -32,16 +32,16 @@
     'source/libvpx/vp8/common/idctllm.c',
     'source/libvpx/vp8/common/invtrans.h',
     'source/libvpx/vp8/common/loopfilter.c',
-    'source/libvpx/vp8/common/loopfilter.h',
     'source/libvpx/vp8/common/loopfilter_filters.c',
+    'source/libvpx/vp8/common/loopfilter.h',
     'source/libvpx/vp8/common/mbpitch.c',
     'source/libvpx/vp8/common/mfqe.c',
     'source/libvpx/vp8/common/modecont.c',
     'source/libvpx/vp8/common/modecont.h',
     'source/libvpx/vp8/common/mv.h',
-    'source/libvpx/vp8/common/onyx.h',
     'source/libvpx/vp8/common/onyxc_int.h',
     'source/libvpx/vp8/common/onyxd.h',
+    'source/libvpx/vp8/common/onyx.h',
     'source/libvpx/vp8/common/postproc.c',
     'source/libvpx/vp8/common/postproc.h',
     'source/libvpx/vp8/common/ppflags.h',
@@ -50,9 +50,9 @@
     'source/libvpx/vp8/common/quant_common.h',
     'source/libvpx/vp8/common/reconinter.c',
     'source/libvpx/vp8/common/reconinter.h',
-    'source/libvpx/vp8/common/reconintra.c',
     'source/libvpx/vp8/common/reconintra4x4.c',
     'source/libvpx/vp8/common/reconintra4x4.h',
+    'source/libvpx/vp8/common/reconintra.c',
     'source/libvpx/vp8/common/rtcd.c',
     'source/libvpx/vp8/common/sad_c.c',
     'source/libvpx/vp8/common/setupintrarecon.c',
@@ -63,8 +63,8 @@
     'source/libvpx/vp8/common/threading.h',
     'source/libvpx/vp8/common/treecoder.c',
     'source/libvpx/vp8/common/treecoder.h',
-    'source/libvpx/vp8/common/variance.h',
     'source/libvpx/vp8/common/variance_c.c',
+    'source/libvpx/vp8/common/variance.h',
     'source/libvpx/vp8/common/vp8_entropymodedata.h',
     'source/libvpx/vp8/common/x86/dequantize_mmx.asm',
     'source/libvpx/vp8/common/x86/filter_x86.c',
@@ -142,6 +142,8 @@
     'source/libvpx/vp8/encoder/mcomp.h',
     'source/libvpx/vp8/encoder/modecosts.c',
     'source/libvpx/vp8/encoder/modecosts.h',
+    'source/libvpx/vp8/encoder/mr_dissim.c',
+    'source/libvpx/vp8/encoder/mr_dissim.h',
     'source/libvpx/vp8/encoder/onyx_if.c',
     'source/libvpx/vp8/encoder/onyx_int.h',
     'source/libvpx/vp8/encoder/pickinter.c',
@@ -178,20 +180,6 @@
     'source/libvpx/vp8/vp8_cx_iface.c',
     'source/libvpx/vp8/vp8_dx_iface.c',
     'source/libvpx/vpx/internal/vpx_codec_internal.h',
-    'source/libvpx/vpx/src/vpx_codec.c',
-    'source/libvpx/vpx/src/vpx_decoder.c',
-    'source/libvpx/vpx/src/vpx_encoder.c',
-    'source/libvpx/vpx/src/vpx_image.c',
-    'source/libvpx/vpx/vp8.h',
-    'source/libvpx/vpx/vp8cx.h',
-    'source/libvpx/vpx/vp8dx.h',
-    'source/libvpx/vpx/vpx_codec.h',
-    'source/libvpx/vpx/vpx_codec_impl_bottom.h',
-    'source/libvpx/vpx/vpx_codec_impl_top.h',
-    'source/libvpx/vpx/vpx_decoder.h',
-    'source/libvpx/vpx/vpx_encoder.h',
-    'source/libvpx/vpx/vpx_image.h',
-    'source/libvpx/vpx/vpx_integer.h',
     'source/libvpx/vpx_mem/include/vpx_mem_intrnl.h',
     'source/libvpx/vpx_mem/vpx_mem.c',
     'source/libvpx/vpx_mem/vpx_mem.h',
@@ -199,9 +187,9 @@
     'source/libvpx/vpx_ports/emms.asm',
     'source/libvpx/vpx_ports/mem.h',
     'source/libvpx/vpx_ports/vpx_timer.h',
-    'source/libvpx/vpx_ports/x86.h',
     'source/libvpx/vpx_ports/x86_abi_support.asm',
     'source/libvpx/vpx_ports/x86_cpuid.c',
+    'source/libvpx/vpx_ports/x86.h',
     'source/libvpx/vpx_scale/generic/gen_scalers.c',
     'source/libvpx/vpx_scale/generic/vpxscale.c',
     'source/libvpx/vpx_scale/generic/yv12config.c',
@@ -210,5 +198,19 @@
     'source/libvpx/vpx_scale/scale_mode.h',
     'source/libvpx/vpx_scale/vpxscale.h',
     'source/libvpx/vpx_scale/yv12config.h',
+    'source/libvpx/vpx/src/vpx_codec.c',
+    'source/libvpx/vpx/src/vpx_decoder.c',
+    'source/libvpx/vpx/src/vpx_encoder.c',
+    'source/libvpx/vpx/src/vpx_image.c',
+    'source/libvpx/vpx/vp8cx.h',
+    'source/libvpx/vpx/vp8dx.h',
+    'source/libvpx/vpx/vp8.h',
+    'source/libvpx/vpx/vpx_codec.h',
+    'source/libvpx/vpx/vpx_codec_impl_bottom.h',
+    'source/libvpx/vpx/vpx_codec_impl_top.h',
+    'source/libvpx/vpx/vpx_decoder.h',
+    'source/libvpx/vpx/vpx_encoder.h',
+    'source/libvpx/vpx/vpx_image.h',
+    'source/libvpx/vpx/vpx_integer.h',
   ],
 }
diff --git a/third_party/libvpx/libvpx_srcs_x86_64.gypi b/third_party/libvpx/libvpx_srcs_x86_64.gypi
index c8f09a9174..70b4a8dea9 100644
--- a/third_party/libvpx/libvpx_srcs_x86_64.gypi
+++ b/third_party/libvpx/libvpx_srcs_x86_64.gypi
@@ -32,16 +32,16 @@
     'source/libvpx/vp8/common/idctllm.c',
     'source/libvpx/vp8/common/invtrans.h',
     'source/libvpx/vp8/common/loopfilter.c',
-    'source/libvpx/vp8/common/loopfilter.h',
     'source/libvpx/vp8/common/loopfilter_filters.c',
+    'source/libvpx/vp8/common/loopfilter.h',
     'source/libvpx/vp8/common/mbpitch.c',
     'source/libvpx/vp8/common/mfqe.c',
     'source/libvpx/vp8/common/modecont.c',
     'source/libvpx/vp8/common/modecont.h',
     'source/libvpx/vp8/common/mv.h',
-    'source/libvpx/vp8/common/onyx.h',
     'source/libvpx/vp8/common/onyxc_int.h',
     'source/libvpx/vp8/common/onyxd.h',
+    'source/libvpx/vp8/common/onyx.h',
     'source/libvpx/vp8/common/postproc.c',
     'source/libvpx/vp8/common/postproc.h',
     'source/libvpx/vp8/common/ppflags.h',
@@ -50,9 +50,9 @@
     'source/libvpx/vp8/common/quant_common.h',
     'source/libvpx/vp8/common/reconinter.c',
     'source/libvpx/vp8/common/reconinter.h',
-    'source/libvpx/vp8/common/reconintra.c',
     'source/libvpx/vp8/common/reconintra4x4.c',
     'source/libvpx/vp8/common/reconintra4x4.h',
+    'source/libvpx/vp8/common/reconintra.c',
     'source/libvpx/vp8/common/rtcd.c',
     'source/libvpx/vp8/common/sad_c.c',
     'source/libvpx/vp8/common/setupintrarecon.c',
@@ -63,8 +63,8 @@
     'source/libvpx/vp8/common/threading.h',
     'source/libvpx/vp8/common/treecoder.c',
     'source/libvpx/vp8/common/treecoder.h',
-    'source/libvpx/vp8/common/variance.h',
     'source/libvpx/vp8/common/variance_c.c',
+    'source/libvpx/vp8/common/variance.h',
     'source/libvpx/vp8/common/vp8_entropymodedata.h',
     'source/libvpx/vp8/common/x86/dequantize_mmx.asm',
     'source/libvpx/vp8/common/x86/filter_x86.c',
@@ -143,6 +143,8 @@
     'source/libvpx/vp8/encoder/mcomp.h',
     'source/libvpx/vp8/encoder/modecosts.c',
     'source/libvpx/vp8/encoder/modecosts.h',
+    'source/libvpx/vp8/encoder/mr_dissim.c',
+    'source/libvpx/vp8/encoder/mr_dissim.h',
     'source/libvpx/vp8/encoder/onyx_if.c',
     'source/libvpx/vp8/encoder/onyx_int.h',
     'source/libvpx/vp8/encoder/pickinter.c',
@@ -180,20 +182,6 @@
     'source/libvpx/vp8/vp8_cx_iface.c',
     'source/libvpx/vp8/vp8_dx_iface.c',
     'source/libvpx/vpx/internal/vpx_codec_internal.h',
-    'source/libvpx/vpx/src/vpx_codec.c',
-    'source/libvpx/vpx/src/vpx_decoder.c',
-    'source/libvpx/vpx/src/vpx_encoder.c',
-    'source/libvpx/vpx/src/vpx_image.c',
-    'source/libvpx/vpx/vp8.h',
-    'source/libvpx/vpx/vp8cx.h',
-    'source/libvpx/vpx/vp8dx.h',
-    'source/libvpx/vpx/vpx_codec.h',
-    'source/libvpx/vpx/vpx_codec_impl_bottom.h',
-    'source/libvpx/vpx/vpx_codec_impl_top.h',
-    'source/libvpx/vpx/vpx_decoder.h',
-    'source/libvpx/vpx/vpx_encoder.h',
-    'source/libvpx/vpx/vpx_image.h',
-    'source/libvpx/vpx/vpx_integer.h',
     'source/libvpx/vpx_mem/include/vpx_mem_intrnl.h',
     'source/libvpx/vpx_mem/vpx_mem.c',
     'source/libvpx/vpx_mem/vpx_mem.h',
@@ -201,9 +189,9 @@
     'source/libvpx/vpx_ports/emms.asm',
     'source/libvpx/vpx_ports/mem.h',
     'source/libvpx/vpx_ports/vpx_timer.h',
-    'source/libvpx/vpx_ports/x86.h',
     'source/libvpx/vpx_ports/x86_abi_support.asm',
     'source/libvpx/vpx_ports/x86_cpuid.c',
+    'source/libvpx/vpx_ports/x86.h',
     'source/libvpx/vpx_scale/generic/gen_scalers.c',
     'source/libvpx/vpx_scale/generic/vpxscale.c',
     'source/libvpx/vpx_scale/generic/yv12config.c',
@@ -212,5 +200,19 @@
     'source/libvpx/vpx_scale/scale_mode.h',
     'source/libvpx/vpx_scale/vpxscale.h',
     'source/libvpx/vpx_scale/yv12config.h',
+    'source/libvpx/vpx/src/vpx_codec.c',
+    'source/libvpx/vpx/src/vpx_decoder.c',
+    'source/libvpx/vpx/src/vpx_encoder.c',
+    'source/libvpx/vpx/src/vpx_image.c',
+    'source/libvpx/vpx/vp8cx.h',
+    'source/libvpx/vpx/vp8dx.h',
+    'source/libvpx/vpx/vp8.h',
+    'source/libvpx/vpx/vpx_codec.h',
+    'source/libvpx/vpx/vpx_codec_impl_bottom.h',
+    'source/libvpx/vpx/vpx_codec_impl_top.h',
+    'source/libvpx/vpx/vpx_decoder.h',
+    'source/libvpx/vpx/vpx_encoder.h',
+    'source/libvpx/vpx/vpx_image.h',
+    'source/libvpx/vpx/vpx_integer.h',
   ],
 }
diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm
index e4c3d2d173..8ba484e42b 100644
--- a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm
+++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm
@@ -69,7 +69,7 @@
 .equ CONFIG_POSTPROC_VISUALIZER ,  0
 .equ CONFIG_OS_SUPPORT ,  1
 .equ CONFIG_UNIT_TESTS ,  0
-.equ CONFIG_MULTI_RES_ENCODING ,  0
+.equ CONFIG_MULTI_RES_ENCODING ,  1
 .equ CONFIG_TEMPORAL_DENOISING ,  1
 	.section	.note.GNU-stack,"",%progbits
 @ This file was created from a .asm file
diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.c b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.c
index 5fc126a1a5..b7b3d11dc6 100644
--- a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.c
+++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.c
@@ -5,5 +5,5 @@
 /* tree. An additional intellectual property rights grant can be found */
 /* in the file PATENTS.  All contributing project authors may */
 /* be found in the AUTHORS file in the root of the source tree. */
-static const char* const cfg = "--sdk-path=$ANDROID_NDK_ROOT --target=armv7-android-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-postproc --disable-runtime-cpu-detect";
+static const char* const cfg = "--sdk-path=$ANDROID_NDK_ROOT --target=armv7-android-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-postproc --disable-runtime-cpu-detect --enable-multi-res-encoding";
 const char *vpx_codec_build_config(void) {return cfg;}
diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h
index 4ba648f742..5e7b3456f2 100644
--- a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h
+++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h
@@ -77,6 +77,6 @@
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_UNIT_TESTS 0
-#define CONFIG_MULTI_RES_ENCODING 0
+#define CONFIG_MULTI_RES_ENCODING 1
 #define CONFIG_TEMPORAL_DENOISING 1
 #endif /* VPX_CONFIG_H */
diff --git a/third_party/libvpx/source/config/linux/arm/vpx_config.asm b/third_party/libvpx/source/config/linux/arm/vpx_config.asm
index b44c7b4f38..cb75d90629 100644
--- a/third_party/libvpx/source/config/linux/arm/vpx_config.asm
+++ b/third_party/libvpx/source/config/linux/arm/vpx_config.asm
@@ -69,7 +69,7 @@
 .equ CONFIG_POSTPROC_VISUALIZER ,  0
 .equ CONFIG_OS_SUPPORT ,  1
 .equ CONFIG_UNIT_TESTS ,  0
-.equ CONFIG_MULTI_RES_ENCODING ,  0
+.equ CONFIG_MULTI_RES_ENCODING ,  1
 .equ CONFIG_TEMPORAL_DENOISING ,  1
 	.section	.note.GNU-stack,"",%progbits
 @ This file was created from a .asm file
diff --git a/third_party/libvpx/source/config/linux/arm/vpx_config.c b/third_party/libvpx/source/config/linux/arm/vpx_config.c
index f52d3c9c6f..a45bce6004 100644
--- a/third_party/libvpx/source/config/linux/arm/vpx_config.c
+++ b/third_party/libvpx/source/config/linux/arm/vpx_config.c
@@ -5,5 +5,5 @@
 /* tree. An additional intellectual property rights grant can be found */
 /* in the file PATENTS.  All contributing project authors may */
 /* be found in the AUTHORS file in the root of the source tree. */
-static const char* const cfg = "--sdk-path=$ANDROID_NDK_ROOT --target=armv5te-android-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-postproc";
+static const char* const cfg = "--sdk-path=$ANDROID_NDK_ROOT --target=armv5te-android-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-postproc --enable-multi-res-encoding";
 const char *vpx_codec_build_config(void) {return cfg;}
diff --git a/third_party/libvpx/source/config/linux/arm/vpx_config.h b/third_party/libvpx/source/config/linux/arm/vpx_config.h
index 9543eb0d2e..aa06b427c3 100644
--- a/third_party/libvpx/source/config/linux/arm/vpx_config.h
+++ b/third_party/libvpx/source/config/linux/arm/vpx_config.h
@@ -77,6 +77,6 @@
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_UNIT_TESTS 0
-#define CONFIG_MULTI_RES_ENCODING 0
+#define CONFIG_MULTI_RES_ENCODING 1
 #define CONFIG_TEMPORAL_DENOISING 1
 #endif /* VPX_CONFIG_H */
diff --git a/third_party/libvpx/source/config/linux/ia32/vpx_config.asm b/third_party/libvpx/source/config/linux/ia32/vpx_config.asm
index a59bf69fb3..6c39f37bba 100644
--- a/third_party/libvpx/source/config/linux/ia32/vpx_config.asm
+++ b/third_party/libvpx/source/config/linux/ia32/vpx_config.asm
@@ -63,5 +63,5 @@ CONFIG_SMALL equ 0
 CONFIG_POSTPROC_VISUALIZER equ 0
 CONFIG_OS_SUPPORT equ 1
 CONFIG_UNIT_TESTS equ 0
-CONFIG_MULTI_RES_ENCODING equ 0
+CONFIG_MULTI_RES_ENCODING equ 1
 CONFIG_TEMPORAL_DENOISING equ 1
diff --git a/third_party/libvpx/source/config/linux/ia32/vpx_config.c b/third_party/libvpx/source/config/linux/ia32/vpx_config.c
index 280ac073a9..f843e57a25 100644
--- a/third_party/libvpx/source/config/linux/ia32/vpx_config.c
+++ b/third_party/libvpx/source/config/linux/ia32/vpx_config.c
@@ -5,5 +5,5 @@
 /* tree. An additional intellectual property rights grant can be found */
 /* in the file PATENTS.  All contributing project authors may */
 /* be found in the AUTHORS file in the root of the source tree. */
-static const char* const cfg = "--target=x86-linux-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only";
+static const char* const cfg = "--target=x86-linux-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding";
 const char *vpx_codec_build_config(void) {return cfg;}
diff --git a/third_party/libvpx/source/config/linux/ia32/vpx_config.h b/third_party/libvpx/source/config/linux/ia32/vpx_config.h
index c4f09fdbb0..f079b8d1ac 100644
--- a/third_party/libvpx/source/config/linux/ia32/vpx_config.h
+++ b/third_party/libvpx/source/config/linux/ia32/vpx_config.h
@@ -74,6 +74,6 @@
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_UNIT_TESTS 0
-#define CONFIG_MULTI_RES_ENCODING 0
+#define CONFIG_MULTI_RES_ENCODING 1
 #define CONFIG_TEMPORAL_DENOISING 1
 #endif /* VPX_CONFIG_H */
diff --git a/third_party/libvpx/source/config/linux/x64/vpx_config.asm b/third_party/libvpx/source/config/linux/x64/vpx_config.asm
index 0ca4109101..cb005db2e1 100644
--- a/third_party/libvpx/source/config/linux/x64/vpx_config.asm
+++ b/third_party/libvpx/source/config/linux/x64/vpx_config.asm
@@ -63,5 +63,5 @@ CONFIG_SMALL equ 0
 CONFIG_POSTPROC_VISUALIZER equ 0
 CONFIG_OS_SUPPORT equ 1
 CONFIG_UNIT_TESTS equ 0
-CONFIG_MULTI_RES_ENCODING equ 0
+CONFIG_MULTI_RES_ENCODING equ 1
 CONFIG_TEMPORAL_DENOISING equ 1
diff --git a/third_party/libvpx/source/config/linux/x64/vpx_config.c b/third_party/libvpx/source/config/linux/x64/vpx_config.c
index 2ac65f7b80..776c7e0879 100644
--- a/third_party/libvpx/source/config/linux/x64/vpx_config.c
+++ b/third_party/libvpx/source/config/linux/x64/vpx_config.c
@@ -5,5 +5,5 @@
 /* tree. An additional intellectual property rights grant can be found */
 /* in the file PATENTS.  All contributing project authors may */
 /* be found in the AUTHORS file in the root of the source tree. */
-static const char* const cfg = "--target=x86_64-linux-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only";
+static const char* const cfg = "--target=x86_64-linux-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding";
 const char *vpx_codec_build_config(void) {return cfg;}
diff --git a/third_party/libvpx/source/config/linux/x64/vpx_config.h b/third_party/libvpx/source/config/linux/x64/vpx_config.h
index a031d95629..001ab19a03 100644
--- a/third_party/libvpx/source/config/linux/x64/vpx_config.h
+++ b/third_party/libvpx/source/config/linux/x64/vpx_config.h
@@ -74,6 +74,6 @@
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_UNIT_TESTS 0
-#define CONFIG_MULTI_RES_ENCODING 0
+#define CONFIG_MULTI_RES_ENCODING 1
 #define CONFIG_TEMPORAL_DENOISING 1
 #endif /* VPX_CONFIG_H */
diff --git a/third_party/libvpx/source/config/mac/ia32/vpx_config.asm b/third_party/libvpx/source/config/mac/ia32/vpx_config.asm
index a59bf69fb3..6c39f37bba 100644
--- a/third_party/libvpx/source/config/mac/ia32/vpx_config.asm
+++ b/third_party/libvpx/source/config/mac/ia32/vpx_config.asm
@@ -63,5 +63,5 @@ CONFIG_SMALL equ 0
 CONFIG_POSTPROC_VISUALIZER equ 0
 CONFIG_OS_SUPPORT equ 1
 CONFIG_UNIT_TESTS equ 0
-CONFIG_MULTI_RES_ENCODING equ 0
+CONFIG_MULTI_RES_ENCODING equ 1
 CONFIG_TEMPORAL_DENOISING equ 1
diff --git a/third_party/libvpx/source/config/mac/ia32/vpx_config.c b/third_party/libvpx/source/config/mac/ia32/vpx_config.c
index 04c00a130a..775ad6795a 100644
--- a/third_party/libvpx/source/config/mac/ia32/vpx_config.c
+++ b/third_party/libvpx/source/config/mac/ia32/vpx_config.c
@@ -5,5 +5,5 @@
 /* tree. An additional intellectual property rights grant can be found */
 /* in the file PATENTS.  All contributing project authors may */
 /* be found in the AUTHORS file in the root of the source tree. */
-static const char* const cfg = "--target=x86-darwin9-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only";
+static const char* const cfg = "--target=x86-darwin9-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding";
 const char *vpx_codec_build_config(void) {return cfg;}
diff --git a/third_party/libvpx/source/config/mac/ia32/vpx_config.h b/third_party/libvpx/source/config/mac/ia32/vpx_config.h
index c4f09fdbb0..f079b8d1ac 100644
--- a/third_party/libvpx/source/config/mac/ia32/vpx_config.h
+++ b/third_party/libvpx/source/config/mac/ia32/vpx_config.h
@@ -74,6 +74,6 @@
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_UNIT_TESTS 0
-#define CONFIG_MULTI_RES_ENCODING 0
+#define CONFIG_MULTI_RES_ENCODING 1
 #define CONFIG_TEMPORAL_DENOISING 1
 #endif /* VPX_CONFIG_H */
diff --git a/third_party/libvpx/source/config/mac/x64/vpx_config.asm b/third_party/libvpx/source/config/mac/x64/vpx_config.asm
index 0ca4109101..cb005db2e1 100644
--- a/third_party/libvpx/source/config/mac/x64/vpx_config.asm
+++ b/third_party/libvpx/source/config/mac/x64/vpx_config.asm
@@ -63,5 +63,5 @@ CONFIG_SMALL equ 0
 CONFIG_POSTPROC_VISUALIZER equ 0
 CONFIG_OS_SUPPORT equ 1
 CONFIG_UNIT_TESTS equ 0
-CONFIG_MULTI_RES_ENCODING equ 0
+CONFIG_MULTI_RES_ENCODING equ 1
 CONFIG_TEMPORAL_DENOISING equ 1
diff --git a/third_party/libvpx/source/config/mac/x64/vpx_config.c b/third_party/libvpx/source/config/mac/x64/vpx_config.c
index d6197504bb..e764d7c2b1 100644
--- a/third_party/libvpx/source/config/mac/x64/vpx_config.c
+++ b/third_party/libvpx/source/config/mac/x64/vpx_config.c
@@ -5,5 +5,5 @@
 /* tree. An additional intellectual property rights grant can be found */
 /* in the file PATENTS.  All contributing project authors may */
 /* be found in the AUTHORS file in the root of the source tree. */
-static const char* const cfg = "--target=x86_64-darwin10-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only";
+static const char* const cfg = "--target=x86_64-darwin10-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding";
 const char *vpx_codec_build_config(void) {return cfg;}
diff --git a/third_party/libvpx/source/config/mac/x64/vpx_config.h b/third_party/libvpx/source/config/mac/x64/vpx_config.h
index a031d95629..001ab19a03 100644
--- a/third_party/libvpx/source/config/mac/x64/vpx_config.h
+++ b/third_party/libvpx/source/config/mac/x64/vpx_config.h
@@ -74,6 +74,6 @@
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_UNIT_TESTS 0
-#define CONFIG_MULTI_RES_ENCODING 0
+#define CONFIG_MULTI_RES_ENCODING 1
 #define CONFIG_TEMPORAL_DENOISING 1
 #endif /* VPX_CONFIG_H */
diff --git a/third_party/libvpx/source/config/win/ia32/vpx_config.asm b/third_party/libvpx/source/config/win/ia32/vpx_config.asm
index 411adcf5cf..456e96fc56 100644
--- a/third_party/libvpx/source/config/win/ia32/vpx_config.asm
+++ b/third_party/libvpx/source/config/win/ia32/vpx_config.asm
@@ -63,5 +63,5 @@ CONFIG_SMALL equ 0
 CONFIG_POSTPROC_VISUALIZER equ 0
 CONFIG_OS_SUPPORT equ 1
 CONFIG_UNIT_TESTS equ 0
-CONFIG_MULTI_RES_ENCODING equ 0
+CONFIG_MULTI_RES_ENCODING equ 1
 CONFIG_TEMPORAL_DENOISING equ 1
diff --git a/third_party/libvpx/source/config/win/ia32/vpx_config.c b/third_party/libvpx/source/config/win/ia32/vpx_config.c
index bcd9622de4..6c67a428b2 100644
--- a/third_party/libvpx/source/config/win/ia32/vpx_config.c
+++ b/third_party/libvpx/source/config/win/ia32/vpx_config.c
@@ -5,5 +5,5 @@
 /* tree. An additional intellectual property rights grant can be found */
 /* in the file PATENTS.  All contributing project authors may */
 /* be found in the AUTHORS file in the root of the source tree. */
-static const char* const cfg = "--target=x86-win32-vs9 --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-static-msvcrt --as=yasm";
+static const char* const cfg = "--target=x86-win32-vs9 --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-static-msvcrt --as=yasm --enable-multi-res-encoding";
 const char *vpx_codec_build_config(void) {return cfg;}
diff --git a/third_party/libvpx/source/config/win/ia32/vpx_config.h b/third_party/libvpx/source/config/win/ia32/vpx_config.h
index 0f66f460f2..bdfa8dac4d 100644
--- a/third_party/libvpx/source/config/win/ia32/vpx_config.h
+++ b/third_party/libvpx/source/config/win/ia32/vpx_config.h
@@ -74,6 +74,6 @@
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_UNIT_TESTS 0
-#define CONFIG_MULTI_RES_ENCODING 0
+#define CONFIG_MULTI_RES_ENCODING 1
 #define CONFIG_TEMPORAL_DENOISING 1
 #endif /* VPX_CONFIG_H */
diff --git a/third_party/libvpx/source/config/win/x64/vpx_config.asm b/third_party/libvpx/source/config/win/x64/vpx_config.asm
index 5bb3022ff5..df6f68b23a 100644
--- a/third_party/libvpx/source/config/win/x64/vpx_config.asm
+++ b/third_party/libvpx/source/config/win/x64/vpx_config.asm
@@ -63,5 +63,5 @@ CONFIG_SMALL equ 0
 CONFIG_POSTPROC_VISUALIZER equ 0
 CONFIG_OS_SUPPORT equ 1
 CONFIG_UNIT_TESTS equ 0
-CONFIG_MULTI_RES_ENCODING equ 0
+CONFIG_MULTI_RES_ENCODING equ 1
 CONFIG_TEMPORAL_DENOISING equ 1
diff --git a/third_party/libvpx/source/config/win/x64/vpx_config.c b/third_party/libvpx/source/config/win/x64/vpx_config.c
index c59d62c847..83b5049041 100644
--- a/third_party/libvpx/source/config/win/x64/vpx_config.c
+++ b/third_party/libvpx/source/config/win/x64/vpx_config.c
@@ -5,5 +5,5 @@
 /* tree. An additional intellectual property rights grant can be found */
 /* in the file PATENTS.  All contributing project authors may */
 /* be found in the AUTHORS file in the root of the source tree. */
-static const char* const cfg = "--target=x86_64-win64-vs9 --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-static-msvcrt --as=yasm";
+static const char* const cfg = "--target=x86_64-win64-vs9 --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-static-msvcrt --as=yasm --enable-multi-res-encoding";
 const char *vpx_codec_build_config(void) {return cfg;}
diff --git a/third_party/libvpx/source/config/win/x64/vpx_config.h b/third_party/libvpx/source/config/win/x64/vpx_config.h
index 1a61d9ade4..f8f03d8167 100644
--- a/third_party/libvpx/source/config/win/x64/vpx_config.h
+++ b/third_party/libvpx/source/config/win/x64/vpx_config.h
@@ -74,6 +74,6 @@
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
 #define CONFIG_UNIT_TESTS 0
-#define CONFIG_MULTI_RES_ENCODING 0
+#define CONFIG_MULTI_RES_ENCODING 1
 #define CONFIG_TEMPORAL_DENOISING 1
 #endif /* VPX_CONFIG_H */