diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-08 23:37:39 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-08 23:37:39 +0000 |
| commit | 45d1f5634d022ef57001186125eb098c555c35a1 (patch) | |
| tree | 0415bdb1beba2497a9bb58190d233075b0e1def9 /content/renderer | |
| parent | 834acbd835f74643062c170feafc26475a897247 (diff) | |
| download | chromium_src-45d1f5634d022ef57001186125eb098c555c35a1.zip chromium_src-45d1f5634d022ef57001186125eb098c555c35a1.tar.gz chromium_src-45d1f5634d022ef57001186125eb098c555c35a1.tar.bz2 | |
Revert 187048
based on
http://build.chromium.org/p/chromium.win/builders/Win%20Aura%20Tests%20%282%29/builds/1968
> Enable the "Web Audio Input" feature by default.
>
> We now get the proper audio input device identifier passed into WebKit and back into chromium
> to be able to determine if the correct device will be used that the user gave permission to
> access in getUserMedia().
>
> See related WebKit work:
> https://bugs.webkit.org/show_bug.cgi?id=90110
> https://bugs.webkit.org/show_bug.cgi?id=93756
> https://bugs.webkit.org/show_bug.cgi?id=101815
> https://bugs.webkit.org/show_bug.cgi?id=106490
> https://bugs.webkit.org/show_bug.cgi?id=106816
> https://bugs.webkit.org/show_bug.cgi?id=109494
> https://bugs.webkit.org/show_bug.cgi?id=110796
>
> and chromium work:
> https://codereview.chromium.org/10830268/
> https://codereview.chromium.org/10916105/
> https://codereview.chromium.org/10909185/
> https://codereview.chromium.org/10959068
> https://codereview.chromium.org/11418125/
> https://codereview.chromium.org/11827040/
> https://codereview.chromium.org/11878032/
> https://codereview.chromium.org/12218106/
> https://codereview.chromium.org/12335072/
>
> BUG=145092
> TEST=none
> manual tests:
> http://chromium.googlecode.com/svn/trunk/samples/audio/visualizer-live.html
> http://dashersw.github.com/pedalboard.js/demo/
> Review URL: https://codereview.chromium.org/12383064
TBR=crogers@google.com
Review URL: https://codereview.chromium.org/12649007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/media/webrtc_local_audio_renderer.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/content/renderer/media/webrtc_local_audio_renderer.cc b/content/renderer/media/webrtc_local_audio_renderer.cc index ce30579..f24045a 100644 --- a/content/renderer/media/webrtc_local_audio_renderer.cc +++ b/content/renderer/media/webrtc_local_audio_renderer.cc @@ -170,12 +170,13 @@ void WebRtcLocalAudioRenderer::Start() { source_params.bits_per_sample(), 2 * source_params.frames_per_buffer()); sink_ = AudioDeviceFactory::NewOutputDevice(); - - // TODO(henrika): we could utilize the unified audio here instead and do - // sink_->InitializeIO(sink_params, 2, callback_.get()); - // It would then be possible to avoid using the WebRtcAudioCapturer. - DVLOG(1) << "The live audio input feature is enabled"; - + if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableWebAudioInput)) { + // TODO(henrika): we could utilize the unified audio here instead and do + // sink_->InitializeIO(sink_params, 2, callback_.get()); + // It would then be possible to avoid using the WebRtcAudioCapturer. + DVLOG(1) << "enable-webaudio-input command-line flag is enabled"; + } sink_->Initialize(sink_params, callback_.get()); sink_->SetSourceRenderView(source_render_view_id_); |