| Index: media/blink/webmediaplayer_impl.cc
|
| diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
|
| index bed92998d3670c8370328271bc5d9f55147a2df3..33fa69cf72ecd6b4b2ce4b3d23b074d3135c9abf 100644
|
| --- a/media/blink/webmediaplayer_impl.cc
|
| +++ b/media/blink/webmediaplayer_impl.cc
|
| @@ -132,6 +132,13 @@ static void LogMediaSourceError(const scoped_refptr<MediaLog>& media_log,
|
| media_log->AddEvent(media_log->CreateMediaSourceErrorEvent(error));
|
| }
|
|
|
| +// Note: The log will appear in chrome://media-internals page. Only log info
|
| +// that's worht logging.
|
| +static void LogMediaInfo(const scoped_refptr<MediaLog>& media_log,
|
| + const std::string& info) {
|
| + media_log->AddEvent(media_log->CreateInfoEvent(info));
|
| +}
|
| +
|
| WebMediaPlayerImpl::WebMediaPlayerImpl(
|
| blink::WebLocalFrame* frame,
|
| blink::WebMediaPlayerClient* client,
|
| @@ -840,16 +847,17 @@ scoped_ptr<Renderer> WebMediaPlayerImpl::CreateRenderer() {
|
| // Create our audio decoders and renderer.
|
| ScopedVector<AudioDecoder> audio_decoders;
|
|
|
| - LogCB log_cb = base::Bind(&LogMediaSourceError, media_log_);
|
| - audio_decoders.push_back(new FFmpegAudioDecoder(media_task_runner_, log_cb));
|
| - audio_decoders.push_back(new OpusAudioDecoder(media_task_runner_));
|
| + audio_decoders.push_back(new media::FFmpegAudioDecoder(
|
| + media_task_runner_, base::Bind(&LogMediaSourceError, media_log_)));
|
| + audio_decoders.push_back(new media::OpusAudioDecoder(media_task_runner_));
|
|
|
| scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
|
| media_task_runner_,
|
| audio_source_provider_.get(),
|
| audio_decoders.Pass(),
|
| set_decryptor_ready_cb,
|
| - audio_hardware_config_));
|
| + audio_hardware_config_,
|
| + base::Bind(&LogMediaInfo, media_log_)));
|
|
|
| // Create our video decoders and renderer.
|
| ScopedVector<VideoDecoder> video_decoders;
|
| @@ -871,7 +879,8 @@ scoped_ptr<Renderer> WebMediaPlayerImpl::CreateRenderer() {
|
| video_decoders.Pass(),
|
| set_decryptor_ready_cb,
|
| base::Bind(&WebMediaPlayerImpl::FrameReady, base::Unretained(this)),
|
| - true));
|
| + true,
|
| + base::Bind(&LogMediaInfo, media_log_)));
|
|
|
| // Create renderer.
|
| return scoped_ptr<Renderer>(new RendererImpl(
|
|
|