| 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 d4d2c9aec29e32aeb2c16e37d51261a256e3e430..7ccfa1b3d8b201b43f6d59f8a30a1691bc65fc15 100644
|
| --- a/media/mojo/services/mojo_renderer_service.cc
|
| +++ b/media/mojo/services/mojo_renderer_service.cc
|
| @@ -25,9 +25,10 @@ namespace media {
|
| // Time interval to update media time.
|
| const int kTimeUpdateIntervalMs = 50;
|
|
|
| -static void LogMediaSourceError(const scoped_refptr<MediaLog>& media_log,
|
| - const std::string& error) {
|
| - media_log->AddEvent(media_log->CreateMediaSourceErrorEvent(error));
|
| +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) {
|
| @@ -48,16 +49,16 @@ MojoRendererService::MojoRendererService()
|
|
|
| scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
|
| task_runner, audio_renderer_sink_.get(),
|
| - renderer_config->GetAudioDecoders(
|
| - task_runner,
|
| - base::Bind(&LogMediaSourceError, media_log)).Pass(),
|
| + renderer_config->GetAudioDecoders(task_runner,
|
| + 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(&LogMediaSourceError, media_log)).Pass(),
|
| + renderer_config->GetVideoDecoders(task_runner,
|
| + base::Bind(&AddLogEntry, media_log))
|
| + .Pass(),
|
| true, media_log));
|
|
|
| // Create renderer.
|
|
|