Revert 34226 - ffmpeg remove ununsed ffmpeg source files, move some from chromium to chrome 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

TBR=fbarchard@chromium.org
Review URL: http://codereview.chromium.org/487005

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

6 files changed, 20 insertions, 25 deletions

diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index b7c2eca..91a796e 100755
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -74,6 +74,7 @@
             '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/dsputil.c',
             'source/patched-ffmpeg-mt/libavcodec/eval.c',
             'source/patched-ffmpeg-mt/libavcodec/faanidct.c',
@@ -86,6 +87,8 @@
             'source/patched-ffmpeg-mt/libavcodec/parser.c',
             'source/patched-ffmpeg-mt/libavcodec/pthread.c',
             'source/patched-ffmpeg-mt/libavcodec/raw.c',
+            'source/patched-ffmpeg-mt/libavcodec/resample.c',
+            'source/patched-ffmpeg-mt/libavcodec/resample2.c',
             'source/patched-ffmpeg-mt/libavcodec/simple_idct.c',
             'source/patched-ffmpeg-mt/libavcodec/utils.c',
             'source/patched-ffmpeg-mt/libavcodec/vorbis.c',
@@ -105,11 +108,13 @@
             'source/patched-ffmpeg-mt/libavformat/oggparsetheora.c',
             'source/patched-ffmpeg-mt/libavformat/oggparsevorbis.c',
             'source/patched-ffmpeg-mt/libavformat/options.c',
+            'source/patched-ffmpeg-mt/libavformat/os_support.c',
             'source/patched-ffmpeg-mt/libavformat/riff.c',
+            'source/patched-ffmpeg-mt/libavformat/sdp.c',
             'source/patched-ffmpeg-mt/libavformat/utils.c',
             'source/patched-ffmpeg-mt/libavutil/avstring.c',
             'source/patched-ffmpeg-mt/libavutil/crc.c',
-
+            'source/patched-ffmpeg-mt/libavutil/intfloat_readwrite.c',
             'source/patched-ffmpeg-mt/libavutil/log.c',
             'source/patched-ffmpeg-mt/libavutil/mathematics.c',
             'source/patched-ffmpeg-mt/libavutil/mem.c',
@@ -153,16 +158,18 @@
                 'source/patched-ffmpeg-mt/libavformat/isom.c',
                 'source/patched-ffmpeg-mt/libavformat/mov.c',
                 'source/patched-ffmpeg-mt/libavformat/mp3.c',
-                'source/patched-ffmpeg-mt/libavutil/intfloat_readwrite.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',
@@ -184,18 +191,13 @@
                 'source/patched-ffmpeg-mt/libavutil/rc4.c',
               ],
             }],  # ffmpeg_branding
-            ['ffmpeg_branding=="ChromeOS" and target_arch=="arm"', {
-              'sources': [
-                'source/patched-ffmpeg-mt/libavcodec/bitstream_filter.c',
-                'source/patched-ffmpeg-mt/libavcodec/h264_mp4toannexb_bsf.c',
-              ],
-            }],  # ffmpeg_branding target_arch arm
             ['target_arch=="ia32" or target_arch=="x64"', {
               'dependencies': [
                 'make_ffmpeg_asm_lib',
               ],
               'sources': [
                 'source/patched-ffmpeg-mt/libavcodec/x86/cpuid.c',
+                'source/patched-ffmpeg-mt/libavcodec/x86/dnxhd_mmx.c',
                 'source/patched-ffmpeg-mt/libavcodec/x86/dsputil_mmx.c',
                 'source/patched-ffmpeg-mt/libavcodec/x86/fdct_mmx.c',
                 'source/patched-ffmpeg-mt/libavcodec/x86/fft_3dn.c',
@@ -203,21 +205,14 @@
                 'source/patched-ffmpeg-mt/libavcodec/x86/fft_sse.c',
                 'source/patched-ffmpeg-mt/libavcodec/x86/idct_mmx_xvid.c',
                 'source/patched-ffmpeg-mt/libavcodec/x86/idct_sse2_xvid.c',
+                'source/patched-ffmpeg-mt/libavcodec/x86/motion_est_mmx.c',
+                'source/patched-ffmpeg-mt/libavcodec/x86/mpegvideo_mmx.c',
                 'source/patched-ffmpeg-mt/libavcodec/x86/simple_idct_mmx.c',
                 'source/patched-ffmpeg-mt/libavcodec/x86/vp3dsp_mmx.c',
                 'source/patched-ffmpeg-mt/libavcodec/x86/vp3dsp_sse2.c',
               ],
             }],
             ['(target_arch=="ia32" or target_arch=="x64") and ' +
-	        '(ffmpeg_branding=="ChromeOS" or ffmpeg_branding=="Chrome")', {
-              'dependencies': [
-                'make_ffmpeg_asm_lib',
-              ],
-              'sources': [
-                'source/patched-ffmpeg-mt/libavcodec/x86/mpegvideo_mmx.c',
-              ],
-            }],
-            ['(target_arch=="ia32" or target_arch=="x64") and ' +
 	        'ffmpeg_branding=="ChromeOS"', {
               'dependencies': [
                 'make_ffmpeg_asm_lib',
@@ -227,7 +222,7 @@
                 'source/patched-ffmpeg-mt/libavcodec/x86/vc1dsp_mmx.c',
               ],
             }],
