New file formats for ChromeOS: wmv, wma, avi and wav.

Review URL: http://codereview.chromium.org/466073

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34126 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 68 insertions, 53 deletions

diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index 83d8528..91a796e 100755
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -70,37 +70,18 @@
           'target_name': 'ffmpegsumo',
           'type': 'shared_library',
           'sources': [
-            'source/patched-ffmpeg-mt/libavcodec/aac.c',
-            'source/patched-ffmpeg-mt/libavcodec/aac_ac3_parser.c',
-            'source/patched-ffmpeg-mt/libavcodec/aac_parser.c',
-            'source/patched-ffmpeg-mt/libavcodec/aactab.c',
             'source/patched-ffmpeg-mt/libavcodec/allcodecs.c',
             'source/patched-ffmpeg-mt/libavcodec/audioconvert.c',
             'source/patched-ffmpeg-mt/libavcodec/avpacket.c',
             'source/patched-ffmpeg-mt/libavcodec/bitstream.c',
             'source/patched-ffmpeg-mt/libavcodec/bitstream_filter.c',
-            'source/patched-ffmpeg-mt/libavcodec/cabac.c',
             'source/patched-ffmpeg-mt/libavcodec/dsputil.c',
-            'source/patched-ffmpeg-mt/libavcodec/error_resilience.c',
             'source/patched-ffmpeg-mt/libavcodec/eval.c',
             'source/patched-ffmpeg-mt/libavcodec/faanidct.c',
             'source/patched-ffmpeg-mt/libavcodec/fft.c',
-            'source/patched-ffmpeg-mt/libavcodec/golomb.c',
-            'source/patched-ffmpeg-mt/libavcodec/h264.c',
-            'source/patched-ffmpeg-mt/libavcodec/h264_mp4toannexb_bsf.c',
-            'source/patched-ffmpeg-mt/libavcodec/h264_parser.c',
-            'source/patched-ffmpeg-mt/libavcodec/h264idct.c',
-            'source/patched-ffmpeg-mt/libavcodec/h264pred.c',
             'source/patched-ffmpeg-mt/libavcodec/imgconvert.c',
             'source/patched-ffmpeg-mt/libavcodec/jrevdct.c',
             'source/patched-ffmpeg-mt/libavcodec/mdct.c',
-            'source/patched-ffmpeg-mt/libavcodec/mpeg4audio.c',
-            'source/patched-ffmpeg-mt/libavcodec/mpegaudio.c',
-            'source/patched-ffmpeg-mt/libavcodec/mpegaudio_parser.c',
-            'source/patched-ffmpeg-mt/libavcodec/mpegaudiodata.c',
-            'source/patched-ffmpeg-mt/libavcodec/mpegaudiodec.c',
-            'source/patched-ffmpeg-mt/libavcodec/mpegaudiodecheader.c',
-            'source/patched-ffmpeg-mt/libavcodec/mpegvideo.c',
             'source/patched-ffmpeg-mt/libavcodec/opt.c',
             'source/patched-ffmpeg-mt/libavcodec/options.c',
             'source/patched-ffmpeg-mt/libavcodec/parser.c',
@@ -120,12 +101,8 @@
             'source/patched-ffmpeg-mt/libavformat/avio.c',
             'source/patched-ffmpeg-mt/libavformat/aviobuf.c',
             'source/patched-ffmpeg-mt/libavformat/cutils.c',
-            'source/patched-ffmpeg-mt/libavformat/id3v2.c',
-            'source/patched-ffmpeg-mt/libavformat/isom.c',
             'source/patched-ffmpeg-mt/libavformat/metadata.c',
             'source/patched-ffmpeg-mt/libavformat/metadata_compat.c',
-            'source/patched-ffmpeg-mt/libavformat/mov.c',
-            'source/patched-ffmpeg-mt/libavformat/mp3.c',
             'source/patched-ffmpeg-mt/libavformat/oggdec.c',
             'source/patched-ffmpeg-mt/libavformat/oggparseogm.c',
             'source/patched-ffmpeg-mt/libavformat/oggparsetheora.c',
@@ -142,7 +119,6 @@
             'source/patched-ffmpeg-mt/libavutil/mathematics.c',
             'source/patched-ffmpeg-mt/libavutil/mem.c',
             'source/patched-ffmpeg-mt/libavutil/rational.c',
-
             # Config file for the OS and architecture.
             'source/config/<(ffmpeg_branding)/<(OS)/<(target_arch)/config.h',
           ],
