diff options
| author | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-15 23:44:39 +0000 |
|---|---|---|
| committer | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-15 23:44:39 +0000 |
| commit | 70fe277044e7768cfe91375749b33cb94ae00981 (patch) | |
| tree | 6e77b761bfa69e7668d30995350749d5a9ed68a1 /media/tools/player_x11/player_x11.cc | |
| parent | 57c86b1b8cd38c956597670983813454653af7a5 (diff) | |
| download | chromium_src-70fe277044e7768cfe91375749b33cb94ae00981.zip chromium_src-70fe277044e7768cfe91375749b33cb94ae00981.tar.gz chromium_src-70fe277044e7768cfe91375749b33cb94ae00981.tar.bz2 | |
Refactor FakeAudioOutputStream, NullAudioSink into FakeAudioConsumer.
We have two fake audio consumers: FakeAudioOutputStream on the browser
side and NullAudioSink on the renderer side. At present we can't remove
NullAudioSink since its used for PipelineIntegrationTests.
This change collapses the common functionality between both consumers
and as an added bonus replaces NullAudioSink's private thread in favor
of sharing the MediaThread.
BUG=none
TEST=unit tests, remote desktop session w/o audio, --disable-audio.
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=188251
Review URL: https://chromiumcodereview.appspot.com/12334061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188506 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools/player_x11/player_x11.cc')
| -rw-r--r-- | media/tools/player_x11/player_x11.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index 6fc4e47..7b6e5c5 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -128,7 +128,7 @@ bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop, scoped_ptr<media::AudioRenderer> audio_renderer(new media::AudioRendererImpl( message_loop, - new media::NullAudioSink(), + new media::NullAudioSink(message_loop), media::SetDecryptorReadyCB())); collection->SetAudioRenderer(audio_renderer.Pass()); |