diff options
| author | crogers@google.com <crogers@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-13 20:36:51 +0000 |
|---|---|---|
| committer | crogers@google.com <crogers@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-13 20:36:51 +0000 |
| commit | 06ea4f7c2ee733bdf2e717af72cb56fb571eafac (patch) | |
| tree | c1e387d65490a2bc7cf9bfc72e32d33b646e1df8 /media/audio/audio_output_device_unittest.cc | |
| parent | a5d3767bf2ddae040dd9bdb894bbe6276e7f5a2f (diff) | |
| download | chromium_src-06ea4f7c2ee733bdf2e717af72cb56fb571eafac.zip chromium_src-06ea4f7c2ee733bdf2e717af72cb56fb571eafac.tar.gz chromium_src-06ea4f7c2ee733bdf2e717af72cb56fb571eafac.tar.bz2 | |
Pass more detailed audio hardware configuration information to the renderer
AudioHardwareConfig currently contains an ad-hoc mix of pieces of information about
the audio input and output hardware. This CL adds more complete and symmetric information
about the audio hardware as tracked in AudioHardwareConfig.
The ChannelMixer is also upgraded to allow for "discrete" up and down mixing.
BUG=none
TEST=manual - several tests updated
Review URL: https://codereview.chromium.org/12387006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/audio_output_device_unittest.cc')
| -rw-r--r-- | media/audio/audio_output_device_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/audio/audio_output_device_unittest.cc b/media/audio/audio_output_device_unittest.cc index 5628f66..5668687 100644 --- a/media/audio/audio_output_device_unittest.cc +++ b/media/audio/audio_output_device_unittest.cc @@ -152,7 +152,7 @@ AudioOutputDeviceTest::AudioOutputDeviceTest() input_channels_(synchronized_io_ ? 2 : 0) { default_audio_parameters_.Reset( AudioParameters::AUDIO_PCM_LINEAR, - CHANNEL_LAYOUT_STEREO, input_channels_, + CHANNEL_LAYOUT_STEREO, 2, input_channels_, 48000, 16, 1024); audio_device_ = new AudioOutputDevice( |