summaryrefslogtreecommitdiffstats
path: root/media/tools
diff options
context:
space:
mode:
authorxhwang <xhwang@chromium.org>2014-09-08 21:55:47 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-09 05:43:49 +0000
commitff459d4eeb89479ae810f6be3d3b5b50fef3324a (patch)
treea9131ee19f07cb953c817cc27967320d7a180257 /media/tools
parentb943d1c8690d35fc9aeaedaca39c32baddffc082 (diff)
downloadchromium_src-ff459d4eeb89479ae810f6be3d3b5b50fef3324a.zip
chromium_src-ff459d4eeb89479ae810f6be3d3b5b50fef3324a.tar.gz
chromium_src-ff459d4eeb89479ae810f6be3d3b5b50fef3324a.tar.bz2
MediaLog: Log selected audio/video decoder name.
The name of selected audio/video decoder will appear in chrome://media-internals. This is useful for quickly identifying which decoder is being used (e.g. whether we are using GpuVideoDecoder for hardware accelerated video decoding). BUG=411535 Review URL: https://codereview.chromium.org/547913002 Cr-Commit-Position: refs/heads/master@{#293851}
Diffstat (limited to 'media/tools')
-rw-r--r--media/tools/player_x11/player_x11.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index e5df83c..e2198b3 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -121,7 +121,8 @@ void InitPipeline(
video_decoders.Pass(),
media::SetDecryptorReadyCB(),
paint_cb,
- true));
+ true,
+ new media::MediaLog()));
ScopedVector<media::AudioDecoder> audio_decoders;
audio_decoders.push_back(new media::FFmpegAudioDecoder(task_runner,
@@ -139,7 +140,8 @@ void InitPipeline(
new media::NullAudioSink(task_runner),
audio_decoders.Pass(),
media::SetDecryptorReadyCB(),
- hardware_config));
+ hardware_config,
+ new media::MediaLog()));
scoped_ptr<media::Renderer> renderer(new media::RendererImpl(
task_runner, demuxer, audio_renderer.Pass(), video_renderer.Pass()));