summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--content/renderer/media/android/media_source_delegate.cc12
-rw-r--r--media/base/media_log.cc11
-rw-r--r--media/base/media_log.h5
-rw-r--r--media/blink/webmediaplayer_impl.cc10
-rw-r--r--media/mojo/services/mojo_renderer_service.cc14
-rw-r--r--media/renderers/default_renderer_factory.cc11
6 files changed, 18 insertions, 45 deletions
diff --git a/content/renderer/media/android/media_source_delegate.cc b/content/renderer/media/android/media_source_delegate.cc
index 792148e..b22a68a 100644
--- a/content/renderer/media/android/media_source_delegate.cc
+++ b/content/renderer/media/android/media_source_delegate.cc
@@ -40,12 +40,6 @@ const uint8 kVorbisPadding[] = { 0xff, 0xff, 0xff, 0xff };
namespace content {
-static void AddLogEntry(const scoped_refptr<media::MediaLog>& media_log,
- media::MediaLog::MediaLogLevel level,
- const std::string& message) {
- media_log->AddEvent(media_log->CreateLogEvent(level, message));
-}
-
MediaSourceDelegate::MediaSourceDelegate(
RendererDemuxerAndroid* demuxer_client,
int demuxer_client_id,
@@ -171,7 +165,8 @@ void MediaSourceDelegate::InitializeMediaSource(
base::Bind(&MediaSourceDelegate::OnDemuxerOpened, main_weak_this_)),
media::BindToCurrentLoop(base::Bind(
&MediaSourceDelegate::OnEncryptedMediaInitData, main_weak_this_)),
- base::Bind(&AddLogEntry, media_log_), media_log_, false));
+ base::Bind(&media::MediaLog::AddLogEvent, media_log_), media_log_,
+ false));
// |this| will be retained until StopDemuxer() is posted, so Unretained() is
// safe here.
@@ -670,7 +665,8 @@ void MediaSourceDelegate::OnDemuxerOpened() {
return;
media_source_opened_cb_.Run(new media::WebMediaSourceImpl(
- chunk_demuxer_.get(), base::Bind(&AddLogEntry, media_log_)));
+ chunk_demuxer_.get(),
+ base::Bind(&media::MediaLog::AddLogEvent, media_log_)));
}
void MediaSourceDelegate::OnEncryptedMediaInitData(
diff --git a/media/base/media_log.cc b/media/base/media_log.cc
index 745957d..b32942d 100644
--- a/media/base/media_log.cc
+++ b/media/base/media_log.cc
@@ -236,13 +236,10 @@ scoped_ptr<MediaLogEvent> MediaLog::CreateBufferedExtentsChangedEvent(
return event.Pass();
}
-scoped_ptr<MediaLogEvent> MediaLog::CreateLogEvent(MediaLogLevel level,
- const std::string& message) {
- const MediaLogEvent::Type type = MediaLogLevelToEventType(level);
- const std::string param = MediaLogLevelToString(level);
- scoped_ptr<MediaLogEvent> event(CreateEvent(type));
- event->params.SetString(param, message);
- return event.Pass();
+void MediaLog::AddLogEvent(MediaLogLevel level, const std::string& message) {
+ scoped_ptr<MediaLogEvent> event(CreateEvent(MediaLogLevelToEventType(level)));
+ event->params.SetString(MediaLogLevelToString(level), message);
+ AddEvent(event.Pass());
}
void MediaLog::SetStringProperty(
diff --git a/media/base/media_log.h b/media/base/media_log.h
index 0a98201..8b40b5d 100644
--- a/media/base/media_log.h
+++ b/media/base/media_log.h
@@ -60,8 +60,9 @@ class MEDIA_EXPORT MediaLog : public base::RefCountedThreadSafe<MediaLog> {
size_t width, size_t height);
scoped_ptr<MediaLogEvent> CreateBufferedExtentsChangedEvent(
int64 start, int64 current, int64 end);
- scoped_ptr<MediaLogEvent> CreateLogEvent(MediaLogLevel level,
- const std::string& message);
+
+ // Report a log message at the specified log level.
+ void AddLogEvent(MediaLogLevel level, const std::string& message);
// Report a property change without an accompanying event.
void SetStringProperty(const std::string& key, const std::string& value);
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index 2bbe40c..775b501 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -103,12 +103,6 @@ STATIC_ASSERT_MATCHING_ENUM(UseCredentials);
(DCHECK(main_task_runner_->BelongsToCurrentThread()), \
BindToCurrentLoop(base::Bind(function, AsWeakPtr(), arg1)))
-static void AddLogEntry(const scoped_refptr<MediaLog>& media_log,
- MediaLog::MediaLogLevel level,
- const std::string& message) {
- media_log->AddEvent(media_log->CreateLogEvent(level, message));
-}
-
static blink::WebEncryptedMediaInitDataType ConvertInitDataType(
const std::string& init_data_type) {
if (init_data_type == "cenc")
@@ -837,7 +831,7 @@ void WebMediaPlayerImpl::OnPipelineBufferingStateChanged(
void WebMediaPlayerImpl::OnDemuxerOpened() {
DCHECK(main_task_runner_->BelongsToCurrentThread());
client_->mediaSourceOpened(new WebMediaSourceImpl(
- chunk_demuxer_, base::Bind(&AddLogEntry, media_log_)));
+ chunk_demuxer_, base::Bind(&MediaLog::AddLogEvent, media_log_)));
}
void WebMediaPlayerImpl::OnAddTextTrack(
@@ -907,7 +901,7 @@ void WebMediaPlayerImpl::StartPipeline() {
DCHECK(!chunk_demuxer_);
DCHECK(!data_source_);
- mse_log_cb = base::Bind(&AddLogEntry, media_log_);
+ mse_log_cb = base::Bind(&MediaLog::AddLogEvent, media_log_);
chunk_demuxer_ = new ChunkDemuxer(
BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened),
diff --git a/media/mojo/services/mojo_renderer_service.cc b/media/mojo/services/mojo_renderer_service.cc
index 7ccfa1b..7b6884d 100644
--- a/media/mojo/services/mojo_renderer_service.cc
+++ b/media/mojo/services/mojo_renderer_service.cc
@@ -25,12 +25,6 @@ namespace media {
// Time interval to update media time.
const int kTimeUpdateIntervalMs = 50;
-static void AddLogEntry(const scoped_refptr<MediaLog>& media_log,
- MediaLog::MediaLogLevel level,
- const std::string& message) {
- media_log->AddEvent(media_log->CreateLogEvent(level, message));
-}
-
static void PaintNothing(const scoped_refptr<VideoFrame>& frame) {
}
@@ -50,15 +44,15 @@ MojoRendererService::MojoRendererService()
scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
task_runner, audio_renderer_sink_.get(),
renderer_config->GetAudioDecoders(task_runner,
- base::Bind(&AddLogEntry, media_log))
- .Pass(),
+ base::Bind(&MediaLog::AddLogEvent,
+ media_log)).Pass(),
renderer_config->GetAudioHardwareConfig(), media_log));
scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
task_runner,
renderer_config->GetVideoDecoders(task_runner,
- base::Bind(&AddLogEntry, media_log))
- .Pass(),
+ base::Bind(&MediaLog::AddLogEvent,
+ media_log)).Pass(),
true, media_log));
// Create renderer.
diff --git a/media/renderers/default_renderer_factory.cc b/media/renderers/default_renderer_factory.cc
index e423cdd..81162d3 100644
--- a/media/renderers/default_renderer_factory.cc
+++ b/media/renderers/default_renderer_factory.cc
@@ -23,15 +23,6 @@
namespace media {
-#if !defined(MEDIA_DISABLE_FFMPEG)
-
-static void AddLogEntry(const scoped_refptr<MediaLog>& media_log,
- MediaLog::MediaLogLevel level,
- const std::string& message) {
- media_log->AddEvent(media_log->CreateLogEvent(level, message));
-}
-#endif
-
DefaultRendererFactory::DefaultRendererFactory(
const scoped_refptr<MediaLog>& media_log,
const scoped_refptr<GpuVideoAcceleratorFactories>& gpu_factories,
@@ -55,7 +46,7 @@ scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer(
#if !defined(MEDIA_DISABLE_FFMPEG)
audio_decoders.push_back(new FFmpegAudioDecoder(
- media_task_runner, base::Bind(&AddLogEntry, media_log_)));
+ media_task_runner, base::Bind(&MediaLog::AddLogEvent, media_log_)));
#endif
audio_decoders.push_back(new OpusAudioDecoder(media_task_runner));
generated by cgit v1.1 at 2024-09-28 20:13:23 +0000