Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/audio/cras/audio_manager_cras.h" | 5 #include "media/audio/cras/audio_manager_cras.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/environment.h" | 10 #include "base/environment.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 46 | 46 |
| 47 bool AudioManagerCras::HasAudioOutputDevices() { | 47 bool AudioManagerCras::HasAudioOutputDevices() { |
| 48 return true; | 48 return true; |
| 49 } | 49 } |
| 50 | 50 |
| 51 bool AudioManagerCras::HasAudioInputDevices() { | 51 bool AudioManagerCras::HasAudioInputDevices() { |
| 52 return true; | 52 return true; |
| 53 } | 53 } |
| 54 | 54 |
| 55 AudioManagerCras::AudioManagerCras(AudioLogFactory* audio_log_factory) | 55 AudioManagerCras::AudioManagerCras(AudioLogFactory* audio_log_factory) |
| 56 : AudioManagerBase(audio_log_factory) { | 56 : AudioManagerBase(audio_log_factory), |
| 57 has_keyboard_mic_(false) { | |
| 57 SetMaxOutputStreamsAllowed(kMaxOutputStreams); | 58 SetMaxOutputStreamsAllowed(kMaxOutputStreams); |
| 58 } | 59 } |
| 59 | 60 |
| 60 AudioManagerCras::~AudioManagerCras() { | 61 AudioManagerCras::~AudioManagerCras() { |
| 61 Shutdown(); | 62 Shutdown(); |
| 62 } | 63 } |
| 63 | 64 |
| 64 void AudioManagerCras::ShowAudioInputSettings() { | 65 void AudioManagerCras::ShowAudioInputSettings() { |
| 65 NOTIMPLEMENTED(); | 66 NOTIMPLEMENTED(); |
| 66 } | 67 } |
| 67 | 68 |
| 68 void AudioManagerCras::GetAudioInputDeviceNames( | 69 void AudioManagerCras::GetAudioInputDeviceNames( |
| 69 AudioDeviceNames* device_names) { | 70 AudioDeviceNames* device_names) { |
| 70 AddDefaultDevice(device_names); | 71 AddDefaultDevice(device_names); |
| 71 } | 72 } |
| 72 | 73 |
| 73 void AudioManagerCras::GetAudioOutputDeviceNames( | 74 void AudioManagerCras::GetAudioOutputDeviceNames( |
| 74 AudioDeviceNames* device_names) { | 75 AudioDeviceNames* device_names) { |
| 75 AddDefaultDevice(device_names); | 76 AddDefaultDevice(device_names); |
| 76 } | 77 } |
| 77 | 78 |
| 78 AudioParameters AudioManagerCras::GetInputStreamParameters( | 79 AudioParameters AudioManagerCras::GetInputStreamParameters( |
| 79 const std::string& device_id) { | 80 const std::string& device_id) { |
|
tommi (sloooow) - chröme
2014/09/20 16:00:53
missing thread check
DCHECK(GetTaskRunner()->Belon
Henrik Grunell
2014/09/22 11:11:24
Done. FYI, there's no thread checks anywhere in th
| |
| 80 int user_buffer_size = GetUserBufferSize(); | 81 int user_buffer_size = GetUserBufferSize(); |
| 81 int buffer_size = user_buffer_size ? | 82 int buffer_size = user_buffer_size ? |
| 82 user_buffer_size : kDefaultInputBufferSize; | 83 user_buffer_size : kDefaultInputBufferSize; |
| 84 AudioParameters::PlatformEffectsMask effects = | |
| 85 has_keyboard_mic_ ? AudioParameters::KEYBOARD_MIC | |
| 86 : AudioParameters::NO_EFFECTS; | |
| 83 | 87 |
| 84 // TODO(hshi): Fine-tune audio parameters based on |device_id|. The optimal | 88 // TODO(hshi): Fine-tune audio parameters based on |device_id|. The optimal |
| 85 // parameters for the loopback stream may differ from the default. | 89 // parameters for the loopback stream may differ from the default. |
| 86 return AudioParameters( | 90 return AudioParameters( |
| 87 AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO, | 91 AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO, |
| 88 kDefaultSampleRate, 16, buffer_size); | 92 kDefaultSampleRate, 16, buffer_size, effects); |
| 93 } | |
| 94 | |
| 95 void AudioManagerCras::SetHasKeyboardMic() { | |
| 96 has_keyboard_mic_ = true; | |
|
tommi (sloooow) - chröme
2014/09/20 16:00:53
missing thread check. From what I can tell, it sh
Henrik Grunell
2014/09/22 11:11:24
Done.
| |
| 89 } | 97 } |
| 90 | 98 |
| 91 AudioOutputStream* AudioManagerCras::MakeLinearOutputStream( | 99 AudioOutputStream* AudioManagerCras::MakeLinearOutputStream( |
| 92 const AudioParameters& params) { | 100 const AudioParameters& params) { |
| 93 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); | 101 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); |
| 94 return MakeOutputStream(params); | 102 return MakeOutputStream(params); |
| 95 } | 103 } |
| 96 | 104 |
| 97 AudioOutputStream* AudioManagerCras::MakeLowLatencyOutputStream( | 105 AudioOutputStream* AudioManagerCras::MakeLowLatencyOutputStream( |
| 98 const AudioParameters& params, | 106 const AudioParameters& params, |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 161 case 24: | 169 case 24: |
| 162 return SND_PCM_FORMAT_S24; | 170 return SND_PCM_FORMAT_S24; |
| 163 case 32: | 171 case 32: |
| 164 return SND_PCM_FORMAT_S32; | 172 return SND_PCM_FORMAT_S32; |
| 165 default: | 173 default: |
| 166 return SND_PCM_FORMAT_UNKNOWN; | 174 return SND_PCM_FORMAT_UNKNOWN; |
| 167 } | 175 } |
| 168 } | 176 } |
| 169 | 177 |
| 170 } // namespace media | 178 } // namespace media |
| OLD | NEW |