summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorhenrika@chromium.org <henrika@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-15 13:12:21 +0000
committerhenrika@chromium.org <henrika@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-15 13:12:21 +0000
commit98be8b1efb2383bf7a15533b6a6b5b894ced8a16 (patch)
tree39fbf89e5f973202a2e30fe5ac0b108a3f9a3f1f /media
parent2c053ab327f55dc854dce0facc2d4527772f27cd (diff)
downloadchromium_src-98be8b1efb2383bf7a15533b6a6b5b894ced8a16.zip
chromium_src-98be8b1efb2383bf7a15533b6a6b5b894ced8a16.tar.gz
chromium_src-98be8b1efb2383bf7a15533b6a6b5b894ced8a16.tar.bz2
Fixes live-audio input on Windows.
TBR=tommi BUG=12271022 Review URL: https://codereview.chromium.org/12252066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182686 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/audio/win/audio_manager_win.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc
index 82dda90..be23f95 100644
--- a/media/audio/win/audio_manager_win.cc
+++ b/media/audio/win/audio_manager_win.cc
@@ -361,6 +361,7 @@ AudioParameters AudioManagerWin::GetPreferredLowLatencyOutputStreamParameters(
int sample_rate = input_params.sample_rate();
int bits_per_sample = input_params.bits_per_sample();
ChannelLayout channel_layout = input_params.channel_layout();
+ int input_channels = input_params.input_channels();
if (CoreAudioUtil::IsSupported()) {
sample_rate = GetAudioHardwareSampleRate();
bits_per_sample = 16;
@@ -369,7 +370,7 @@ AudioParameters AudioManagerWin::GetPreferredLowLatencyOutputStreamParameters(
// TODO(dalecurtis): This should include hardware bits per channel eventually.
return AudioParameters(
- AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
+ AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, input_channels,
sample_rate, bits_per_sample, GetAudioHardwareBufferSize());
}