@@ -158,10 +134,8 @@
             '-fomit-frame-pointer',
           ],
           'conditions': [
-            ['ffmpeg_branding!="Chrome"', {
-              'sources!': [
-                # Exclude files that should only be used if doing a branded
-                # Google Chrome build.
+            ['ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS"', {
+              'sources': [
                 'source/patched-ffmpeg-mt/libavcodec/aac.c',
                 'source/patched-ffmpeg-mt/libavcodec/aac_ac3_parser.c',
                 'source/patched-ffmpeg-mt/libavcodec/aac_parser.c',
@@ -186,6 +160,37 @@
                 'source/patched-ffmpeg-mt/libavformat/mp3.c',
               ],
             }],  # ffmpeg_branding
+            ['ffmpeg_branding=="ChromeOS"', {
+              'sources': [
+		'source/patched-ffmpeg-mt/libavcodec/h263.c',
+                'source/patched-ffmpeg-mt/libavcodec/h263dec.c',
+                'source/patched-ffmpeg-mt/libavcodec/h264_mp4toannexb_bsf.c',
+                'source/patched-ffmpeg-mt/libavcodec/intrax8.c',
+                'source/patched-ffmpeg-mt/libavcodec/intrax8dsp.c',
+                'source/patched-ffmpeg-mt/libavcodec/mpeg12data.c',
+                # TODO(fbarchard): add mpeg4 bsf
+                #'source/patched-ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c',
+		'source/patched-ffmpeg-mt/libavcodec/mpeg4video_parser.c',
+                'source/patched-ffmpeg-mt/libavcodec/msmpeg4.c',
+                'source/patched-ffmpeg-mt/libavcodec/msmpeg4data.c',
+                'source/patched-ffmpeg-mt/libavcodec/pcm.c',
+                'source/patched-ffmpeg-mt/libavcodec/vc1.c',
+                'source/patched-ffmpeg-mt/libavcodec/vc1data.c',
+                'source/patched-ffmpeg-mt/libavcodec/vc1dsp.c',
+                'source/patched-ffmpeg-mt/libavcodec/wma.c',
+                'source/patched-ffmpeg-mt/libavcodec/wmadec.c',
+                'source/patched-ffmpeg-mt/libavcodec/wmv2.c',
+                'source/patched-ffmpeg-mt/libavcodec/wmv2dec.c',
+                'source/patched-ffmpeg-mt/libavformat/asf.c',
+                'source/patched-ffmpeg-mt/libavformat/asfcrypt.c',
+                'source/patched-ffmpeg-mt/libavformat/asfdec.c',
+                'source/patched-ffmpeg-mt/libavformat/avidec.c',
+                'source/patched-ffmpeg-mt/libavformat/raw.c',
+                'source/patched-ffmpeg-mt/libavformat/wav.c',
+                'source/patched-ffmpeg-mt/libavutil/des.c',
+                'source/patched-ffmpeg-mt/libavutil/rc4.c',
+              ],
+            }],  # ffmpeg_branding
             ['target_arch=="ia32" or target_arch=="x64"', {
               'dependencies': [
                 'make_ffmpeg_asm_lib',
@@ -207,6 +212,16 @@
                 'source/patched-ffmpeg-mt/libavcodec/x86/vp3dsp_sse2.c',
               ],
             }],
+            ['(target_arch=="ia32" or target_arch=="x64") and ' +
+	        'ffmpeg_branding=="ChromeOS"', {
+              'dependencies': [
+                'make_ffmpeg_asm_lib',
+              ],
+              'sources': [
+                'source/patched-ffmpeg-mt/libavcodec/x86/dsputil_mmx.c',
+                'source/patched-ffmpeg-mt/libavcodec/x86/vc1dsp_mmx.c',
+              ],
+            }],
             ['target_arch=="x64"', {
               # x64 requires PIC for shared libraries. This is opposite
               # of ia32 where due to a slew of inline assembly using ebx,
diff --git a/third_party/ffmpeg/source/config/ChromeOS/linux/arm/config.h b/third_party/ffmpeg/source/config/ChromeOS/linux/arm/config.h
index 0b688db..efca54c 100644
--- a/third_party/ffmpeg/source/config/ChromeOS/linux/arm/config.h
+++ b/third_party/ffmpeg/source/config/ChromeOS/linux/arm/config.h
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --enable-shared --disable-static --disable-debug --enable-pthreads --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --enable-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=mp3 --enable-demuxer=mov --enable-demuxer=ogg --enable-parser=mpegaudio --enable-bsf=h264_mp4toannexb --prefix=/tmp/nothing --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32"
+#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --enable-shared --disable-static --disable-debug --enable-pthreads --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --enable-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-decoder=theora --enable-decoder=vorbis --disable-decoder=flac --enable-demuxer=mp3 --enable-demuxer=mov --enable-demuxer=ogg --enable-demuxer=avi --enable-demuxer=wav --enable-demuxer=asf --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=mpeg4 --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-bsf=h264_mp4toannexb --enable-parser=mpegaudio --prefix=/tmp/nothing --enable-cross-compile --arch=arm --enable-armv6 --enable-armv6t2 --extra-cflags=\"-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp\""
 #define FFMPEG_DATADIR "/tmp/nothing/share/ffmpeg"
 #define ARCH_ALPHA 0
 #define ARCH_ARM 1
@@ -218,7 +218,7 @@
 #define CONFIG_MPEG_XVMC_DECODER 0
 #define CONFIG_MPEG1VIDEO_DECODER 0
 #define CONFIG_MPEG2VIDEO_DECODER 0
-#define CONFIG_MPEG4_DECODER 0
+#define CONFIG_MPEG4_DECODER 1
 #define CONFIG_MPEGVIDEO_DECODER 0
 #define CONFIG_MPEG_VDPAU_DECODER 0
 #define CONFIG_MPEG1_VDPAU_DECODER 0
@@ -280,9 +280,9 @@
 #define CONFIG_VP6A_DECODER 0
 #define CONFIG_VP6F_DECODER 0
 #define CONFIG_VQA_DECODER 0
-#define CONFIG_WMV1_DECODER 0
-#define CONFIG_WMV2_DECODER 0
-#define CONFIG_WMV3_DECODER 0
+#define CONFIG_WMV1_DECODER 1
+#define CONFIG_WMV2_DECODER 1
+#define CONFIG_WMV3_DECODER 1
 #define CONFIG_WMV3_VDPAU_DECODER 0
 #define CONFIG_WNV1_DECODER 0
 #define CONFIG_XAN_WC3_DECODER 0
@@ -324,8 +324,8 @@
 #define CONFIG_VMDAUDIO_DECODER 0
 #define CONFIG_VORBIS_DECODER 1
 #define CONFIG_WAVPACK_DECODER 0
-#define CONFIG_WMAV1_DECODER 0
-#define CONFIG_WMAV2_DECODER 0
+#define CONFIG_WMAV1_DECODER 1
+#define CONFIG_WMAV2_DECODER 1
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_DVD_DECODER 0
@@ -336,14 +336,14 @@
 #define CONFIG_PCM_MULAW_DECODER 0
 #define CONFIG_PCM_S8_DECODER 0
 #define CONFIG_PCM_S16BE_DECODER 0
-#define CONFIG_PCM_S16LE_DECODER 0
+#define CONFIG_PCM_S16LE_DECODER 1
 #define CONFIG_PCM_S16LE_PLANAR_DECODER 0
 #define CONFIG_PCM_S24BE_DECODER 0
 #define CONFIG_PCM_S24DAUD_DECODER 0
 #define CONFIG_PCM_S24LE_DECODER 0
 #define CONFIG_PCM_S32BE_DECODER 0
 #define CONFIG_PCM_S32LE_DECODER 0
-#define CONFIG_PCM_U8_DECODER 0
+#define CONFIG_PCM_U8_DECODER 1
 #define CONFIG_PCM_U16BE_DECODER 0
 #define CONFIG_PCM_U16LE_DECODER 0
 #define CONFIG_PCM_U24BE_DECODER 0
@@ -519,7 +519,7 @@
 #define CONFIG_VP3_PARSER 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
 #define CONFIG_H264_MP4TOANNEXB_BSF 1
-#define CONFIG_MPEG4VIDEO_ES_BSF 1
+#define CONFIG_MPEG4VIDEO_ES_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0
@@ -534,10 +534,10 @@
 #define CONFIG_AMR_DEMUXER 0
 #define CONFIG_APC_DEMUXER 0
 #define CONFIG_APE_DEMUXER 0
-#define CONFIG_ASF_DEMUXER 0
+#define CONFIG_ASF_DEMUXER 1
 #define CONFIG_ASS_DEMUXER 0
 #define CONFIG_AU_DEMUXER 0
-#define CONFIG_AVI_DEMUXER 0
+#define CONFIG_AVI_DEMUXER 1
 #define CONFIG_AVISYNTH_DEMUXER 0
 #define CONFIG_AVS_DEMUXER 0
 #define CONFIG_BETHSOFTVID_DEMUXER 0
@@ -644,7 +644,7 @@
 #define CONFIG_VMD_DEMUXER 0
 #define CONFIG_VOC_DEMUXER 0
 #define CONFIG_VQF_DEMUXER 0
-#define CONFIG_WAV_DEMUXER 0
+#define CONFIG_WAV_DEMUXER 1
 #define CONFIG_WC3_DEMUXER 0
 #define CONFIG_WSAUD_DEMUXER 0
 #define CONFIG_WSVQA_DEMUXER 0
diff --git a/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h b/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h
index b242ccc..9ab1fab 100644
--- a/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --enable-shared --disable-static --disable-debug --enable-pthreads --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --enable-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=mp3 --enable-demuxer=mov --enable-demuxer=ogg --enable-parser=mpegaudio --enable-bsf=h264_mp4toannexb --prefix=/tmp/nothing --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32"
+#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --enable-shared --disable-static --disable-debug --enable-pthreads --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --enable-decoder=aac --enable-decoder=h264 --enable-decoder=mp3 --enable-decoder=theora --enable-decoder=vorbis --disable-decoder=flac --enable-demuxer=mp3 --enable-demuxer=mov --enable-demuxer=ogg --enable-demuxer=avi --enable-demuxer=wav --enable-demuxer=asf --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=mpeg4 --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-bsf=h264_mp4toannexb --enable-parser=mpegaudio --prefix=/tmp/nothing --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32"
 #define FFMPEG_DATADIR "/tmp/nothing/share/ffmpeg"
 #define ARCH_ALPHA 0
 #define ARCH_ARM 0
@@ -218,7 +218,7 @@
 #define CONFIG_MPEG_XVMC_DECODER 0
 #define CONFIG_MPEG1VIDEO_DECODER 0
 #define CONFIG_MPEG2VIDEO_DECODER 0
-#define CONFIG_MPEG4_DECODER 0
+#define CONFIG_MPEG4_DECODER 1
 #define CONFIG_MPEGVIDEO_DECODER 0
 #define CONFIG_MPEG_VDPAU_DECODER 0
 #define CONFIG_MPEG1_VDPAU_DECODER 0
@@ -280,9 +280,9 @@
 #define CONFIG_VP6A_DECODER 0
 #define CONFIG_VP6F_DECODER 0
 #define CONFIG_VQA_DECODER 0
-#define CONFIG_WMV1_DECODER 0
-#define CONFIG_WMV2_DECODER 0
-#define CONFIG_WMV3_DECODER 0
+#define CONFIG_WMV1_DECODER 1
+#define CONFIG_WMV2_DECODER 1
+#define CONFIG_WMV3_DECODER 1
 #define CONFIG_WMV3_VDPAU_DECODER 0
 #define CONFIG_WNV1_DECODER 0
 #define CONFIG_XAN_WC3_DECODER 0
@@ -324,8 +324,8 @@
 #define CONFIG_VMDAUDIO_DECODER 0
 #define CONFIG_VORBIS_DECODER 1
 #define CONFIG_WAVPACK_DECODER 0
-#define CONFIG_WMAV1_DECODER 0
-#define CONFIG_WMAV2_DECODER 0
+#define CONFIG_WMAV1_DECODER 1
+#define CONFIG_WMAV2_DECODER 1
 #define CONFIG_WS_SND1_DECODER 0
 #define CONFIG_PCM_ALAW_DECODER 0
 #define CONFIG_PCM_DVD_DECODER 0
@@ -336,14 +336,14 @@
 #define CONFIG_PCM_MULAW_DECODER 0
 #define CONFIG_PCM_S8_DECODER 0
 #define CONFIG_PCM_S16BE_DECODER 0
-#define CONFIG_PCM_S16LE_DECODER 0
+#define CONFIG_PCM_S16LE_DECODER 1
 #define CONFIG_PCM_S16LE_PLANAR_DECODER 0
 #define CONFIG_PCM_S24BE_DECODER 0
 #define CONFIG_PCM_S24DAUD_DECODER 0
 #define CONFIG_PCM_S24LE_DECODER 0
 #define CONFIG_PCM_S32BE_DECODER 0
 #define CONFIG_PCM_S32LE_DECODER 0
-#define CONFIG_PCM_U8_DECODER 0
+#define CONFIG_PCM_U8_DECODER 1
 #define CONFIG_PCM_U16BE_DECODER 0
 #define CONFIG_PCM_U16LE_DECODER 0
 #define CONFIG_PCM_U24BE_DECODER 0
@@ -534,10 +534,10 @@
 #define CONFIG_AMR_DEMUXER 0
 #define CONFIG_APC_DEMUXER 0
 #define CONFIG_APE_DEMUXER 0
-#define CONFIG_ASF_DEMUXER 0
+#define CONFIG_ASF_DEMUXER 1
 #define CONFIG_ASS_DEMUXER 0
 #define CONFIG_AU_DEMUXER 0
-#define CONFIG_AVI_DEMUXER 0
+#define CONFIG_AVI_DEMUXER 1
 #define CONFIG_AVISYNTH_DEMUXER 0
 #define CONFIG_AVS_DEMUXER 0
 #define CONFIG_BETHSOFTVID_DEMUXER 0
@@ -644,7 +644,7 @@
 #define CONFIG_VMD_DEMUXER 0
 #define CONFIG_VOC_DEMUXER 0
 #define CONFIG_VQF_DEMUXER 0
-#define CONFIG_WAV_DEMUXER 0
+#define CONFIG_WAV_DEMUXER 1
 #define CONFIG_WC3_DEMUXER 0
 #define CONFIG_WSAUD_DEMUXER 0
 #define CONFIG_WSVQA_DEMUXER 0