Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(200)

Unified Diff: media/mojo/services/mojo_renderer_service.cc

Issue 1049393002: Revert of media-internals: Simplify the code path for creating a media log entry (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@MEDIA_LOG_INFO_ERROR_DEBUG
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/renderers/default_renderer_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_renderer_service.cc
diff --git a/media/mojo/services/mojo_renderer_service.cc b/media/mojo/services/mojo_renderer_service.cc
index 7b6884d93b753b2c0e03a156031f1ab574ec6505..7ccfa1b3d8b201b43f6d59f8a30a1691bc65fc15 100644
--- a/media/mojo/services/mojo_renderer_service.cc
+++ b/media/mojo/services/mojo_renderer_service.cc
@@ -25,6 +25,12 @@
// 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) {
}
@@ -44,15 +50,15 @@
scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
task_runner, audio_renderer_sink_.get(),
renderer_config->GetAudioDecoders(task_runner,
- base::Bind(&MediaLog::AddLogEvent,
- media_log)).Pass(),
+ base::Bind(&AddLogEntry, media_log))
+ .Pass(),
renderer_config->GetAudioHardwareConfig(), media_log));
scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
task_runner,
renderer_config->GetVideoDecoders(task_runner,
- base::Bind(&MediaLog::AddLogEvent,
- media_log)).Pass(),
+ base::Bind(&AddLogEntry, media_log))
+ .Pass(),
true, media_log));
// Create renderer.
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/renderers/default_renderer_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698