Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1142)

Side by Side Diff: media/audio/cras/audio_manager_cras.cc

Issue 2023943002: Revert of Forward output glitch information from stream WebRTC log (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/audio/cras/audio_manager_cras.h ('k') | media/audio/fake_audio_log_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 if (!IsBeamformingDefaultEnabled()) 212 if (!IsBeamformingDefaultEnabled())
213 RecordBeamformingDeviceState(BEAMFORMING_DEFAULT_DISABLED); 213 RecordBeamformingDeviceState(BEAMFORMING_DEFAULT_DISABLED);
214 else 214 else
215 RecordBeamformingDeviceState(BEAMFORMING_USER_DISABLED); 215 RecordBeamformingDeviceState(BEAMFORMING_USER_DISABLED);
216 } 216 }
217 } 217 }
218 return params; 218 return params;
219 } 219 }
220 220
221 AudioOutputStream* AudioManagerCras::MakeLinearOutputStream( 221 AudioOutputStream* AudioManagerCras::MakeLinearOutputStream(
222 const AudioParameters& params, 222 const AudioParameters& params) {
223 const LogCallback& log_callback) {
224 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 223 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
225 return MakeOutputStream(params); 224 return MakeOutputStream(params);
226 } 225 }
227 226
228 AudioOutputStream* AudioManagerCras::MakeLowLatencyOutputStream( 227 AudioOutputStream* AudioManagerCras::MakeLowLatencyOutputStream(
229 const AudioParameters& params, 228 const AudioParameters& params,
230 const std::string& device_id, 229 const std::string& device_id) {
231 const LogCallback& log_callback) {
232 DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!"; 230 DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
233 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); 231 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
234 // TODO(dgreid): Open the correct input device for unified IO. 232 // TODO(dgreid): Open the correct input device for unified IO.
235 return MakeOutputStream(params); 233 return MakeOutputStream(params);
236 } 234 }
237 235
238 AudioInputStream* AudioManagerCras::MakeLinearInputStream( 236 AudioInputStream* AudioManagerCras::MakeLinearInputStream(
239 const AudioParameters& params, 237 const AudioParameters& params, const std::string& device_id) {
240 const std::string& device_id,
241 const LogCallback& log_callback) {
242 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 238 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
243 return MakeInputStream(params, device_id); 239 return MakeInputStream(params, device_id);
244 } 240 }
245 241
246 AudioInputStream* AudioManagerCras::MakeLowLatencyInputStream( 242 AudioInputStream* AudioManagerCras::MakeLowLatencyInputStream(
247 const AudioParameters& params, 243 const AudioParameters& params, const std::string& device_id) {
248 const std::string& device_id,
249 const LogCallback& log_callback) {
250 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); 244 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
251 return MakeInputStream(params, device_id); 245 return MakeInputStream(params, device_id);
252 } 246 }
253 247
254 AudioParameters AudioManagerCras::GetPreferredOutputStreamParameters( 248 AudioParameters AudioManagerCras::GetPreferredOutputStreamParameters(
255 const std::string& output_device_id, 249 const std::string& output_device_id,
256 const AudioParameters& input_params) { 250 const AudioParameters& input_params) {
257 // TODO(tommi): Support |output_device_id|. 251 // TODO(tommi): Support |output_device_id|.
258 DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!"; 252 DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
259 ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO; 253 ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 case 24: 290 case 24:
297 return SND_PCM_FORMAT_S24; 291 return SND_PCM_FORMAT_S24;
298 case 32: 292 case 32:
299 return SND_PCM_FORMAT_S32; 293 return SND_PCM_FORMAT_S32;
300 default: 294 default:
301 return SND_PCM_FORMAT_UNKNOWN; 295 return SND_PCM_FORMAT_UNKNOWN;
302 } 296 }
303 } 297 }
304 298
305 } // namespace media 299 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/cras/audio_manager_cras.h ('k') | media/audio/fake_audio_log_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698