diff options
| author | justinlin@chromium.org <justinlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-31 17:58:09 +0000 |
|---|---|---|
| committer | justinlin@chromium.org <justinlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-31 17:58:09 +0000 |
| commit | 6e37ba8c76c2240ec96bb95096cfe33e9c41eda6 (patch) | |
| tree | 9006c83d118e5cde850fac75f8545a2caa024f8f /media/audio/openbsd | |
| parent | 9faccc4fecfc865078149ae258aa53452831ec9b (diff) | |
| download | chromium_src-6e37ba8c76c2240ec96bb95096cfe33e9c41eda6.zip chromium_src-6e37ba8c76c2240ec96bb95096cfe33e9c41eda6.tar.gz chromium_src-6e37ba8c76c2240ec96bb95096cfe33e9c41eda6.tar.bz2 | |
Revert 203427 "Hook up the device selection to the WebAudio live..."
Possibly caused content_browsertests to fail on Mac.
> Hook up the device selection to the WebAudio live audio.
> WebAudio live audio needs to pass the session_id to the browser process so that Chrome can open the correct input device for unitfied IO.
>
> This CL looks big because it touches quite some interfaces from the render to the browser. But the change is simple and basically adding a session_id/device_id to the classes. All the changes some together and it is very hard to break it down.
> It also makes the media output code more similar to the media input code as well, and it will be easier to merge them for the future.
>
>
> BUG=147327
> TEST=http://chromium.googlecode.com/svn/trunk/samples/audio/visualizer-live.html
> Change the device using the camera icon on the right of the omnibox, then reload. Verify the sound is coming from the correct input device.
>
> Review URL: https://chromiumcodereview.appspot.com/15721002
TBR=xians@chromium.org
Review URL: https://codereview.chromium.org/15725013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/openbsd')
| -rw-r--r-- | media/audio/openbsd/audio_manager_openbsd.cc | 3 | ||||
| -rw-r--r-- | media/audio/openbsd/audio_manager_openbsd.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/media/audio/openbsd/audio_manager_openbsd.cc b/media/audio/openbsd/audio_manager_openbsd.cc index 4005aeb..681f219 100644 --- a/media/audio/openbsd/audio_manager_openbsd.cc +++ b/media/audio/openbsd/audio_manager_openbsd.cc @@ -91,8 +91,7 @@ AudioOutputStream* AudioManagerOpenBSD::MakeLinearOutputStream( } AudioOutputStream* AudioManagerOpenBSD::MakeLowLatencyOutputStream( - const AudioParameters& params, - const std::string& input_device_id) { + const AudioParameters& params) { DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format); return MakeOutputStream(params); } diff --git a/media/audio/openbsd/audio_manager_openbsd.h b/media/audio/openbsd/audio_manager_openbsd.h index a1adcb6..d981612 100644 --- a/media/audio/openbsd/audio_manager_openbsd.h +++ b/media/audio/openbsd/audio_manager_openbsd.h @@ -26,8 +26,7 @@ class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase { virtual AudioOutputStream* MakeLinearOutputStream( const AudioParameters& params) OVERRIDE; virtual AudioOutputStream* MakeLowLatencyOutputStream( - const AudioParameters& params, - const std::string& input_device_id) OVERRIDE; + const AudioParameters& params) OVERRIDE; virtual AudioInputStream* MakeLinearInputStream( const AudioParameters& params, const std::string& device_id) OVERRIDE; virtual AudioInputStream* MakeLowLatencyInputStream( |