summaryrefslogtreecommitdiffstats
path: root/third_party/ffmpeg/ffmpeg.gyp
Commit message (Collapse)AuthorAgeFilesLines
* ffmpeg roll to deps version that contains gyp and sourcefbarchard@chromium.org2010-06-021-859/+0
| | | | | | | | | BUG=42238 TEST=none Review URL: http://codereview.chromium.org/2475001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48697 0039d316-1c4b-4281-b951-d872f2087c98
* Add use_system_vpx flag.agl@chromium.org2010-05-211-4/+24
| | | | | | | | | | This allows Chromium to build against libvpx as provided by the system. Patch based on one from fta. http://codereview.chromium.org/2075023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47943 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 47832 - Roll DEPS for libvpx and enable VP8/WebM for Chromium ARM builds.robertshield@chromium.org2010-05-201-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This broke the Chromium Arm compile: flock /b/slave/chromium-rel-arm/build/src/sconsbuild/linker.lock \/usr/local/crosstool-trusted/arm-2009q3/bin/arm-none-linux-gnueabi-g++ -B/usr/local/tot-binutils/arm-none-linux-gnueabi/bin -shared -pthread -Wl,-z,noexecstack -Wl,-Bsymbolic -Lout/Release/obj/gen/third_party/ffmpeg -Lthird_party/libvpx/lib/linux/arm-neon --sysroot=/usr/local/arm-rootfs -Wl,--gc-sections -Wl,-soname=libffmpegsumo.so -o out/Release/obj.target/third_party/ffmpeg/libffmpegsumo.so -Wl,--start-group out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/allcodecs.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/audioconvert.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/avpacket.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/bitstream.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/bitstream_filter.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/dsputil.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/eval.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/faanidct.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/fft.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/golomb.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/imgconvert.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/jrevdct.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/libvpxdec.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/mdct.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/mpeg12data.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/mpeg4audio.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/opt.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/options.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/parser.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/pthread.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/raw.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/simple_idct.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/utils.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/vorbis.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/vorbis_data.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/vorbis_dec.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/vp3.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/vp3dsp.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/xiph.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/allformats.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/avi.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/avio.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/aviobuf.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/cutils.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/id3v1.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/isom.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/matroska.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/matroskadec.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/metadata.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/metadata_compat.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/oggdec.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/oggparseogm.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/oggparsetheora.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/oggparsevorbis.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/options.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/riff.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/rm.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/rmdec.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/utils.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/vorbiscomment.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/avstring.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/base64.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/crc.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/intfloat_readwrite.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/log.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/lzo.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/mathematics.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/mem.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/pixdesc.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/rational.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/pcm.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/raw.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/wav.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/dsputil_arm.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/dsputil_armv6.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_arm.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_armv5te.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_armv6.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_vfp.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/dsputil_vfp.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/fft_init_arm.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/jrevdct_arm.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_arm.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_armv5te.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_armv6.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_neon.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/dsputil_neon.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/fft_neon.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/int_neon.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/rdft_neon.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_neon.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/vp3dsp_neon.o out/Release/obj.target/ffmpegsumo/third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/arm/mdct_neon.o -Wl,--end-group -lvpx -lz /usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(vpx_codec.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC /usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(vp8_dx_iface.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC /usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(onyxd_if.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC /usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(threading.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC /usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(vpx_config.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC /usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(scalesystemdependant.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC /usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(yv12extend_arm.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC /usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(entropy.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC /usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(entropymode.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC /usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(loopfilter.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC /usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(systemdependent.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC /usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(decodframe.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC /usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(demode.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC /usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(detokenize.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC /usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(findnearmv.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC /usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(quant_common.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC /usr/local/tot-binutils/arm-none-linux-gnueabi/bin/ld: error: third_party/libvpx/lib/linux/arm-neon/libvpx.a(decodemv.c.o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC collect2: ld returned 1 exit status TBR=scherkus@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47841 0039d316-1c4b-4281-b951-d872f2087c98
* Roll DEPS for libvpx and enable VP8/WebM for Chromium ARM builds.scherkus@chromium.org2010-05-201-12/+3
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47832 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing Chromium ARM build break.scherkus@chromium.org2010-05-201-1/+10
| | | | | | We don't have an ARM libvpx.a available yet, hence FFmpeg not linking. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47772 0039d316-1c4b-4281-b951-d872f2087c98
* Chromium side changes for enabling VP8 and WebM support.scherkus@chromium.org2010-05-201-1/+23
| | | | | | | | | | | Patches by Frank Galligan (fgalligan@google.com), Tom Finegan (tomfinegan@google.com) and James Zern (jzern@google.com). BUG=none TEST=none Review URL: http://codereview.chromium.org/2093007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47759 0039d316-1c4b-4281-b951-d872f2087c98
* GYP changes for FreeBSD and OpenBSDpvalchev@google.com2010-05-141-2/+2
| | | | | | Review URL: http://codereview.chromium.org/1480002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47327 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg move a file from neon to arm section for build errorfbarchard@chromium.org2010-04-301-1/+1
| | | | | | | | | BUG=42845 TEST=arm chrome should build Review URL: http://codereview.chromium.org/1801009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46111 0039d316-1c4b-4281-b951-d872f2087c98
* gyp: unify toolkit_views usageevan@chromium.org2010-04-271-2/+2
| | | | | | | | | | | Now that we can rely on toolkit_views to be set when appropriate, we can simplify a bunch of logic in gyp. TEST=compiles Review URL: http://codereview.chromium.org/1741010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45727 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg add mkv, remove bzlib and zlibfbarchard@chromium.org2010-04-231-8/+8
| | | | | | | | BUG=42306, 42307 TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45451 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 45438 - ffmpeg add mkv, remove bzlib and zlibfbarchard@chromium.org2010-04-231-5/+5
| | | | | | | | | | | BUG=42306, 42307 TEST=none TBR=fbarchard@chromium.org Review URL: http://codereview.chromium.org/1751012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45439 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg add mkv, remove bzlib and zlibfbarchard@chromium.org2010-04-231-5/+5
| | | | | | | | BUG=42306, 42307 TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45438 0039d316-1c4b-4281-b951-d872f2087c98
* clean up comments in gyp filefbarchard@chromium.org2010-04-081-46/+46
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/1542022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43984 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg fix for neonfbarchard@chromium.org2010-04-071-4/+2
| | | | | | | | | BUG=none TEST=NONE Review URL: http://codereview.chromium.org/1617009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43809 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg new config files for roll5fbarchard@chromium.org2010-04-071-1/+7
| | | | | | | | | BUG=none TEST=ffmpeg should still build Review URL: http://codereview.chromium.org/1564004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43794 0039d316-1c4b-4281-b951-d872f2087c98
* Add build_ffmpegsumo GYP variable that controls whether libffmpegsumo is built.scherkus@chromium.org2010-03-311-3/+22
| | | | | | | | | | | This replicates the old behaviour of use_system_ffmpeg, where Chromium is built against the patched set of FFmpeg headers, but relies on the system or user to provide FFmpeg binaires at run time. BUG=39430 TEST=build_ffmpegsumo=0 should result in libffmpegsumo.so not getting built Review URL: http://codereview.chromium.org/1569006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43240 0039d316-1c4b-4281-b951-d872f2087c98
* Fix use_system_ffmpeg and clean up ffmpeg.gypscherkus@chromium.org2010-03-301-196/+158
| | | | | | | | | | | | | To make use_system_ffmpeg work more correctly, we now use the system include path for headers and make use of the version number macros to determine the shared library names. Also removed a bunch of cruft without breaking anything on Windows, Mac or Linux. BUG=23602, 39430 TEST=ffmpeg should still work both with and without use_system_ffmpeg Review URL: http://codereview.chromium.org/1503002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43030 0039d316-1c4b-4281-b951-d872f2087c98
* Removed custom FFmpegLock. Removed ffmpeg headers from ↵scherkus@chromium.org2010-03-251-4/+6
| | | | | | | | | | | | | third_party/ffmpeg/include. Patch by sergeyu@chromium.org BUG=23271 TEST=none Review URL: http://codereview.chromium.org/1289003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42573 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 42415 - Removed custom FFmpegLock. Removed ffmpeg headers from ↵scherkus@chromium.org2010-03-241-6/+4
| | | | | | | | | | | | | | | | third_party/ffmpeg/include. Patch by sergeyu@chromium.org BUG=23271 TEST=none Review URL: http://codereview.chromium.org/1213002 TBR=scherkus@chromium.org Review URL: http://codereview.chromium.org/1240002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42422 0039d316-1c4b-4281-b951-d872f2087c98
* Removed custom FFmpegLock. Removed ffmpeg headers from ↵scherkus@chromium.org2010-03-241-4/+6
| | | | | | | | | | | | | third_party/ffmpeg/include. Patch by sergeyu@chromium.org BUG=23271 TEST=none Review URL: http://codereview.chromium.org/1213002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42415 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg enable wmaprofbarchard@chromium.org2010-03-231-1/+1
| | | | | | | | | BUG=38321 TEST=make a wmapro using windows media encoder, and play it with chromeos Review URL: http://codereview.chromium.org/1107014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42314 0039d316-1c4b-4281-b951-d872f2087c98
* Roll deps to pick up ffmpeg fix from r42082 and fix a missing file in ↵thestig@chromium.org2010-03-191-0/+1
| | | | | | | | | | | ffmpeg.gyp. TBR=fbarchard BUG=none TEST=none Review URL: http://codereview.chromium.org/1133006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42084 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg - roll deps to get missing arm files and add int_neon.S to source in ↵fbarchard@chromium.org2010-03-181-0/+1
| | | | | | | | | | | ffmpeg BUG=38477 TEST=build linux arm debug mode Review URL: http://codereview.chromium.org/1073001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41908 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg roll to new source that includes HE AACfbarchard@chromium.org2010-03-171-16/+16
| | | | | | | | BUG=35850 TEST=FFMPEG should still build/run Review URL: http://codereview.chromium.org/862005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41893 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 41386 - Removed custom FFmpegLock. Removed ffmpeg headers from ↵jrg@chromium.org2010-03-121-6/+4
| | | | | | | | | | | | | | | | | | | | | third_party/ffmpeg/include. Bot unhappy Automatic: "media_unittests" on "Vista Tests" from 41386: ... scherkus@chromium.org ... http://chrome-buildbot:8010/builders/Vista%20Tests/builds/17009/steps/media_unittests/logs/stdio Patch by sergeyu@chromium.org BUG=23271 TEST=none Review URL: http://codereview.chromium.org/909002 TBR=scherkus@chromium.org Review URL: http://codereview.chromium.org/854006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41389 0039d316-1c4b-4281-b951-d872f2087c98
* Removed custom FFmpegLock. Removed ffmpeg headers from ↵scherkus@chromium.org2010-03-121-4/+6
| | | | | | | | | | | | | third_party/ffmpeg/include. Patch by sergeyu@chromium.org BUG=23271 TEST=none Review URL: http://codereview.chromium.org/909002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41386 0039d316-1c4b-4281-b951-d872f2087c98
* svn prop fixes. Applied to all files not in third_party.pkasting@chromium.org2010-03-091-0/+0
| | | | | | | | | | | | * Removed eol-style, executable and mergeinfo from BMP/GIF/ICO/JPEG files, and set correct mime-type. * Removed executable and mergeinfo from .c/.cc/.cpp/.h/.m/.mm and .gyp files, and set eol-style to LF. TBR=evanm BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40991 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg disable -fno-omit-frame-pointer to allow valgrind to build without ↵fbarchard@chromium.org2010-03-041-3/+7
| | | | | | | | | | | requiring ffmpeg #define HAVE_EBP_AVAILABLE 0 and #define HAVE_EBX_AVAILABLE 0 BUG=37358 TEST=build with valgrind configuration. Review URL: http://codereview.chromium.org/668011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40574 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg build vc1 bsfs for chromeosfbarchard@chromium.org2010-03-031-0/+3
| | | | | | | | | BUG=37309 TEST=build ffmpeg for ChromeOS on arm. Review URL: http://codereview.chromium.org/665002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40528 0039d316-1c4b-4281-b951-d872f2087c98
* Generate stubs for OpenMAX ILhclam@chromium.org2010-03-021-1/+1
| | | | | | | | | | | | Generate stubs for OpenMAX IL so we don't need a real OpenMAX library for building. The actual library is loaded during runtime. TEST=Build is green TEST=Running omx_test works on hardware with OpenMAX support Review URL: http://codereview.chromium.org/661135 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40418 0039d316-1c4b-4281-b951-d872f2087c98
* roll to ffmpeg that respects dirac and remove from ffmpeg.gypfbarchard@chromium.org2010-03-011-3/+0
| | | | | | | | | BUG=35850 TEST=ffmpeg should still build and be smaller. Review URL: http://codereview.chromium.org/660333 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40320 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg roll to source that allows flac to be removed and remove flac from ↵fbarchard@chromium.org2010-03-011-4/+0
| | | | | | | | | | | ffmpeg.gyp BUG=35850 TEST=ffmpeg should still build Review URL: http://codereview.chromium.org/661314 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40315 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg configurations to include bit stream filters.fbarchard@chromium.org2010-03-011-8/+13
| | | | | | | | | | arm/arm-neon regenerated using ./configure with --enable-neon or --disable-neon. BUG=35850 TEST=use openmax to playback videos. (nontrivial) Review URL: http://codereview.chromium.org/660293 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40303 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg/arm add missing file that got lostpiman@chromium.org2010-02-261-0/+1
| | | | | | Review URL: http://codereview.chromium.org/661214 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40176 0039d316-1c4b-4281-b951-d872f2087c98
* Separate neon flags from armv7, because some platforms have armv7a but no neon.piman@chromium.org2010-02-261-15/+28
| | | | | | | | For ffmpeg, I copied the "arm" configs (which include neon) into "arm-neon" configs, and changed HAVE_NEON=1 to 0 in the existing ones. Also, I removed the explicit cflags in ffmpeg.gyp since they are already set in common.gypi Review URL: http://codereview.chromium.org/660067 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40163 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg - add WAV support for chromiumos media player.fbarchard@chromium.org2010-02-191-3/+7
| | | | | | | | | | | BUG=32756 TEST=build with chromeos=1 and branding=Chromium Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=39335 Review URL: http://codereview.chromium.org/641001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39477 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 39335 - ffmpeg add WAV support for chromiumos media player.brettw@chromium.org2010-02-181-6/+2
| | | | | | | | | | | | BUG=32756 TEST=build with chromeos=1 and branding=Chromium Review URL: http://codereview.chromium.org/641001 TBR=fbarchard@chromium.org Review URL: http://codereview.chromium.org/647002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39336 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg - add WAV support for chromiumos media player.fbarchard@chromium.org2010-02-181-2/+6
| | | | | | | | | BUG=32756 TEST=build with chromeos=1 and branding=Chromium Review URL: http://codereview.chromium.org/641001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39335 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg additional source files for chromeos armfbarchard@chromium.org2010-02-171-0/+8
| | | | | | | | | BUG=32756 TEST=build with ffmpeg_branding=ChromeOS Review URL: http://codereview.chromium.org/614007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39176 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg add solaris support.fbarchard@chromium.org2010-02-171-8/+8
| | | | | | | | | | | Original version by electricmonopole@gmail.com Code based on this review http://codereview.chromium.org/606075 BUG=30101 TEST=build ffmpeg on solaris. Review URL: http://codereview.chromium.org/606076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39169 0039d316-1c4b-4281-b951-d872f2087c98
* FFmpeg requires additional arm source code for chromium linux arm.fbarchard@chromium.org2010-02-161-0/+4
| | | | | | | | | BUG=32755 TEST=build chromium on arm. Review URL: http://codereview.chromium.org/606072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39140 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg on arm needs different assembly files.fbarchard@chromium.org2010-02-121-7/+15
| | | | | | | | | BUG=32755 TEST=linux arm version should build. Review URL: http://codereview.chromium.org/596089 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38976 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg roll the deps which pulls in the new source, the gyp that builds the ↵fbarchard@chromium.org2010-02-121-4/+24
| | | | | | | | | | | new files and the config.h files for every platform. BUG=32755 TEST=build chromium/chrome on all platforms. Review URL: http://codereview.chromium.org/578024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38869 0039d316-1c4b-4281-b951-d872f2087c98
* Include test_shell.gypi in webkit.gyp instead of maintaining a distinctmark@chromium.org2010-02-101-1/+1
| | | | | | | | | | | | | | | | | | test_shell.gyp. This allows the removal of webkit.gyp:pull_in_test_shell, eliminating the circular relationship between webkit.gyp and test_shell.gyp. The expected semantics of building all of test_shell during a webkit.gyp:All build is performed are retained. This change depends on GYP r781 (in Chromium at r38526) for GYP suffix operator path section treatment. It also depends on Chromium r38519 and r38658 for common.gypi treatment of chromium_code. BUG=33186 TEST=Xcode no longer holds stale project files in memory Review URL: http://codereview.chromium.org/602006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38664 0039d316-1c4b-4281-b951-d872f2087c98
* OpenBSD/FreeBSD GYP changes (most of the remaining ones)pvalchev@google.com2010-02-041-7/+9
| | | | | | Review URL: http://codereview.chromium.org/565043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38079 0039d316-1c4b-4281-b951-d872f2087c98
* Make chromium and chromiumos for arm use the same options and turn off Neon.fbarchard@chromium.org2010-01-231-0/+3
| | | | | | | | | BUG=30817 TEST=build chromiumos for arm. This should build/link. Previously there were link errors. Review URL: http://codereview.chromium.org/543159 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36953 0039d316-1c4b-4281-b951-d872f2087c98
* Use chromeos branding for toolkit_views build.oshima@chromium.org2009-12-231-1/+1
| | | | | | | | | | | This is temp change until we fully migrage chromeos build to views. I'll revert this change once it happens. BUG=None TEST=None Review URL: http://codereview.chromium.org/516011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35231 0039d316-1c4b-4281-b951-d872f2087c98
* Implementation of OmxVideoDecodeEngine.ajwong@chromium.org2009-12-221-0/+1
| | | | | | | | | | | | | | | | | | Also moves FFmpegVideoDecodeEngine FFmpegVideoDecoder, OmxVideoDecoder, and VideoDecoderImpl into their own files. Refactors FFmpegDemuxerTest to be less of a characterization test, and to hopefully be less fragile. Creates a set of utilities for handling Callbacks versus Tasks, and resource management related to Callbacks. Re-enables the annexb filters for the chrome build of FFmpeg. Added a BitstreamConverter class that abstracts the bitstream filter code. Cleans up a few gyp mistakes with flag exporting. Review URL: http://codereview.chromium.org/492023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35171 0039d316-1c4b-4281-b951-d872f2087c98
* Fix FFmpeg build for ARMhclam@chromium.org2009-12-111-12/+22
| | | | | | | | Add missing config.h. Review URL: http://codereview.chromium.org/491010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34315 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg remove ununsed ffmpeg source files, move some from chromium to chrome ↵fbarchard@chromium.org2009-12-101-11/+15
| | | | | | | | | | | or chromeos, and add fpic for arm. remove bsf from all but arm BUG=29934 TEST=make -j6 -r player_x11 BUILDTYPE=Release for all platforms and ensure they still link. Use size libffmpegsumo.so to confirm size has been reduced. Review URL: http://codereview.chromium.org/483007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34284 0039d316-1c4b-4281-b951-d872f2087c98