| 1 |
phajdan.jr 13/05/29 21:49:21 |
| 2 |
|
| 3 |
Added: chromium-system-ffmpeg-r7.patch |
| 4 |
Log: |
| 5 |
Dev channel bump. Fix bug #471292 by Dan Douglas. |
| 6 |
|
| 7 |
(Portage version: 2.1.11.62/cvs/Linux i686, signed Manifest commit with key 30427902) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 www-client/chromium/files/chromium-system-ffmpeg-r7.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-system-ffmpeg-r7.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-system-ffmpeg-r7.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: chromium-system-ffmpeg-r7.patch |
| 16 |
=================================================================== |
| 17 |
--- a/media/filters/ffmpeg_glue.h |
| 18 |
+++ b/media/filters/ffmpeg_glue.h |
| 19 |
@@ -28,9 +28,9 @@ |
| 20 |
#include "base/basictypes.h" |
| 21 |
#include "base/memory/scoped_ptr.h" |
| 22 |
#include "media/base/media_export.h" |
| 23 |
+#include "media/ffmpeg/ffmpeg_common.h" |
| 24 |
|
| 25 |
struct AVFormatContext; |
| 26 |
-struct AVIOContext; |
| 27 |
|
| 28 |
namespace media { |
| 29 |
|
| 30 |
--- a/media/ffmpeg/ffmpeg_common.cc.orig 2013-01-17 00:07:51.635057013 +0000 |
| 31 |
+++ b/media/ffmpeg/ffmpeg_common.cc 2013-01-17 00:15:50.867406811 +0000 |
| 32 |
@@ -85,8 +85,10 @@ |
| 33 |
return kCodecGSM_MS; |
| 34 |
case AV_CODEC_ID_PCM_MULAW: |
| 35 |
return kCodecPCM_MULAW; |
| 36 |
+#ifndef CHROMIUM_OMIT_AV_CODEC_ID_OPUS |
| 37 |
case AV_CODEC_ID_OPUS: |
| 38 |
return kCodecOpus; |
| 39 |
+#endif |
| 40 |
default: |
| 41 |
DVLOG(1) << "Unknown audio CodecID: " << codec_id; |
| 42 |
} |
| 43 |
@@ -130,8 +132,10 @@ |
| 44 |
return AV_CODEC_ID_GSM_MS; |
| 45 |
case kCodecPCM_MULAW: |
| 46 |
return AV_CODEC_ID_PCM_MULAW; |
| 47 |
+#ifndef CHROMIUM_OMIT_AV_CODEC_ID_OPUS |
| 48 |
case kCodecOpus: |
| 49 |
return AV_CODEC_ID_OPUS; |
| 50 |
+#endif |
| 51 |
default: |
| 52 |
DVLOG(1) << "Unknown AudioCodec: " << audio_codec; |
| 53 |
} |
| 54 |
@@ -149,8 +153,10 @@ |
| 55 |
return kCodecMPEG4; |
| 56 |
case AV_CODEC_ID_VP8: |
| 57 |
return kCodecVP8; |
| 58 |
+#ifndef CHROMIUM_OMIT_AV_CODEC_ID_VP9 |
| 59 |
case AV_CODEC_ID_VP9: |
| 60 |
return kCodecVP9; |
| 61 |
+#endif |
| 62 |
default: |
| 63 |
DVLOG(1) << "Unknown video CodecID: " << codec_id; |
| 64 |
} |
| 65 |
@@ -167,8 +173,10 @@ |
| 66 |
return AV_CODEC_ID_MPEG4; |
| 67 |
case kCodecVP8: |
| 68 |
return AV_CODEC_ID_VP8; |
| 69 |
+#ifndef CHROMIUM_OMIT_AV_CODEC_ID_VP9 |
| 70 |
case kCodecVP9: |
| 71 |
return AV_CODEC_ID_VP9; |
| 72 |
+#endif |
| 73 |
default: |
| 74 |
DVLOG(1) << "Unknown VideoCodec: " << video_codec; |
| 75 |
} |
| 76 |
--- a/media/filters/ffmpeg_demuxer.cc.orig 2013-05-09 18:04:25.089276403 +0000 |
| 77 |
+++ b/media/filters/ffmpeg_demuxer.cc 2013-05-09 18:05:16.289599070 +0000 |
| 78 |
@@ -111,12 +111,15 @@ |
| 79 |
// Get side data if any. For now, the only type of side_data is VP8 Alpha. We |
| 80 |
// keep this generic so that other side_data types in the future can be |
| 81 |
// handled the same way as well. |
| 82 |
- av_packet_split_side_data(packet.get()); |
| 83 |
int side_data_size = 0; |
| 84 |
- uint8* side_data = av_packet_get_side_data( |
| 85 |
+ uint8* side_data = NULL; |
| 86 |
+#ifndef CHROMIUM_OMIT_AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL |
| 87 |
+ av_packet_split_side_data(packet.get()); |
| 88 |
+ side_data = av_packet_get_side_data( |
| 89 |
packet.get(), |
| 90 |
AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, |
| 91 |
&side_data_size); |
| 92 |
+#endif |
| 93 |
|
| 94 |
// If a packet is returned by FFmpeg's av_parser_parse2() the packet will |
| 95 |
// reference inner memory of FFmpeg. As such we should transfer the packet |
| 96 |
--- a/media/base/media_posix.cc.orig 2013-05-24 20:59:12.963046035 +0000 |
| 97 |
+++ b/media/base/media_posix.cc 2013-05-24 20:59:50.593275882 +0000 |
| 98 |
@@ -11,12 +11,15 @@ |
| 99 |
#include "base/path_service.h" |
| 100 |
#include "base/strings/stringize_macros.h" |
| 101 |
#include "media/ffmpeg/ffmpeg_common.h" |
| 102 |
+ |
| 103 |
+#if !defined(USE_SYSTEM_FFMPEG) |
| 104 |
#include "third_party/ffmpeg/ffmpeg_stubs.h" |
| 105 |
|
| 106 |
using third_party_ffmpeg::kNumStubModules; |
| 107 |
using third_party_ffmpeg::kModuleFfmpegsumo; |
| 108 |
using third_party_ffmpeg::InitializeStubs; |
| 109 |
using third_party_ffmpeg::StubPathMap; |
| 110 |
+#endif |
| 111 |
|
| 112 |
namespace media { |
| 113 |
namespace internal { |
| 114 |
@@ -46,6 +49,9 @@ |
| 115 |
#endif |
| 116 |
|
| 117 |
bool InitializeMediaLibraryInternal(const base::FilePath& module_dir) { |
| 118 |
+#if defined(USE_SYSTEM_FFMPEG) |
| 119 |
+ return true; |
| 120 |
+#else |
| 121 |
StubPathMap paths; |
| 122 |
|
| 123 |
// First try to initialize with Chrome's sumo library. |
| 124 |
@@ -61,6 +67,7 @@ |
| 125 |
FILE_PATH_LITERAL(DSO_NAME("avformat", AVFORMAT_VERSION))).value()); |
| 126 |
|
| 127 |
return InitializeStubs(paths); |
| 128 |
+#endif |
| 129 |
} |
| 130 |
|
| 131 |
} // namespace internal |
Archives