Upgrade to libvpx commit e479379a.
This version includes a critical bug fix for temporal layers.
BUG=
TEST=
Review URL: https://webrtc-codereview.appspot.com/350012
git-svn-id: http://webrtc.googlecode.com/svn/trunk@1454 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/DEPS b/DEPS
index fbc8a5c6..6b7c07e 100644
--- a/DEPS
+++ b/DEPS
@@ -45,7 +45,7 @@
Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"),
"trunk/third_party/libvpx/source/libvpx":
- "http://git.chromium.org/webm/libvpx.git@bdd35c13",
+ "http://git.chromium.org/webm/libvpx.git@e479379a",
"trunk/third_party/libjpeg_turbo/":
Var("chromium_trunk") + "/deps/third_party/libjpeg_turbo@95800",
diff --git a/third_party/libvpx/libvpx_srcs_arm.gypi b/third_party/libvpx/libvpx_srcs_arm.gypi
index 633aa68..29e2583 100644
--- a/third_party/libvpx/libvpx_srcs_arm.gypi
+++ b/third_party/libvpx/libvpx_srcs_arm.gypi
@@ -13,14 +13,20 @@
'source/libvpx/vp8/common/arm/armv6/copymem8x4_v6.asm',
'source/libvpx/vp8/common/arm/armv6/copymem8x8_v6.asm',
'source/libvpx/vp8/common/arm/armv6/dc_only_idct_add_v6.asm',
+ 'source/libvpx/vp8/common/arm/armv6/dequant_idct_v6.asm',
+ 'source/libvpx/vp8/common/arm/armv6/dequantize_v6.asm',
'source/libvpx/vp8/common/arm/armv6/filter_v6.asm',
+ 'source/libvpx/vp8/common/arm/armv6/idct_blk_v6.c',
'source/libvpx/vp8/common/arm/armv6/idct_v6.asm',
+ 'source/libvpx/vp8/common/arm/armv6/intra4x4_predict_v6.asm',
'source/libvpx/vp8/common/arm/armv6/iwalsh_v6.asm',
'source/libvpx/vp8/common/arm/armv6/loopfilter_v6.asm',
'source/libvpx/vp8/common/arm/armv6/simpleloopfilter_v6.asm',
'source/libvpx/vp8/common/arm/armv6/sixtappredict8x4_v6.asm',
'source/libvpx/vp8/common/arm/bilinearfilter_arm.c',
'source/libvpx/vp8/common/arm/bilinearfilter_arm.h',
+ 'source/libvpx/vp8/common/arm/dequantize_arm.c',
+ 'source/libvpx/vp8/common/arm/dequantize_arm.h',
'source/libvpx/vp8/common/arm/filter_arm.c',
'source/libvpx/vp8/common/arm/idct_arm.h',
'source/libvpx/vp8/common/arm/loopfilter_arm.c',
@@ -32,9 +38,10 @@
'source/libvpx/vp8/common/blockd.h',
'source/libvpx/vp8/common/coefupdateprobs.h',
'source/libvpx/vp8/common/common.h',
- 'source/libvpx/vp8/common/common_types.h',
'source/libvpx/vp8/common/debugmodes.c',
'source/libvpx/vp8/common/default_coef_probs.h',
+ 'source/libvpx/vp8/common/dequantize.c',
+ 'source/libvpx/vp8/common/dequantize.h',
'source/libvpx/vp8/common/entropy.c',
'source/libvpx/vp8/common/entropy.h',
'source/libvpx/vp8/common/entropymode.c',
@@ -47,12 +54,11 @@
'source/libvpx/vp8/common/filter.h',
'source/libvpx/vp8/common/findnearmv.c',
'source/libvpx/vp8/common/findnearmv.h',
- 'source/libvpx/vp8/common/g_common.h',
'source/libvpx/vp8/common/generic/systemdependent.c',
'source/libvpx/vp8/common/header.h',
+ 'source/libvpx/vp8/common/idct_blk.c',
'source/libvpx/vp8/common/idct.h',
'source/libvpx/vp8/common/idctllm.c',
- 'source/libvpx/vp8/common/invtrans.c',
'source/libvpx/vp8/common/invtrans.h',
'source/libvpx/vp8/common/loopfilter.c',
'source/libvpx/vp8/common/loopfilter_filters.c',
@@ -87,29 +93,19 @@
'source/libvpx/vp8/common/threading.h',
'source/libvpx/vp8/common/treecoder.c',
'source/libvpx/vp8/common/treecoder.h',
- 'source/libvpx/vp8/common/type_aliases.h',
'source/libvpx/vp8/decoder/arm/arm_dsystemdependent.c',
- 'source/libvpx/vp8/decoder/arm/armv6/dequant_dc_idct_v6.asm',
- 'source/libvpx/vp8/decoder/arm/armv6/dequant_idct_v6.asm',
- 'source/libvpx/vp8/decoder/arm/armv6/dequantize_v6.asm',
- 'source/libvpx/vp8/decoder/arm/armv6/idct_blk_v6.c',
- 'source/libvpx/vp8/decoder/arm/dequantize_arm.c',
- 'source/libvpx/vp8/decoder/arm/dequantize_arm.h',
'source/libvpx/vp8/decoder/dboolhuff.c',
'source/libvpx/vp8/decoder/dboolhuff.h',
'source/libvpx/vp8/decoder/decodemv.c',
'source/libvpx/vp8/decoder/decodemv.h',
'source/libvpx/vp8/decoder/decoderthreading.h',
'source/libvpx/vp8/decoder/decodframe.c',
- 'source/libvpx/vp8/decoder/dequantize.c',
- 'source/libvpx/vp8/decoder/dequantize.h',
'source/libvpx/vp8/decoder/detokenize.c',
'source/libvpx/vp8/decoder/detokenize.h',
'source/libvpx/vp8/decoder/ec_types.h',
'source/libvpx/vp8/decoder/error_concealment.c',
'source/libvpx/vp8/decoder/error_concealment.h',
'source/libvpx/vp8/decoder/generic/dsystemdependent.c',
- 'source/libvpx/vp8/decoder/idct_blk.c',
'source/libvpx/vp8/decoder/onyxd_if.c',
'source/libvpx/vp8/decoder/onyxd_int.h',
'source/libvpx/vp8/decoder/reconintra_mt.c',
diff --git a/third_party/libvpx/libvpx_srcs_arm_neon.gypi b/third_party/libvpx/libvpx_srcs_arm_neon.gypi
index 6bd7f45..2e02d3e 100644
--- a/third_party/libvpx/libvpx_srcs_arm_neon.gypi
+++ b/third_party/libvpx/libvpx_srcs_arm_neon.gypi
@@ -13,14 +13,20 @@
'source/libvpx/vp8/common/arm/armv6/copymem8x4_v6.asm',
'source/libvpx/vp8/common/arm/armv6/copymem8x8_v6.asm',
'source/libvpx/vp8/common/arm/armv6/dc_only_idct_add_v6.asm',
+ 'source/libvpx/vp8/common/arm/armv6/dequant_idct_v6.asm',
+ 'source/libvpx/vp8/common/arm/armv6/dequantize_v6.asm',
'source/libvpx/vp8/common/arm/armv6/filter_v6.asm',
+ 'source/libvpx/vp8/common/arm/armv6/idct_blk_v6.c',
'source/libvpx/vp8/common/arm/armv6/idct_v6.asm',
+ 'source/libvpx/vp8/common/arm/armv6/intra4x4_predict_v6.asm',
'source/libvpx/vp8/common/arm/armv6/iwalsh_v6.asm',
'source/libvpx/vp8/common/arm/armv6/loopfilter_v6.asm',
'source/libvpx/vp8/common/arm/armv6/simpleloopfilter_v6.asm',
'source/libvpx/vp8/common/arm/armv6/sixtappredict8x4_v6.asm',
'source/libvpx/vp8/common/arm/bilinearfilter_arm.c',
'source/libvpx/vp8/common/arm/bilinearfilter_arm.h',
+ 'source/libvpx/vp8/common/arm/dequantize_arm.c',
+ 'source/libvpx/vp8/common/arm/dequantize_arm.h',
'source/libvpx/vp8/common/arm/filter_arm.c',
'source/libvpx/vp8/common/arm/idct_arm.h',
'source/libvpx/vp8/common/arm/loopfilter_arm.c',
@@ -34,6 +40,11 @@
'source/libvpx/vp8/common/arm/neon/copymem8x4_neon.asm',
'source/libvpx/vp8/common/arm/neon/copymem8x8_neon.asm',
'source/libvpx/vp8/common/arm/neon/dc_only_idct_add_neon.asm',
+ 'source/libvpx/vp8/common/arm/neon/dequant_idct_neon.asm',
+ 'source/libvpx/vp8/common/arm/neon/dequantizeb_neon.asm',
+ 'source/libvpx/vp8/common/arm/neon/idct_blk_neon.c',
+ 'source/libvpx/vp8/common/arm/neon/idct_dequant_0_2x_neon.asm',
+ 'source/libvpx/vp8/common/arm/neon/idct_dequant_full_2x_neon.asm',
'source/libvpx/vp8/common/arm/neon/iwalsh_neon.asm',
'source/libvpx/vp8/common/arm/neon/loopfilter_neon.asm',
'source/libvpx/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.asm',
@@ -52,9 +63,10 @@
'source/libvpx/vp8/common/blockd.h',
'source/libvpx/vp8/common/coefupdateprobs.h',
'source/libvpx/vp8/common/common.h',
- 'source/libvpx/vp8/common/common_types.h',
'source/libvpx/vp8/common/debugmodes.c',
'source/libvpx/vp8/common/default_coef_probs.h',
+ 'source/libvpx/vp8/common/dequantize.c',
+ 'source/libvpx/vp8/common/dequantize.h',
'source/libvpx/vp8/common/entropy.c',
'source/libvpx/vp8/common/entropy.h',
'source/libvpx/vp8/common/entropymode.c',
@@ -67,12 +79,11 @@
'source/libvpx/vp8/common/filter.h',
'source/libvpx/vp8/common/findnearmv.c',
'source/libvpx/vp8/common/findnearmv.h',
- 'source/libvpx/vp8/common/g_common.h',
'source/libvpx/vp8/common/generic/systemdependent.c',
'source/libvpx/vp8/common/header.h',
+ 'source/libvpx/vp8/common/idct_blk.c',
'source/libvpx/vp8/common/idct.h',
'source/libvpx/vp8/common/idctllm.c',
- 'source/libvpx/vp8/common/invtrans.c',
'source/libvpx/vp8/common/invtrans.h',
'source/libvpx/vp8/common/loopfilter.c',
'source/libvpx/vp8/common/loopfilter_filters.c',
@@ -107,36 +118,19 @@
'source/libvpx/vp8/common/threading.h',
'source/libvpx/vp8/common/treecoder.c',
'source/libvpx/vp8/common/treecoder.h',
- 'source/libvpx/vp8/common/type_aliases.h',
'source/libvpx/vp8/decoder/arm/arm_dsystemdependent.c',
- 'source/libvpx/vp8/decoder/arm/armv6/dequant_dc_idct_v6.asm',
- 'source/libvpx/vp8/decoder/arm/armv6/dequant_idct_v6.asm',
- 'source/libvpx/vp8/decoder/arm/armv6/dequantize_v6.asm',
- 'source/libvpx/vp8/decoder/arm/armv6/idct_blk_v6.c',
- 'source/libvpx/vp8/decoder/arm/dequantize_arm.c',
- 'source/libvpx/vp8/decoder/arm/dequantize_arm.h',
- 'source/libvpx/vp8/decoder/arm/neon/dequant_idct_neon.asm',
- 'source/libvpx/vp8/decoder/arm/neon/dequantizeb_neon.asm',
- 'source/libvpx/vp8/decoder/arm/neon/idct_blk_neon.c',
- 'source/libvpx/vp8/decoder/arm/neon/idct_dequant_0_2x_neon.asm',
- 'source/libvpx/vp8/decoder/arm/neon/idct_dequant_dc_0_2x_neon.asm',
- 'source/libvpx/vp8/decoder/arm/neon/idct_dequant_dc_full_2x_neon.asm',
- 'source/libvpx/vp8/decoder/arm/neon/idct_dequant_full_2x_neon.asm',
'source/libvpx/vp8/decoder/dboolhuff.c',
'source/libvpx/vp8/decoder/dboolhuff.h',
'source/libvpx/vp8/decoder/decodemv.c',
'source/libvpx/vp8/decoder/decodemv.h',
'source/libvpx/vp8/decoder/decoderthreading.h',
'source/libvpx/vp8/decoder/decodframe.c',
- 'source/libvpx/vp8/decoder/dequantize.c',
- 'source/libvpx/vp8/decoder/dequantize.h',
'source/libvpx/vp8/decoder/detokenize.c',
'source/libvpx/vp8/decoder/detokenize.h',
'source/libvpx/vp8/decoder/ec_types.h',
'source/libvpx/vp8/decoder/error_concealment.c',
'source/libvpx/vp8/decoder/error_concealment.h',
'source/libvpx/vp8/decoder/generic/dsystemdependent.c',
- 'source/libvpx/vp8/decoder/idct_blk.c',
'source/libvpx/vp8/decoder/onyxd_if.c',
'source/libvpx/vp8/decoder/onyxd_int.h',
'source/libvpx/vp8/decoder/reconintra_mt.c',
diff --git a/third_party/libvpx/libvpx_srcs_x86.gypi b/third_party/libvpx/libvpx_srcs_x86.gypi
index e5e401f..267132c 100644
--- a/third_party/libvpx/libvpx_srcs_x86.gypi
+++ b/third_party/libvpx/libvpx_srcs_x86.gypi
@@ -11,9 +11,10 @@
'source/libvpx/vp8/common/blockd.h',
'source/libvpx/vp8/common/coefupdateprobs.h',
'source/libvpx/vp8/common/common.h',
- 'source/libvpx/vp8/common/common_types.h',
'source/libvpx/vp8/common/debugmodes.c',
'source/libvpx/vp8/common/default_coef_probs.h',
+ 'source/libvpx/vp8/common/dequantize.c',
+ 'source/libvpx/vp8/common/dequantize.h',
'source/libvpx/vp8/common/entropy.c',
'source/libvpx/vp8/common/entropy.h',
'source/libvpx/vp8/common/entropymode.c',
@@ -26,12 +27,11 @@
'source/libvpx/vp8/common/filter.h',
'source/libvpx/vp8/common/findnearmv.c',
'source/libvpx/vp8/common/findnearmv.h',
- 'source/libvpx/vp8/common/g_common.h',
'source/libvpx/vp8/common/generic/systemdependent.c',
'source/libvpx/vp8/common/header.h',
+ 'source/libvpx/vp8/common/idct_blk.c',
'source/libvpx/vp8/common/idct.h',
'source/libvpx/vp8/common/idctllm.c',
- 'source/libvpx/vp8/common/invtrans.c',
'source/libvpx/vp8/common/invtrans.h',
'source/libvpx/vp8/common/loopfilter.c',
'source/libvpx/vp8/common/loopfilter_filters.c',
@@ -66,7 +66,12 @@
'source/libvpx/vp8/common/threading.h',
'source/libvpx/vp8/common/treecoder.c',
'source/libvpx/vp8/common/treecoder.h',
- 'source/libvpx/vp8/common/type_aliases.h',
+ 'source/libvpx/vp8/common/x86/dequantize_mmx.asm',
+ 'source/libvpx/vp8/common/x86/dequantize_x86.h',
+ 'source/libvpx/vp8/common/x86/filter_x86.c',
+ 'source/libvpx/vp8/common/x86/filter_x86.h',
+ 'source/libvpx/vp8/common/x86/idct_blk_mmx.c',
+ 'source/libvpx/vp8/common/x86/idct_blk_sse2.c',
'source/libvpx/vp8/common/x86/idctllm_mmx.asm',
'source/libvpx/vp8/common/x86/idctllm_sse2.asm',
'source/libvpx/vp8/common/x86/idct_x86.h',
@@ -95,25 +100,18 @@
'source/libvpx/vp8/decoder/decodemv.h',
'source/libvpx/vp8/decoder/decoderthreading.h',
'source/libvpx/vp8/decoder/decodframe.c',
- 'source/libvpx/vp8/decoder/dequantize.c',
- 'source/libvpx/vp8/decoder/dequantize.h',
'source/libvpx/vp8/decoder/detokenize.c',
'source/libvpx/vp8/decoder/detokenize.h',
'source/libvpx/vp8/decoder/ec_types.h',
'source/libvpx/vp8/decoder/error_concealment.c',
'source/libvpx/vp8/decoder/error_concealment.h',
'source/libvpx/vp8/decoder/generic/dsystemdependent.c',
- 'source/libvpx/vp8/decoder/idct_blk.c',
'source/libvpx/vp8/decoder/onyxd_if.c',
'source/libvpx/vp8/decoder/onyxd_int.h',
'source/libvpx/vp8/decoder/reconintra_mt.c',
'source/libvpx/vp8/decoder/reconintra_mt.h',
'source/libvpx/vp8/decoder/threading.c',
'source/libvpx/vp8/decoder/treereader.h',
- 'source/libvpx/vp8/decoder/x86/dequantize_mmx.asm',
- 'source/libvpx/vp8/decoder/x86/dequantize_x86.h',
- 'source/libvpx/vp8/decoder/x86/idct_blk_mmx.c',
- 'source/libvpx/vp8/decoder/x86/idct_blk_sse2.c',
'source/libvpx/vp8/decoder/x86/x86_dsystemdependent.c',
'source/libvpx/vp8/encoder/bitstream.c',
'source/libvpx/vp8/encoder/bitstream.h',
diff --git a/third_party/libvpx/libvpx_srcs_x86_64.gypi b/third_party/libvpx/libvpx_srcs_x86_64.gypi
index 4b24592..424edb0 100644
--- a/third_party/libvpx/libvpx_srcs_x86_64.gypi
+++ b/third_party/libvpx/libvpx_srcs_x86_64.gypi
@@ -11,9 +11,10 @@
'source/libvpx/vp8/common/blockd.h',
'source/libvpx/vp8/common/coefupdateprobs.h',
'source/libvpx/vp8/common/common.h',
- 'source/libvpx/vp8/common/common_types.h',
'source/libvpx/vp8/common/debugmodes.c',
'source/libvpx/vp8/common/default_coef_probs.h',
+ 'source/libvpx/vp8/common/dequantize.c',
+ 'source/libvpx/vp8/common/dequantize.h',
'source/libvpx/vp8/common/entropy.c',
'source/libvpx/vp8/common/entropy.h',
'source/libvpx/vp8/common/entropymode.c',
@@ -26,12 +27,11 @@
'source/libvpx/vp8/common/filter.h',
'source/libvpx/vp8/common/findnearmv.c',
'source/libvpx/vp8/common/findnearmv.h',
- 'source/libvpx/vp8/common/g_common.h',
'source/libvpx/vp8/common/generic/systemdependent.c',
'source/libvpx/vp8/common/header.h',
+ 'source/libvpx/vp8/common/idct_blk.c',
'source/libvpx/vp8/common/idct.h',
'source/libvpx/vp8/common/idctllm.c',
- 'source/libvpx/vp8/common/invtrans.c',
'source/libvpx/vp8/common/invtrans.h',
'source/libvpx/vp8/common/loopfilter.c',
'source/libvpx/vp8/common/loopfilter_filters.c',
@@ -66,7 +66,12 @@
'source/libvpx/vp8/common/threading.h',
'source/libvpx/vp8/common/treecoder.c',
'source/libvpx/vp8/common/treecoder.h',
- 'source/libvpx/vp8/common/type_aliases.h',
+ 'source/libvpx/vp8/common/x86/dequantize_mmx.asm',
+ 'source/libvpx/vp8/common/x86/dequantize_x86.h',
+ 'source/libvpx/vp8/common/x86/filter_x86.c',
+ 'source/libvpx/vp8/common/x86/filter_x86.h',
+ 'source/libvpx/vp8/common/x86/idct_blk_mmx.c',
+ 'source/libvpx/vp8/common/x86/idct_blk_sse2.c',
'source/libvpx/vp8/common/x86/idctllm_mmx.asm',
'source/libvpx/vp8/common/x86/idctllm_sse2.asm',
'source/libvpx/vp8/common/x86/idct_x86.h',
@@ -96,25 +101,18 @@
'source/libvpx/vp8/decoder/decodemv.h',
'source/libvpx/vp8/decoder/decoderthreading.h',
'source/libvpx/vp8/decoder/decodframe.c',
- 'source/libvpx/vp8/decoder/dequantize.c',
- 'source/libvpx/vp8/decoder/dequantize.h',
'source/libvpx/vp8/decoder/detokenize.c',
'source/libvpx/vp8/decoder/detokenize.h',
'source/libvpx/vp8/decoder/ec_types.h',
'source/libvpx/vp8/decoder/error_concealment.c',
'source/libvpx/vp8/decoder/error_concealment.h',
'source/libvpx/vp8/decoder/generic/dsystemdependent.c',
- 'source/libvpx/vp8/decoder/idct_blk.c',
'source/libvpx/vp8/decoder/onyxd_if.c',
'source/libvpx/vp8/decoder/onyxd_int.h',
'source/libvpx/vp8/decoder/reconintra_mt.c',
'source/libvpx/vp8/decoder/reconintra_mt.h',
'source/libvpx/vp8/decoder/threading.c',
'source/libvpx/vp8/decoder/treereader.h',
- 'source/libvpx/vp8/decoder/x86/dequantize_mmx.asm',
- 'source/libvpx/vp8/decoder/x86/dequantize_x86.h',
- 'source/libvpx/vp8/decoder/x86/idct_blk_mmx.c',
- 'source/libvpx/vp8/decoder/x86/idct_blk_sse2.c',
'source/libvpx/vp8/decoder/x86/x86_dsystemdependent.c',
'source/libvpx/vp8/encoder/bitstream.c',
'source/libvpx/vp8/encoder/bitstream.h',
diff --git a/third_party/libvpx/source/config/linux/ia32/asm_enc_offsets.asm b/third_party/libvpx/source/config/linux/ia32/asm_enc_offsets.asm
index a0416b5..b22ab9b 100644
--- a/third_party/libvpx/source/config/linux/ia32/asm_enc_offsets.asm
+++ b/third_party/libvpx/source/config/linux/ia32/asm_enc_offsets.asm
@@ -7,9 +7,9 @@
vp8_block_zrun_zbin_boost EQU 24
vp8_block_quant_shift EQU 16
vp8_blockd_qcoeff EQU 0
-vp8_blockd_dequant EQU 16
+vp8_blockd_dequant EQU 12
vp8_blockd_dqcoeff EQU 4
-vp8_blockd_eob EQU 44
+vp8_blockd_eob EQU 40
vp8_block_base_src EQU 36
vp8_block_src EQU 40
vp8_block_src_diff EQU 0
@@ -21,6 +21,8 @@
vp8_writer_count EQU 12
vp8_writer_pos EQU 16
vp8_writer_buffer EQU 20
+vp8_writer_buffer_end EQU 24
+vp8_writer_error EQU 28
tokenextra_token EQU 6
tokenextra_extra EQU 4
tokenextra_context_tree EQU 0
@@ -33,10 +35,11 @@
vp8_extra_bit_struct_prob EQU 4
vp8_extra_bit_struct_len EQU 8
vp8_extra_bit_struct_base_val EQU 12
-vp8_comp_tplist EQU 181336
-vp8_comp_common EQU 105408
-vp8_comp_bc2 EQU 128480
+vp8_comp_tplist EQU 170332
+vp8_comp_common EQU 104544
+vp8_comp_bc EQU 116896
+vp8_writer_sz EQU 40
tokenlist_start EQU 0
tokenlist_stop EQU 4
TOKENLIST_SZ EQU 8
-vp8_common_mb_rows EQU 12984
+vp8_common_mb_rows EQU 2296
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 d15accf..b2570ab 100644
--- a/third_party/libvpx/source/config/linux/ia32/vpx_config.asm
+++ b/third_party/libvpx/source/config/linux/ia32/vpx_config.asm
@@ -7,8 +7,6 @@
HAVE_ARMV5TE equ 0
HAVE_ARMV6 equ 0
HAVE_ARMV7 equ 0
-HAVE_IWMMXT equ 0
-HAVE_IWMMXT2 equ 0
HAVE_MIPS32 equ 0
HAVE_MMX equ 1
HAVE_SSE equ 1
@@ -63,3 +61,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
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 2f5a454..280ac07 100644
--- a/third_party/libvpx/source/config/linux/ia32/vpx_config.c
+++ b/third_party/libvpx/source/config/linux/ia32/vpx_config.c
@@ -1,2 +1,9 @@
-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";
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/* */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* 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";
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 26a491c..173b6fc 100644
--- a/third_party/libvpx/source/config/linux/ia32/vpx_config.h
+++ b/third_party/libvpx/source/config/linux/ia32/vpx_config.h
@@ -1,3 +1,10 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/* */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* 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. */
/* This file automatically generated by configure. Do not edit! */
#ifndef VPX_CONFIG_H
#define VPX_CONFIG_H
@@ -11,8 +18,6 @@
#define HAVE_ARMV5TE 0
#define HAVE_ARMV6 0
#define HAVE_ARMV7 0
-#define HAVE_IWMMXT 0
-#define HAVE_IWMMXT2 0
#define HAVE_MIPS32 0
#define HAVE_MMX 1
#define HAVE_SSE 1
@@ -67,4 +72,6 @@
#define CONFIG_SMALL 0
#define CONFIG_POSTPROC_VISUALIZER 0
#define CONFIG_OS_SUPPORT 1
+#define CONFIG_UNIT_TESTS 0
+#define CONFIG_MULTI_RES_ENCODING 0
#endif /* VPX_CONFIG_H */
diff --git a/third_party/libvpx/source/config/linux/ia32/vpx_version.h b/third_party/libvpx/source/config/linux/ia32/vpx_version.h
index 5eedf61..c685880 100644
--- a/third_party/libvpx/source/config/linux/ia32/vpx_version.h
+++ b/third_party/libvpx/source/config/linux/ia32/vpx_version.h
@@ -1,7 +1,7 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 9
#define VERSION_PATCH 7
-#define VERSION_EXTRA ""
+#define VERSION_EXTRA "p1-268-ge479379"
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
-#define VERSION_STRING_NOSP "v0.9.7"
-#define VERSION_STRING " v0.9.7"
+#define VERSION_STRING_NOSP "v0.9.7-p1-268-ge479379"
+#define VERSION_STRING " v0.9.7-p1-268-ge479379"
diff --git a/third_party/libvpx/source/config/linux/x64/asm_enc_offsets.asm b/third_party/libvpx/source/config/linux/x64/asm_enc_offsets.asm
index 9a0ccfd..1d5c61d 100644
--- a/third_party/libvpx/source/config/linux/x64/asm_enc_offsets.asm
+++ b/third_party/libvpx/source/config/linux/x64/asm_enc_offsets.asm
@@ -7,9 +7,9 @@
vp8_block_zrun_zbin_boost EQU 48
vp8_block_quant_shift EQU 32
vp8_blockd_qcoeff EQU 0
-vp8_blockd_dequant EQU 32
+vp8_blockd_dequant EQU 24
vp8_blockd_dqcoeff EQU 8
-vp8_blockd_eob EQU 72
+vp8_blockd_eob EQU 64
vp8_block_base_src EQU 72
vp8_block_src EQU 80
vp8_block_src_diff EQU 0
@@ -21,6 +21,8 @@
vp8_writer_count EQU 12
vp8_writer_pos EQU 16
vp8_writer_buffer EQU 24
+vp8_writer_buffer_end EQU 32
+vp8_writer_error EQU 40
tokenextra_token EQU 10
tokenextra_extra EQU 8
tokenextra_context_tree EQU 0
@@ -33,10 +35,11 @@
vp8_extra_bit_struct_prob EQU 8
vp8_extra_bit_struct_len EQU 16
vp8_extra_bit_struct_base_val EQU 20
-vp8_comp_tplist EQU 183912
-vp8_comp_common EQU 107360
-vp8_comp_bc2 EQU 130832
+vp8_comp_tplist EQU 173096
+vp8_comp_common EQU 106496
+vp8_comp_bc EQU 119232
+vp8_writer_sz EQU 64
tokenlist_start EQU 0
tokenlist_stop EQU 8
TOKENLIST_SZ EQU 16
-vp8_common_mb_rows EQU 13156
+vp8_common_mb_rows EQU 2488
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 bc15c1b..f98d355 100644
--- a/third_party/libvpx/source/config/linux/x64/vpx_config.asm
+++ b/third_party/libvpx/source/config/linux/x64/vpx_config.asm
@@ -7,8 +7,6 @@
HAVE_ARMV5TE equ 0
HAVE_ARMV6 equ 0
HAVE_ARMV7 equ 0
-HAVE_IWMMXT equ 0
-HAVE_IWMMXT2 equ 0
HAVE_MIPS32 equ 0
HAVE_MMX equ 1
HAVE_SSE equ 1
@@ -63,3 +61,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
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 ffebe4b..2ac65f7 100644
--- a/third_party/libvpx/source/config/linux/x64/vpx_config.c
+++ b/third_party/libvpx/source/config/linux/x64/vpx_config.c
@@ -1,2 +1,9 @@
-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";
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/* */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* 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";
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 97e3284..7eef378 100644
--- a/third_party/libvpx/source/config/linux/x64/vpx_config.h
+++ b/third_party/libvpx/source/config/linux/x64/vpx_config.h
@@ -1,3 +1,10 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/* */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* 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. */
/* This file automatically generated by configure. Do not edit! */
#ifndef VPX_CONFIG_H
#define VPX_CONFIG_H
@@ -11,8 +18,6 @@
#define HAVE_ARMV5TE 0
#define HAVE_ARMV6 0
#define HAVE_ARMV7 0
-#define HAVE_IWMMXT 0
-#define HAVE_IWMMXT2 0
#define HAVE_MIPS32 0
#define HAVE_MMX 1
#define HAVE_SSE 1
@@ -67,4 +72,6 @@
#define CONFIG_SMALL 0
#define CONFIG_POSTPROC_VISUALIZER 0
#define CONFIG_OS_SUPPORT 1
+#define CONFIG_UNIT_TESTS 0
+#define CONFIG_MULTI_RES_ENCODING 0
#endif /* VPX_CONFIG_H */
diff --git a/third_party/libvpx/source/config/linux/x64/vpx_version.h b/third_party/libvpx/source/config/linux/x64/vpx_version.h
index 5eedf61..c685880 100644
--- a/third_party/libvpx/source/config/linux/x64/vpx_version.h
+++ b/third_party/libvpx/source/config/linux/x64/vpx_version.h
@@ -1,7 +1,7 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 9
#define VERSION_PATCH 7
-#define VERSION_EXTRA ""
+#define VERSION_EXTRA "p1-268-ge479379"
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
-#define VERSION_STRING_NOSP "v0.9.7"
-#define VERSION_STRING " v0.9.7"
+#define VERSION_STRING_NOSP "v0.9.7-p1-268-ge479379"
+#define VERSION_STRING " v0.9.7-p1-268-ge479379"
diff --git a/third_party/libvpx/source/config/mac/ia32/asm_enc_offsets.asm b/third_party/libvpx/source/config/mac/ia32/asm_enc_offsets.asm
index 3dfd4d8..dc21f3f 100644
--- a/third_party/libvpx/source/config/mac/ia32/asm_enc_offsets.asm
+++ b/third_party/libvpx/source/config/mac/ia32/asm_enc_offsets.asm
@@ -7,9 +7,9 @@
vp8_block_zrun_zbin_boost EQU 24
vp8_block_quant_shift EQU 16
vp8_blockd_qcoeff EQU 0
-vp8_blockd_dequant EQU 16
+vp8_blockd_dequant EQU 12
vp8_blockd_dqcoeff EQU 4
-vp8_blockd_eob EQU 44
+vp8_blockd_eob EQU 40
vp8_block_base_src EQU 36
vp8_block_src EQU 40
vp8_block_src_diff EQU 0
@@ -21,6 +21,8 @@
vp8_writer_count EQU 12
vp8_writer_pos EQU 16
vp8_writer_buffer EQU 20
+vp8_writer_buffer_end EQU 24
+vp8_writer_error EQU 28
tokenextra_token EQU 6
tokenextra_extra EQU 4
tokenextra_context_tree EQU 0
@@ -33,10 +35,11 @@
vp8_extra_bit_struct_prob EQU 4
vp8_extra_bit_struct_len EQU 8
vp8_extra_bit_struct_base_val EQU 12
-vp8_comp_tplist EQU 181220
-vp8_comp_common EQU 105408
-vp8_comp_bc2 EQU 128400
+vp8_comp_tplist EQU 170216
+vp8_comp_common EQU 104544
+vp8_comp_bc EQU 116816
+vp8_writer_sz EQU 40
tokenlist_start EQU 0
tokenlist_stop EQU 4
TOKENLIST_SZ EQU 8
-vp8_common_mb_rows EQU 12904
+vp8_common_mb_rows EQU 2216
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 d15accf..b2570ab 100644
--- a/third_party/libvpx/source/config/mac/ia32/vpx_config.asm
+++ b/third_party/libvpx/source/config/mac/ia32/vpx_config.asm
@@ -7,8 +7,6 @@
HAVE_ARMV5TE equ 0
HAVE_ARMV6 equ 0
HAVE_ARMV7 equ 0
-HAVE_IWMMXT equ 0
-HAVE_IWMMXT2 equ 0
HAVE_MIPS32 equ 0
HAVE_MMX equ 1
HAVE_SSE equ 1
@@ -63,3 +61,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
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 eb2da75..32df408 100644
--- a/third_party/libvpx/source/config/mac/ia32/vpx_config.c
+++ b/third_party/libvpx/source/config/mac/ia32/vpx_config.c
@@ -1,2 +1,9 @@
-static const char* const cfg = "--target=x86-darwin9-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats";
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/* */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* 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-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only";
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 26a491c..173b6fc 100644
--- a/third_party/libvpx/source/config/mac/ia32/vpx_config.h
+++ b/third_party/libvpx/source/config/mac/ia32/vpx_config.h
@@ -1,3 +1,10 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/* */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* 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. */
/* This file automatically generated by configure. Do not edit! */
#ifndef VPX_CONFIG_H
#define VPX_CONFIG_H
@@ -11,8 +18,6 @@
#define HAVE_ARMV5TE 0
#define HAVE_ARMV6 0
#define HAVE_ARMV7 0
-#define HAVE_IWMMXT 0
-#define HAVE_IWMMXT2 0
#define HAVE_MIPS32 0
#define HAVE_MMX 1
#define HAVE_SSE 1
@@ -67,4 +72,6 @@
#define CONFIG_SMALL 0
#define CONFIG_POSTPROC_VISUALIZER 0
#define CONFIG_OS_SUPPORT 1
+#define CONFIG_UNIT_TESTS 0
+#define CONFIG_MULTI_RES_ENCODING 0
#endif /* VPX_CONFIG_H */
diff --git a/third_party/libvpx/source/config/mac/ia32/vpx_version.h b/third_party/libvpx/source/config/mac/ia32/vpx_version.h
index 5eedf61..c685880 100644
--- a/third_party/libvpx/source/config/mac/ia32/vpx_version.h
+++ b/third_party/libvpx/source/config/mac/ia32/vpx_version.h
@@ -1,7 +1,7 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 9
#define VERSION_PATCH 7
-#define VERSION_EXTRA ""
+#define VERSION_EXTRA "p1-268-ge479379"
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
-#define VERSION_STRING_NOSP "v0.9.7"
-#define VERSION_STRING " v0.9.7"
+#define VERSION_STRING_NOSP "v0.9.7-p1-268-ge479379"
+#define VERSION_STRING " v0.9.7-p1-268-ge479379"
diff --git a/third_party/libvpx/source/config/mac/x64/asm_enc_offsets.asm b/third_party/libvpx/source/config/mac/x64/asm_enc_offsets.asm
index c79f211..3a678f9 100644
--- a/third_party/libvpx/source/config/mac/x64/asm_enc_offsets.asm
+++ b/third_party/libvpx/source/config/mac/x64/asm_enc_offsets.asm
@@ -7,9 +7,9 @@
vp8_block_zrun_zbin_boost EQU 48
vp8_block_quant_shift EQU 32
vp8_blockd_qcoeff EQU 0
-vp8_blockd_dequant EQU 32
+vp8_blockd_dequant EQU 24
vp8_blockd_dqcoeff EQU 8
-vp8_blockd_eob EQU 72
+vp8_blockd_eob EQU 64
vp8_block_base_src EQU 72
vp8_block_src EQU 80
vp8_block_src_diff EQU 0
@@ -21,6 +21,8 @@
vp8_writer_count EQU 12
vp8_writer_pos EQU 16
vp8_writer_buffer EQU 24
+vp8_writer_buffer_end EQU 32
+vp8_writer_error EQU 40
tokenextra_token EQU 10
tokenextra_extra EQU 8
tokenextra_context_tree EQU 0
@@ -33,10 +35,11 @@
vp8_extra_bit_struct_prob EQU 8
vp8_extra_bit_struct_len EQU 16
vp8_extra_bit_struct_base_val EQU 20
-vp8_comp_tplist EQU 183768
-vp8_comp_common EQU 107360
-vp8_comp_bc2 EQU 130768
+vp8_comp_tplist EQU 172952
+vp8_comp_common EQU 106496
+vp8_comp_bc EQU 119168
+vp8_writer_sz EQU 64
tokenlist_start EQU 0
tokenlist_stop EQU 8
TOKENLIST_SZ EQU 16
-vp8_common_mb_rows EQU 13092
+vp8_common_mb_rows EQU 2424
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 bc15c1b..f98d355 100644
--- a/third_party/libvpx/source/config/mac/x64/vpx_config.asm
+++ b/third_party/libvpx/source/config/mac/x64/vpx_config.asm
@@ -7,8 +7,6 @@
HAVE_ARMV5TE equ 0
HAVE_ARMV6 equ 0
HAVE_ARMV7 equ 0
-HAVE_IWMMXT equ 0
-HAVE_IWMMXT2 equ 0
HAVE_MIPS32 equ 0
HAVE_MMX equ 1
HAVE_SSE equ 1
@@ -63,3 +61,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
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 af5c16e..03e34a6 100644
--- a/third_party/libvpx/source/config/mac/x64/vpx_config.c
+++ b/third_party/libvpx/source/config/mac/x64/vpx_config.c
@@ -1,2 +1,9 @@
-static const char* const cfg = "--target=x86_64-darwin10-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats";
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/* */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* 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-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only";
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 97e3284..7eef378 100644
--- a/third_party/libvpx/source/config/mac/x64/vpx_config.h
+++ b/third_party/libvpx/source/config/mac/x64/vpx_config.h
@@ -1,3 +1,10 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/* */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* 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. */
/* This file automatically generated by configure. Do not edit! */
#ifndef VPX_CONFIG_H
#define VPX_CONFIG_H
@@ -11,8 +18,6 @@
#define HAVE_ARMV5TE 0
#define HAVE_ARMV6 0
#define HAVE_ARMV7 0
-#define HAVE_IWMMXT 0
-#define HAVE_IWMMXT2 0
#define HAVE_MIPS32 0
#define HAVE_MMX 1
#define HAVE_SSE 1
@@ -67,4 +72,6 @@
#define CONFIG_SMALL 0
#define CONFIG_POSTPROC_VISUALIZER 0
#define CONFIG_OS_SUPPORT 1
+#define CONFIG_UNIT_TESTS 0
+#define CONFIG_MULTI_RES_ENCODING 0
#endif /* VPX_CONFIG_H */
diff --git a/third_party/libvpx/source/config/mac/x64/vpx_version.h b/third_party/libvpx/source/config/mac/x64/vpx_version.h
index 5eedf61..c685880 100644
--- a/third_party/libvpx/source/config/mac/x64/vpx_version.h
+++ b/third_party/libvpx/source/config/mac/x64/vpx_version.h
@@ -1,7 +1,7 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 9
#define VERSION_PATCH 7
-#define VERSION_EXTRA ""
+#define VERSION_EXTRA "p1-268-ge479379"
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
-#define VERSION_STRING_NOSP "v0.9.7"
-#define VERSION_STRING " v0.9.7"
+#define VERSION_STRING_NOSP "v0.9.7-p1-268-ge479379"
+#define VERSION_STRING " v0.9.7-p1-268-ge479379"
diff --git a/third_party/libvpx/source/config/win/ia32/asm_dec_offsets.asm b/third_party/libvpx/source/config/win/ia32/asm_dec_offsets.asm
index 4ae949d..9c08b29 100644
--- a/third_party/libvpx/source/config/win/ia32/asm_dec_offsets.asm
+++ b/third_party/libvpx/source/config/win/ia32/asm_dec_offsets.asm
@@ -1,14 +1,3 @@
-detok_scan EQU 0
-detok_ptr_block2leftabove EQU 4
-detok_coef_tree_ptr EQU 8
-detok_norm_ptr EQU 12
-detok_ptr_coef_bands_x EQU 16
-detok_A EQU 20
-detok_L EQU 24
-detok_qcoeff_start_ptr EQU 28
-detok_current_bc EQU 32
-detok_coef_probs EQU 36
-detok_eob EQU 52
bool_decoder_user_buffer_end EQU 0
bool_decoder_user_buffer EQU 4
bool_decoder_value EQU 8
diff --git a/third_party/libvpx/source/config/win/ia32/asm_enc_offsets.asm b/third_party/libvpx/source/config/win/ia32/asm_enc_offsets.asm
index d69ffbe..a9fbc89 100644
--- a/third_party/libvpx/source/config/win/ia32/asm_enc_offsets.asm
+++ b/third_party/libvpx/source/config/win/ia32/asm_enc_offsets.asm
@@ -7,9 +7,9 @@
vp8_block_zrun_zbin_boost EQU 24
vp8_block_quant_shift EQU 16
vp8_blockd_qcoeff EQU 0
-vp8_blockd_dequant EQU 16
+vp8_blockd_dequant EQU 12
vp8_blockd_dqcoeff EQU 4
-vp8_blockd_eob EQU 44
+vp8_blockd_eob EQU 40
vp8_block_base_src EQU 36
vp8_block_src EQU 40
vp8_block_src_diff EQU 0
@@ -21,6 +21,8 @@
vp8_writer_count EQU 12
vp8_writer_pos EQU 16
vp8_writer_buffer EQU 20
+vp8_writer_buffer_end EQU 24
+vp8_writer_error EQU 28
tokenextra_token EQU 6
tokenextra_extra EQU 4
tokenextra_context_tree EQU 0
@@ -33,11 +35,12 @@
vp8_extra_bit_struct_prob EQU 4
vp8_extra_bit_struct_len EQU 8
vp8_extra_bit_struct_base_val EQU 12
-vp8_comp_tplist EQU 181240
-vp8_comp_common EQU 105408
-vp8_comp_bc2 EQU 128400
+vp8_comp_tplist EQU 170224
+vp8_comp_common EQU 104544
+vp8_comp_bc EQU 116800
+vp8_writer_sz EQU 40
tokenlist_start EQU 0
tokenlist_stop EQU 4
TOKENLIST_SZ EQU 8
-vp8_common_mb_rows EQU 12888
+vp8_common_mb_rows EQU 2200
END
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 31a5395..8d6bbcd 100644
--- a/third_party/libvpx/source/config/win/ia32/vpx_config.asm
+++ b/third_party/libvpx/source/config/win/ia32/vpx_config.asm
@@ -7,8 +7,6 @@
HAVE_ARMV5TE equ 0
HAVE_ARMV6 equ 0
HAVE_ARMV7 equ 0
-HAVE_IWMMXT equ 0
-HAVE_IWMMXT2 equ 0
HAVE_MIPS32 equ 0
HAVE_MMX equ 1
HAVE_SSE equ 1
@@ -54,7 +52,7 @@
CONFIG_VP8 equ 1
CONFIG_ENCODERS equ 1
CONFIG_DECODERS equ 1
-CONFIG_STATIC_MSVCRT equ 0
+CONFIG_STATIC_MSVCRT equ 1
CONFIG_SPATIAL_RESAMPLING equ 1
CONFIG_REALTIME_ONLY equ 1
CONFIG_ERROR_CONCEALMENT equ 1
@@ -63,3 +61,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
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 7eb4f1d..63351ab 100644
--- a/third_party/libvpx/source/config/win/ia32/vpx_config.c
+++ b/third_party/libvpx/source/config/win/ia32/vpx_config.c
@@ -1,2 +1,9 @@
-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";
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/* */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* 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";
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 f0353c2..d0019c7 100644
--- a/third_party/libvpx/source/config/win/ia32/vpx_config.h
+++ b/third_party/libvpx/source/config/win/ia32/vpx_config.h
@@ -1,3 +1,10 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/* */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* 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. */
/* This file automatically generated by configure. Do not edit! */
#ifndef VPX_CONFIG_H
#define VPX_CONFIG_H
@@ -11,8 +18,6 @@
#define HAVE_ARMV5TE 0
#define HAVE_ARMV6 0
#define HAVE_ARMV7 0
-#define HAVE_IWMMXT 0
-#define HAVE_IWMMXT2 0
#define HAVE_MIPS32 0
#define HAVE_MMX 1
#define HAVE_SSE 1
@@ -58,7 +63,7 @@
#define CONFIG_VP8 1
#define CONFIG_ENCODERS 1
#define CONFIG_DECODERS 1
-#define CONFIG_STATIC_MSVCRT 0
+#define CONFIG_STATIC_MSVCRT 1
#define CONFIG_SPATIAL_RESAMPLING 1
#define CONFIG_REALTIME_ONLY 1
#define CONFIG_ERROR_CONCEALMENT 1
@@ -67,4 +72,6 @@
#define CONFIG_SMALL 0
#define CONFIG_POSTPROC_VISUALIZER 0
#define CONFIG_OS_SUPPORT 1
+#define CONFIG_UNIT_TESTS 0
+#define CONFIG_MULTI_RES_ENCODING 0
#endif /* VPX_CONFIG_H */
diff --git a/third_party/libvpx/source/config/win/ia32/vpx_version.h b/third_party/libvpx/source/config/win/ia32/vpx_version.h
index 5eedf61..c685880 100644
--- a/third_party/libvpx/source/config/win/ia32/vpx_version.h
+++ b/third_party/libvpx/source/config/win/ia32/vpx_version.h
@@ -1,7 +1,7 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 9
#define VERSION_PATCH 7
-#define VERSION_EXTRA ""
+#define VERSION_EXTRA "p1-268-ge479379"
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
-#define VERSION_STRING_NOSP "v0.9.7"
-#define VERSION_STRING " v0.9.7"
+#define VERSION_STRING_NOSP "v0.9.7-p1-268-ge479379"
+#define VERSION_STRING " v0.9.7-p1-268-ge479379"
diff --git a/third_party/libvpx/source/config/win/x64/asm_dec_offsets.asm b/third_party/libvpx/source/config/win/x64/asm_dec_offsets.asm
index 406d89d..ba1d57a 100644
--- a/third_party/libvpx/source/config/win/x64/asm_dec_offsets.asm
+++ b/third_party/libvpx/source/config/win/x64/asm_dec_offsets.asm
@@ -1,14 +1,3 @@
-detok_scan EQU 0
-detok_ptr_block2leftabove EQU 8
-detok_coef_tree_ptr EQU 16
-detok_norm_ptr EQU 24
-detok_ptr_coef_bands_x EQU 32
-detok_A EQU 40
-detok_L EQU 48
-detok_qcoeff_start_ptr EQU 56
-detok_current_bc EQU 64
-detok_coef_probs EQU 72
-detok_eob EQU 104
bool_decoder_user_buffer_end EQU 0
bool_decoder_user_buffer EQU 8
bool_decoder_value EQU 16
diff --git a/third_party/libvpx/source/config/win/x64/asm_enc_offsets.asm b/third_party/libvpx/source/config/win/x64/asm_enc_offsets.asm
index 8291c7b..b5a9be8 100644
--- a/third_party/libvpx/source/config/win/x64/asm_enc_offsets.asm
+++ b/third_party/libvpx/source/config/win/x64/asm_enc_offsets.asm
@@ -7,9 +7,9 @@
vp8_block_zrun_zbin_boost EQU 48
vp8_block_quant_shift EQU 32
vp8_blockd_qcoeff EQU 0
-vp8_blockd_dequant EQU 32
+vp8_blockd_dequant EQU 24
vp8_blockd_dqcoeff EQU 8
-vp8_blockd_eob EQU 72
+vp8_blockd_eob EQU 64
vp8_block_base_src EQU 72
vp8_block_src EQU 80
vp8_block_src_diff EQU 0
@@ -21,6 +21,8 @@
vp8_writer_count EQU 12
vp8_writer_pos EQU 16
vp8_writer_buffer EQU 24
+vp8_writer_buffer_end EQU 32
+vp8_writer_error EQU 40
tokenextra_token EQU 10
tokenextra_extra EQU 8
tokenextra_context_tree EQU 0
@@ -33,11 +35,12 @@
vp8_extra_bit_struct_prob EQU 8
vp8_extra_bit_struct_len EQU 16
vp8_extra_bit_struct_base_val EQU 20
-vp8_comp_tplist EQU 183872
-vp8_comp_common EQU 107360
-vp8_comp_bc2 EQU 130872
+vp8_comp_tplist EQU 173000
+vp8_comp_common EQU 106496
+vp8_comp_bc EQU 119280
+vp8_writer_sz EQU 56
tokenlist_start EQU 0
tokenlist_stop EQU 8
TOKENLIST_SZ EQU 16
-vp8_common_mb_rows EQU 13204
+vp8_common_mb_rows EQU 2536
END
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 9f0a835..02c87dc 100644
--- a/third_party/libvpx/source/config/win/x64/vpx_config.asm
+++ b/third_party/libvpx/source/config/win/x64/vpx_config.asm
@@ -7,8 +7,6 @@
HAVE_ARMV5TE equ 0
HAVE_ARMV6 equ 0
HAVE_ARMV7 equ 0
-HAVE_IWMMXT equ 0
-HAVE_IWMMXT2 equ 0
HAVE_MIPS32 equ 0
HAVE_MMX equ 1
HAVE_SSE equ 1
@@ -54,7 +52,7 @@
CONFIG_VP8 equ 1
CONFIG_ENCODERS equ 1
CONFIG_DECODERS equ 1
-CONFIG_STATIC_MSVCRT equ 0
+CONFIG_STATIC_MSVCRT equ 1
CONFIG_SPATIAL_RESAMPLING equ 1
CONFIG_REALTIME_ONLY equ 1
CONFIG_ERROR_CONCEALMENT equ 1
@@ -63,3 +61,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
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 8003b31..19c1568 100644
--- a/third_party/libvpx/source/config/win/x64/vpx_config.c
+++ b/third_party/libvpx/source/config/win/x64/vpx_config.c
@@ -1,2 +1,9 @@
-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";
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/* */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* 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";
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 aea3b21..70bc430 100644
--- a/third_party/libvpx/source/config/win/x64/vpx_config.h
+++ b/third_party/libvpx/source/config/win/x64/vpx_config.h
@@ -1,3 +1,10 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/* */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* 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. */
/* This file automatically generated by configure. Do not edit! */
#ifndef VPX_CONFIG_H
#define VPX_CONFIG_H
@@ -11,8 +18,6 @@
#define HAVE_ARMV5TE 0
#define HAVE_ARMV6 0
#define HAVE_ARMV7 0
-#define HAVE_IWMMXT 0
-#define HAVE_IWMMXT2 0
#define HAVE_MIPS32 0
#define HAVE_MMX 1
#define HAVE_SSE 1
@@ -58,7 +63,7 @@
#define CONFIG_VP8 1
#define CONFIG_ENCODERS 1
#define CONFIG_DECODERS 1
-#define CONFIG_STATIC_MSVCRT 0
+#define CONFIG_STATIC_MSVCRT 1
#define CONFIG_SPATIAL_RESAMPLING 1
#define CONFIG_REALTIME_ONLY 1
#define CONFIG_ERROR_CONCEALMENT 1
@@ -67,4 +72,6 @@
#define CONFIG_SMALL 0
#define CONFIG_POSTPROC_VISUALIZER 0
#define CONFIG_OS_SUPPORT 1
+#define CONFIG_UNIT_TESTS 0
+#define CONFIG_MULTI_RES_ENCODING 0
#endif /* VPX_CONFIG_H */
diff --git a/third_party/libvpx/source/config/win/x64/vpx_version.h b/third_party/libvpx/source/config/win/x64/vpx_version.h
index 5eedf61..c685880 100644
--- a/third_party/libvpx/source/config/win/x64/vpx_version.h
+++ b/third_party/libvpx/source/config/win/x64/vpx_version.h
@@ -1,7 +1,7 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 9
#define VERSION_PATCH 7
-#define VERSION_EXTRA ""
+#define VERSION_EXTRA "p1-268-ge479379"
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
-#define VERSION_STRING_NOSP "v0.9.7"
-#define VERSION_STRING " v0.9.7"
+#define VERSION_STRING_NOSP "v0.9.7-p1-268-ge479379"
+#define VERSION_STRING " v0.9.7-p1-268-ge479379"
