* [gentoo-commits] gentoo-x86 commit in www-client/chromium/files: chromium-system-ffmpeg-r6.patch
@ 2013-05-25 0:13 PaweA Hajdan (phajdan.jr)
0 siblings, 0 replies; only message in thread
From: PaweA Hajdan (phajdan.jr) @ 2013-05-25 0:13 UTC (permalink / raw
To: gentoo-commits
phajdan.jr 13/05/25 00:13:09
Added: chromium-system-ffmpeg-r6.patch
Log:
Dev channel bump. Switch from make-based to ninja-based build. Fix bug #469144 by Alphat-PC.
(Portage version: 2.1.11.62/cvs/Linux i686, signed Manifest commit with key 30427902)
Revision Changes Path
1.1 www-client/chromium/files/chromium-system-ffmpeg-r6.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-system-ffmpeg-r6.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-system-ffmpeg-r6.patch?rev=1.1&content-type=text/plain
Index: chromium-system-ffmpeg-r6.patch
===================================================================
--- a/media/filters/ffmpeg_glue.h
+++ b/media/filters/ffmpeg_glue.h
@@ -28,9 +28,9 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "media/base/media_export.h"
+#include "media/ffmpeg/ffmpeg_common.h"
struct AVFormatContext;
-struct AVIOContext;
namespace media {
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -363,6 +363,9 @@
'dependencies': [
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
],
+ 'export_dependent_settings': [
+ '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ ],
}, { # media_use_ffmpeg == 0
# Exclude the sources that depend on ffmpeg.
'sources!': [
--- a/media/ffmpeg/ffmpeg_common.cc.orig 2013-01-17 00:07:51.635057013 +0000
+++ b/media/ffmpeg/ffmpeg_common.cc 2013-01-17 00:15:50.867406811 +0000
@@ -10,6 +10,8 @@
#include "media/base/video_frame.h"
#include "media/base/video_util.h"
+#undef SampleFormat
+
namespace media {
// Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
@@ -85,8 +85,10 @@
return kCodecGSM_MS;
case AV_CODEC_ID_PCM_MULAW:
return kCodecPCM_MULAW;
+#ifndef CHROMIUM_OMIT_AV_CODEC_ID_OPUS
case AV_CODEC_ID_OPUS:
return kCodecOpus;
+#endif
default:
DVLOG(1) << "Unknown audio CodecID: " << codec_id;
}
@@ -130,8 +132,10 @@
return AV_CODEC_ID_GSM_MS;
case kCodecPCM_MULAW:
return AV_CODEC_ID_PCM_MULAW;
+#ifndef CHROMIUM_OMIT_AV_CODEC_ID_OPUS
case kCodecOpus:
return AV_CODEC_ID_OPUS;
+#endif
default:
DVLOG(1) << "Unknown AudioCodec: " << audio_codec;
}
@@ -149,8 +153,10 @@
return kCodecMPEG4;
case AV_CODEC_ID_VP8:
return kCodecVP8;
+#ifndef CHROMIUM_OMIT_AV_CODEC_ID_VP9
case AV_CODEC_ID_VP9:
return kCodecVP9;
+#endif
default:
DVLOG(1) << "Unknown video CodecID: " << codec_id;
}
@@ -167,8 +173,10 @@
return AV_CODEC_ID_MPEG4;
case kCodecVP8:
return AV_CODEC_ID_VP8;
+#ifndef CHROMIUM_OMIT_AV_CODEC_ID_VP9
case kCodecVP9:
return AV_CODEC_ID_VP9;
+#endif
default:
DVLOG(1) << "Unknown VideoCodec: " << video_codec;
}
--- 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
--- a/media/base/media_posix.cc.orig 2013-05-24 20:59:12.963046035 +0000
+++ b/media/base/media_posix.cc 2013-05-24 20:59:50.593275882 +0000
@@ -11,12 +11,15 @@
#include "base/path_service.h"
#include "base/strings/stringize_macros.h"
#include "media/ffmpeg/ffmpeg_common.h"
+
+#if !defined(USE_SYSTEM_FFMPEG)
#include "third_party/ffmpeg/ffmpeg_stubs.h"
using third_party_ffmpeg::kNumStubModules;
using third_party_ffmpeg::kModuleFfmpegsumo;
using third_party_ffmpeg::InitializeStubs;
using third_party_ffmpeg::StubPathMap;
+#endif
namespace media {
namespace internal {
@@ -46,6 +49,9 @@
#endif
bool InitializeMediaLibraryInternal(const base::FilePath& module_dir) {
+#if defined(USE_SYSTEM_FFMPEG)
+ return true;
+#else
StubPathMap paths;
// First try to initialize with Chrome's sumo library.
@@ -61,6 +67,7 @@
FILE_PATH_LITERAL(DSO_NAME("avformat", AVFORMAT_VERSION))).value());
return InitializeStubs(paths);
+#endif
}
} // namespace internal
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-05-25 0:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-25 0:13 [gentoo-commits] gentoo-x86 commit in www-client/chromium/files: chromium-system-ffmpeg-r6.patch PaweA Hajdan (phajdan.jr)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox