Roll libvpx to c522217d.

Also changing generate_gypi.sh to sort the list of files before writing gypis.

TBR=andrew@webrtc.org

BUG=

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2657 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
stefan@webrtc.org 2012-08-22 20:14:33 +00:00
parent 1ec2b38926
commit 727a9f5648
6 changed files with 79 additions and 79 deletions

2
DEPS
View File

@ -48,7 +48,7 @@ deps = {
From("chromium_deps", "src/third_party/libjpeg_turbo"),
"third_party/libvpx/source/libvpx":
"http://git.chromium.org/webm/libvpx.git@8bec177d",
"http://git.chromium.org/webm/libvpx.git@c522217d",
"third_party/libyuv":
(Var("googlecode_url") % "libyuv") + "/trunk@255",

View File

@ -29,7 +29,7 @@ function convert_srcs_to_gypi {
# 2. Exclude *_offsets.c.
# 3. Exclude vpx_config.c.
# 4. Repelace .asm.s to .asm because gyp will do the conversion.
local source_list=`grep -E '(\.c|\.h|\.S|\.s|\.asm)$' $1 | grep -v '_offsets\.c' | grep -v 'vpx_config\.c' | sed s/\.asm\.s$/.asm/`
local source_list=`grep -E '(\.c|\.h|\.S|\.s|\.asm)$' $1 | grep -v '_offsets\.c' | grep -v 'vpx_config\.c' | sed s/\.asm\.s$/.asm/ | sort`
# Build the gypi file.
echo "# This file is generated. Do not edit." > $2

View File

@ -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_filters.c',
'source/libvpx/vp8/common/loopfilter.h',
'source/libvpx/vp8/common/loopfilter_filters.c',
'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_c.c',
'source/libvpx/vp8/common/variance.h',
'source/libvpx/vp8/common/variance_c.c',
'source/libvpx/vp8/common/vp8_entropymodedata.h',
'source/libvpx/vp8/decoder/dboolhuff.c',
'source/libvpx/vp8/decoder/dboolhuff.h',
@ -141,11 +141,25 @@
'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_cpudetect.c',
'source/libvpx/vpx_ports/arm.h',
'source/libvpx/vpx_ports/arm_cpudetect.c',
'source/libvpx/vpx_ports/asm_offsets.h',
'source/libvpx/vpx_ports/mem.h',
'source/libvpx/vpx_ports/vpx_timer.h',
@ -157,19 +171,5 @@
'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',
],
}

View File

@ -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_filters.c',
'source/libvpx/vp8/common/loopfilter.h',
'source/libvpx/vp8/common/loopfilter_filters.c',
'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_c.c',
'source/libvpx/vp8/common/variance.h',
'source/libvpx/vp8/common/variance_c.c',
'source/libvpx/vp8/common/vp8_entropymodedata.h',
'source/libvpx/vp8/decoder/dboolhuff.c',
'source/libvpx/vp8/decoder/dboolhuff.h',
@ -207,17 +207,31 @@
'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_cpudetect.c',
'source/libvpx/vpx_ports/arm.h',
'source/libvpx/vpx_ports/arm_cpudetect.c',
'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',
@ -228,19 +242,5 @@
'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',
],
}

View File

@ -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_filters.c',
'source/libvpx/vp8/common/loopfilter.h',
'source/libvpx/vp8/common/loopfilter_filters.c',
'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_c.c',
'source/libvpx/vp8/common/variance.h',
'source/libvpx/vp8/common/variance_c.c',
'source/libvpx/vp8/common/vp8_entropymodedata.h',
'source/libvpx/vp8/common/x86/dequantize_mmx.asm',
'source/libvpx/vp8/common/x86/filter_x86.c',
@ -177,6 +177,20 @@
'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',
@ -184,9 +198,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',
@ -195,19 +209,5 @@
'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',
],
}

View File

@ -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_filters.c',
'source/libvpx/vp8/common/loopfilter.h',
'source/libvpx/vp8/common/loopfilter_filters.c',
'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_c.c',
'source/libvpx/vp8/common/variance.h',
'source/libvpx/vp8/common/variance_c.c',
'source/libvpx/vp8/common/vp8_entropymodedata.h',
'source/libvpx/vp8/common/x86/dequantize_mmx.asm',
'source/libvpx/vp8/common/x86/filter_x86.c',
@ -180,6 +180,20 @@
'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',
@ -187,9 +201,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',
@ -198,19 +212,5 @@
'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',
],
}