-            ['target_arch=="x64" or target_arch=="arm"', {
+            ['target_arch=="x64"', {
               # x64 requires PIC for shared libraries. This is opposite
               # of ia32 where due to a slew of inline assembly using ebx,
               # FFmpeg CANNOT be built with PIC.
diff --git a/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h b/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h
index 33a1337..e1267b3 100644
--- a/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h
@@ -101,7 +101,7 @@
 #define HAVE_WINSOCK2_H 0
 #define HAVE_XFORM_ASM 0
 #define HAVE_YASM 1
-#define CONFIG_BSFS 0
+#define CONFIG_BSFS 1
 #define CONFIG_DECODERS 1
 #define CONFIG_DEMUXERS 1
 #define CONFIG_ENCODERS 0
diff --git a/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h b/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h
index 23a5e7d..d1c9b23 100644
--- a/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h
@@ -101,7 +101,7 @@
 #define HAVE_WINSOCK2_H 0
 #define HAVE_XFORM_ASM 0
 #define HAVE_YASM 1
-#define CONFIG_BSFS 0
+#define CONFIG_BSFS 1
 #define CONFIG_DECODERS 1
 #define CONFIG_DEMUXERS 1
 #define CONFIG_ENCODERS 0
diff --git a/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h b/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h
index 0e5e066..4c55bca 100644
--- a/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h
@@ -101,7 +101,7 @@
 #define HAVE_WINSOCK2_H 0
 #define HAVE_XFORM_ASM 0
 #define HAVE_YASM 1
-#define CONFIG_BSFS 0
+#define CONFIG_BSFS 1
 #define CONFIG_DECODERS 1
 #define CONFIG_DEMUXERS 1
 #define CONFIG_ENCODERS 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 540ab69..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 --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-parser=mpegaudio --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
@@ -101,7 +101,7 @@
 #define HAVE_WINSOCK2_H 0
 #define HAVE_XFORM_ASM 0
 #define HAVE_YASM 1
-#define CONFIG_BSFS 0
+#define CONFIG_BSFS 1
 #define CONFIG_DECODERS 1
 #define CONFIG_DEMUXERS 1
 #define CONFIG_ENCODERS 0
@@ -518,7 +518,7 @@
 #define CONFIG_VC1_PARSER 0
 #define CONFIG_VP3_PARSER 0
 #define CONFIG_DUMP_EXTRADATA_BSF 0
-#define CONFIG_H264_MP4TOANNEXB_BSF 0
+#define CONFIG_H264_MP4TOANNEXB_BSF 1
 #define CONFIG_MPEG4VIDEO_ES_BSF 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
diff --git a/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h b/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h
index acebb257..68dbf2d 100644
--- a/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h
+++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h
@@ -101,7 +101,7 @@
 #define HAVE_WINSOCK2_H 0
 #define HAVE_XFORM_ASM 0
 #define HAVE_YASM 0
-#define CONFIG_BSFS 0
+#define CONFIG_BSFS 1
 #define CONFIG_DECODERS 1
 #define CONFIG_DEMUXERS 1
 #define CONFIG_ENCODERS 0