diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 00:40:13 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 00:40:13 +0000 |
| commit | 488add1fe820c2ab45b9191e94d7c806ed8e22b9 (patch) | |
| tree | a483c43d428d066ea5041ec50db09ce941322796 /webkit | |
| parent | 392fbb3dd27259adc0a0ff1127bc19ad5c317ce5 (diff) | |
| download | chromium_src-488add1fe820c2ab45b9191e94d7c806ed8e22b9.zip chromium_src-488add1fe820c2ab45b9191e94d7c806ed8e22b9.tar.gz chromium_src-488add1fe820c2ab45b9191e94d7c806ed8e22b9.tar.bz2 | |
Move AudioRendererImpl construction to WebMediaPlayerImpl.
This is extracted from a larger CL created by scherkus@: https://codereview.chromium.org/11468033/
BUG=none
TEST=media_unittests pass
Review URL: https://chromiumcodereview.appspot.com/11564007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173019 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/media/webmediaplayer_impl.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc index f5e6333..9e907e1 100644 --- a/webkit/media/webmediaplayer_impl.cc +++ b/webkit/media/webmediaplayer_impl.cc @@ -188,9 +188,12 @@ WebMediaPlayerImpl::WebMediaPlayerImpl( filter_collection_->AddVideoRenderer(video_renderer); proxy_->set_frame_provider(video_renderer); - // Create default audio renderer. + // Create default audio renderer using the null sink if no sink was provided. + if (!audio_renderer_sink) { + audio_renderer_sink = new media::NullAudioSink(); + } filter_collection_->AddAudioRenderer( - new media::AudioRendererImpl(new media::NullAudioSink())); + new media::AudioRendererImpl(audio_renderer_sink)); if (WebKit::WebRuntimeFeatures::isEncryptedMediaEnabled()) { decryptor_.reset(new ProxyDecryptor(message_loop_factory_->GetMessageLoop( |