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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 | 117 |
118 AudioParameters AudioManagerCras::GetPreferredOutputStreamParameters( | 118 AudioParameters AudioManagerCras::GetPreferredOutputStreamParameters( |
119 const std::string& output_device_id, | 119 const std::string& output_device_id, |
120 const AudioParameters& input_params) { | 120 const AudioParameters& input_params) { |
121 // TODO(tommi): Support |output_device_id|. | 121 // TODO(tommi): Support |output_device_id|. |
122 DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!"; | 122 DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!"; |
123 ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO; | 123 ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO; |
124 int sample_rate = kDefaultSampleRate; | 124 int sample_rate = kDefaultSampleRate; |
125 int buffer_size = kMinimumOutputBufferSize; | 125 int buffer_size = kMinimumOutputBufferSize; |
126 int bits_per_sample = 16; | 126 int bits_per_sample = 16; |
| 127 int input_channels = 0; |
127 if (input_params.IsValid()) { | 128 if (input_params.IsValid()) { |
128 sample_rate = input_params.sample_rate(); | 129 sample_rate = input_params.sample_rate(); |
129 bits_per_sample = input_params.bits_per_sample(); | 130 bits_per_sample = input_params.bits_per_sample(); |
130 channel_layout = input_params.channel_layout(); | 131 channel_layout = input_params.channel_layout(); |
| 132 input_channels = input_params.input_channels(); |
131 buffer_size = | 133 buffer_size = |
132 std::min(kMaximumOutputBufferSize, | 134 std::min(kMaximumOutputBufferSize, |
133 std::max(buffer_size, input_params.frames_per_buffer())); | 135 std::max(buffer_size, input_params.frames_per_buffer())); |
134 } | 136 } |
135 | 137 |
136 int user_buffer_size = GetUserBufferSize(); | 138 int user_buffer_size = GetUserBufferSize(); |
137 if (user_buffer_size) | 139 if (user_buffer_size) |
138 buffer_size = user_buffer_size; | 140 buffer_size = user_buffer_size; |
139 | 141 |
140 return AudioParameters( | 142 return AudioParameters( |
141 AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, | 143 AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, input_channels, |
142 sample_rate, bits_per_sample, buffer_size, AudioParameters::NO_EFFECTS); | 144 sample_rate, bits_per_sample, buffer_size, AudioParameters::NO_EFFECTS); |
143 } | 145 } |
144 | 146 |
145 AudioOutputStream* AudioManagerCras::MakeOutputStream( | 147 AudioOutputStream* AudioManagerCras::MakeOutputStream( |
146 const AudioParameters& params) { | 148 const AudioParameters& params) { |
147 return new CrasUnifiedStream(params, this); | 149 return new CrasUnifiedStream(params, this); |
148 } | 150 } |
149 | 151 |
150 AudioInputStream* AudioManagerCras::MakeInputStream( | 152 AudioInputStream* AudioManagerCras::MakeInputStream( |
151 const AudioParameters& params, const std::string& device_id) { | 153 const AudioParameters& params, const std::string& device_id) { |
152 return new CrasInputStream(params, this, device_id); | 154 return new CrasInputStream(params, this, device_id); |
153 } | 155 } |
154 | 156 |
155 snd_pcm_format_t AudioManagerCras::BitsToFormat(int bits_per_sample) { | 157 snd_pcm_format_t AudioManagerCras::BitsToFormat(int bits_per_sample) { |
156 switch (bits_per_sample) { | 158 switch (bits_per_sample) { |
157 case 8: | 159 case 8: |
158 return SND_PCM_FORMAT_U8; | 160 return SND_PCM_FORMAT_U8; |
159 case 16: | 161 case 16: |
160 return SND_PCM_FORMAT_S16; | 162 return SND_PCM_FORMAT_S16; |
161 case 24: | 163 case 24: |
162 return SND_PCM_FORMAT_S24; | 164 return SND_PCM_FORMAT_S24; |
163 case 32: | 165 case 32: |
164 return SND_PCM_FORMAT_S32; | 166 return SND_PCM_FORMAT_S32; |
165 default: | 167 default: |
166 return SND_PCM_FORMAT_UNKNOWN; | 168 return SND_PCM_FORMAT_UNKNOWN; |
167 } | 169 } |
168 } | 170 } |
169 | 171 |
170 } // namespace media | 172 } // namespace media |
OLD | NEW |