Enable the mpeg4toannexb bitstream filter.

BUG=none
TEST=none

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

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

5 files changed, 13 insertions, 9 deletions

diff --git a/third_party/ffmpeg/avcodec-52.sigs b/third_party/ffmpeg/avcodec-52.sigs
index a7474c8..2458e3a 100644
--- a/third_party/ffmpeg/avcodec-52.sigs
+++ b/third_party/ffmpeg/avcodec-52.sigs
@@ -18,3 +18,6 @@ void av_init_packet(AVPacket *pkt);
 int av_dup_packet(AVPacket *pkt);
 void avcodec_flush_buffers(AVCodecContext *avctx);
 void avcodec_init(void);
+AVBitStreamFilterContext *av_bitstream_filter_init(const char *name);
+int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args, uint8_t **poutbuf, int *poutbuf_size, const uint8_t *buf, int buf_size, int keyframe);
+void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index 9a2eb1e..ced0572 100755
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -81,6 +81,7 @@
             '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',
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 c53c578..ad299e0 100644
--- a/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/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 --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 --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_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_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 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 7169b3d..2ce3f54 100644
--- a/third_party/ffmpeg/source/config/Chrome/linux/x64/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/linux/x64/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 --prefix=./chrome-ffmpeg"
+#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=./chrome-ffmpeg"
 #define FFMPEG_DATADIR "./chrome-ffmpeg/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_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 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 05e939d..fd827c7 100644
--- a/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/mac/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 --prefix=/tmp/nothing"
+#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"
 #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_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
 #define CONFIG_MP3_HEADER_COMPRESS_BSF 0