diff options
| author | grunell@chromium.org <grunell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-29 11:29:55 +0000 |
|---|---|---|
| committer | grunell@chromium.org <grunell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-29 11:29:55 +0000 |
| commit | cbeca15ca8e1a8f63cdc8ff166f437fddf37dbf7 (patch) | |
| tree | b5a2b0d89e0b122e779c7fb86e97e964d3a61ddd | |
| parent | af8f5450b5e2c80ccada296a88dc515701309d56 (diff) | |
| download | chromium_src-cbeca15ca8e1a8f63cdc8ff166f437fddf37dbf7.zip chromium_src-cbeca15ca8e1a8f63cdc8ff166f437fddf37dbf7.tar.gz chromium_src-cbeca15ca8e1a8f63cdc8ff166f437fddf37dbf7.tar.bz2 | |
Support 3 channels for audio input.
Test code in https://codereview.chromium.org/255753003/
BUG=345296
Review URL: https://codereview.chromium.org/197453002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266849 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/renderer/media/webrtc_audio_capturer.cc | 3 | ||||
| -rw-r--r-- | media/audio/audio_input_controller.cc | 2 | ||||
| -rw-r--r-- | media/audio/audio_manager_base.cc | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/content/renderer/media/webrtc_audio_capturer.cc b/content/renderer/media/webrtc_audio_capturer.cc index 5ad35a2..c4de8e9 100644 --- a/content/renderer/media/webrtc_audio_capturer.cc +++ b/content/renderer/media/webrtc_audio_capturer.cc @@ -173,7 +173,8 @@ bool WebRtcAudioCapturer::Initialize() { // Verify that the reported input channel configuration is supported. if (channel_layout != media::CHANNEL_LAYOUT_MONO && - channel_layout != media::CHANNEL_LAYOUT_STEREO) { + channel_layout != media::CHANNEL_LAYOUT_STEREO && + channel_layout != media::CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC) { DLOG(ERROR) << channel_layout << " is not a supported input channel configuration."; return false; diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc index 70647cd..1e2180d 100644 --- a/media/audio/audio_input_controller.cc +++ b/media/audio/audio_input_controller.cc @@ -11,7 +11,7 @@ #include "media/base/user_input_monitor.h" namespace { -const int kMaxInputChannels = 2; +const int kMaxInputChannels = 3; // TODO(henrika): remove usage of timers and add support for proper // notification of when the input device is removed. This was originally added diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc index 60f6d23..3b36b10 100644 --- a/media/audio/audio_manager_base.cc +++ b/media/audio/audio_manager_base.cc @@ -28,7 +28,7 @@ static const int kDefaultMaxOutputStreams = 16; // for all platforms. static const int kDefaultMaxInputStreams = 16; -static const int kMaxInputChannels = 2; +static const int kMaxInputChannels = 3; const char AudioManagerBase::kDefaultDeviceName[] = "Default"; const char AudioManagerBase::kDefaultDeviceId[] = "default"; |