up to 28.0.1500.20

[packages/chromium-browser.git] / system-ffmpeg.patch

diff --git a/system-ffmpeg.patch b/system-ffmpeg.patch
index d9358f5cb9a974f00b429129c455b3dc8847f266..70b2058fc83b804eab5353d2563102125af30e21 100644 (file)
--- a/system-ffmpeg.patch
+++ b/system-ffmpeg.patch
@@ -1,8 +1,5 @@
-Index: tools/compile_test/compile_test.py
-diff --git a/tools/compile_test/compile_test.py b/tools/compile_test/compile_test.py
-index 79371a1fd05d2e03e098340527fc897faadad54c..bbda4abfe54f327aabede26f400bebd5e1376d82 100755
---- a/tools/compile_test/compile_test.py
-+++ b/tools/compile_test/compile_test.py
+--- chromium-browser-28.0.1500.20/tools/compile_test/compile_test.py~  2013-05-25 17:14:51.000000000 +0300
++++ chromium-browser-28.0.1500.20/tools/compile_test/compile_test.py   2013-05-25 17:24:02.334165592 +0300
 @@ -30,7 +30,9 @@ def DoMain(argv):
    if not options.code:
      parser.error('Missing required --code switch.')
@@ -14,15 +11,15 @@ index 79371a1fd05d2e03e098340527fc897faadad54c..bbda4abfe54f327aabede26f400bebd5
  
    tmpdir = tempfile.mkdtemp()
    try:
-@@ -41,7 +41,7 @@
+@@ -42,7 +42,7 @@
  
      o_path = os.path.join(tmpdir, 'test.o')
  
--    cxx_popen = subprocess.Popen([cxx, cxx_path, '-o', o_path, '-c'],
-+    cxx_popen = subprocess.Popen(cxx + [cxx_path, '-o', o_path, '-c'],
-                                  stdout=subprocess.PIPE,
-                                  stderr=subprocess.PIPE)
-     cxx_stdout, cxx_stderr = cxx_popen.communicate()
+-    cxx_cmdline = [cxx, cxx_path, '-o', o_path]
++    cxx_cmdline = cxx + [cxx_path, '-o', o_path]
+     if not options.run_linker:
+       cxx_cmdline.append('-c')
+     # Pass remaining arguments to the compiler.
 diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
 index 17241b9..8a92312 100644
 --- a/media/filters/ffmpeg_glue.h
@@ -63,3 +60,38 @@ index df217d2..fde3830 100644
  namespace media {
  
  // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
+--- a/media/media.gyp.orig     2013-05-09 18:02:50.958682676 +0000
++++ b/media/media.gyp  2013-05-09 18:03:45.009023680 +0000
+@@ -530,6 +530,12 @@
+             '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
+                 '--code "#define __STDC_CONSTANT_MACROS\n'
+                 '#include <libavcodec/avcodec.h>\n'
++                'int test() { return AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL; }" '
++                '--on-failure -DCHROMIUM_OMIT_AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL=1)',
++
++            '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
++                '--code "#define __STDC_CONSTANT_MACROS\n'
++                '#include <libavcodec/avcodec.h>\n'
+                 'int test() { struct AVFrame frame;\n'
+                 'return av_frame_get_channels(&frame); }" '
+                 '--on-failure -DCHROMIUM_NO_AVFRAME_CHANNELS=1)',
+--- a/media/filters/ffmpeg_demuxer.cc.orig     2013-05-09 18:04:25.089276403 +0000
++++ b/media/filters/ffmpeg_demuxer.cc  2013-05-09 18:05:16.289599070 +0000
+@@ -111,12 +111,15 @@
+   // Get side data if any. For now, the only type of side_data is VP8 Alpha. We
+   // keep this generic so that other side_data types in the future can be
+   // handled the same way as well.
+-  av_packet_split_side_data(packet.get());
+   int side_data_size = 0;
+-  uint8* side_data = av_packet_get_side_data(
++  uint8* side_data = NULL;
++#ifndef CHROMIUM_OMIT_AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL
++  av_packet_split_side_data(packet.get());
++  side_data = av_packet_get_side_data(
+       packet.get(),
+       AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
+       &side_data_size);
++#endif
+ 
+   // If a packet is returned by FFmpeg's av_parser_parse2() the packet will
+   // reference inner memory of FFmpeg.  As such we should transfer the packet