summaryrefslogtreecommitdiffstats
path: root/media/audio/audio_output_device.h
diff options
context:
space:
mode:
authorjustinlin@chromium.org <justinlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-31 17:58:09 +0000
committerjustinlin@chromium.org <justinlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-31 17:58:09 +0000
commit6e37ba8c76c2240ec96bb95096cfe33e9c41eda6 (patch)
tree9006c83d118e5cde850fac75f8545a2caa024f8f /media/audio/audio_output_device.h
parent9faccc4fecfc865078149ae258aa53452831ec9b (diff)
downloadchromium_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/audio_output_device.h')
-rw-r--r--media/audio/audio_output_device.h16
1 files changed, 0 insertions, 16 deletions
diff --git a/media/audio/audio_output_device.h b/media/audio/audio_output_device.h
index 2af4f48..a16b9ed 100644
--- a/media/audio/audio_output_device.h
+++ b/media/audio/audio_output_device.h
@@ -81,18 +81,6 @@ class MEDIA_EXPORT AudioOutputDevice
AudioOutputDevice(scoped_ptr<AudioOutputIPC> ipc,
const scoped_refptr<base::MessageLoopProxy>& io_loop);
- // Initialize function for clients wishing to have unified input and
- // output, |params| may specify |input_channels| > 0, representing a
- // number of input channels which will be at the same sample-rate
- // and buffer-size as the output as specified in |params|. |session_id| is
- // used for the browser to select the correct input device.
- // In this case, the callback's RenderIO() method will be called instead
- // of Render(), providing the synchronized input data at the same time as
- // when new output data is to be rendered.
- void InitializeUnifiedStream(const AudioParameters& params,
- RenderCallback* callback,
- int session_id);
-
// AudioRendererSink implementation.
virtual void Initialize(const AudioParameters& params,
RenderCallback* callback) OVERRIDE;
@@ -156,10 +144,6 @@ class MEDIA_EXPORT AudioOutputDevice
// State of Play() / Pause() calls before OnStreamCreated() is called.
bool play_on_start_;
- // The media session ID used to identify which input device to be started.
- // Only used by Unified IO.
- int session_id_;
-
// Our audio thread callback class. See source file for details.
class AudioThreadCallback;