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

Side by Side Diff: media/audio/linux/audio_manager_linux.cc

Issue 11959018: Add a unified audio I/O backend for ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 11 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 | « no previous file | media/audio/linux/cras_unified.h » ('j') | media/audio/linux/cras_unified.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/linux/audio_manager_linux.h" 5 #include "media/audio/linux/audio_manager_linux.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/environment.h" 8 #include "base/environment.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/nix/xdg_util.h" 10 #include "base/nix/xdg_util.h"
11 #include "base/process_util.h" 11 #include "base/process_util.h"
12 #include "base/stl_util.h" 12 #include "base/stl_util.h"
13 #include "media/audio/audio_output_dispatcher.h" 13 #include "media/audio/audio_output_dispatcher.h"
14 #include "media/audio/audio_util.h" 14 #include "media/audio/audio_util.h"
15 #include "media/audio/linux/alsa_input.h" 15 #include "media/audio/linux/alsa_input.h"
16 #include "media/audio/linux/alsa_output.h" 16 #include "media/audio/linux/alsa_output.h"
17 #include "media/audio/linux/alsa_wrapper.h" 17 #include "media/audio/linux/alsa_wrapper.h"
18 #if defined(USE_PULSEAUDIO) 18 #if defined(USE_PULSEAUDIO)
19 #include "media/audio/pulse/pulse_output.h" 19 #include "media/audio/pulse/pulse_output.h"
20 #endif 20 #endif
21 #if defined(USE_CRAS) 21 #if defined(USE_CRAS)
22 #include "media/audio/linux/cras_input.h" 22 #include "media/audio/linux/cras_input.h"
23 #include "media/audio/linux/cras_output.h" 23 #include "media/audio/linux/cras_output.h"
24 #include "media/audio/linux/cras_unified.h"
24 #endif 25 #endif
25 #include "media/base/limits.h" 26 #include "media/base/limits.h"
26 #include "media/base/media_switches.h" 27 #include "media/base/media_switches.h"
27 28
28 namespace media { 29 namespace media {
29 30
30 // Maximum number of output streams that can be open simultaneously. 31 // Maximum number of output streams that can be open simultaneously.
31 static const int kMaxOutputStreams = 50; 32 static const int kMaxOutputStreams = 50;
32 33
33 // Since "default", "pulse" and "dmix" devices are virtual devices mapped to 34 // Since "default", "pulse" and "dmix" devices are virtual devices mapped to
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 AudioInputStream* AudioManagerLinux::MakeLowLatencyInputStream( 293 AudioInputStream* AudioManagerLinux::MakeLowLatencyInputStream(
293 const AudioParameters& params, const std::string& device_id) { 294 const AudioParameters& params, const std::string& device_id) {
294 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); 295 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
295 return MakeInputStream(params, device_id); 296 return MakeInputStream(params, device_id);
296 } 297 }
297 298
298 AudioOutputStream* AudioManagerLinux::MakeOutputStream( 299 AudioOutputStream* AudioManagerLinux::MakeOutputStream(
299 const AudioParameters& params) { 300 const AudioParameters& params) {
300 #if defined(USE_CRAS) 301 #if defined(USE_CRAS)
301 if (UseCras()) { 302 if (UseCras()) {
303 // TODO(dgreid): remove once we properly handle input device selection.
304 if (CommandLine::ForCurrentProcess()->HasSwitch(
305 switches::kEnableWebAudioInput)) {
306 return new CrasUnifiedStream(params, this);
307 }
308
302 return new CrasOutputStream(params, this); 309 return new CrasOutputStream(params, this);
303 } 310 }
304 #endif 311 #endif
305 312
306 #if defined(USE_PULSEAUDIO) 313 #if defined(USE_PULSEAUDIO)
307 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePulseAudio)) { 314 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePulseAudio)) {
308 return new PulseAudioOutputStream(params, this); 315 return new PulseAudioOutputStream(params, this);
309 } 316 }
310 #endif 317 #endif
311 318
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 sample_rate = input_params.sample_rate(); 364 sample_rate = input_params.sample_rate();
358 365
359 // TODO(dalecurtis): This should include bits per channel and channel layout 366 // TODO(dalecurtis): This should include bits per channel and channel layout
360 // eventually. 367 // eventually.
361 return AudioParameters( 368 return AudioParameters(
362 AudioParameters::AUDIO_PCM_LOW_LATENCY, input_params.channel_layout(), 369 AudioParameters::AUDIO_PCM_LOW_LATENCY, input_params.channel_layout(),
363 sample_rate, 16, buffer_size); 370 sample_rate, 16, buffer_size);
364 } 371 }
365 372
366 } // namespace media 373 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | media/audio/linux/cras_unified.h » ('j') | media/audio/linux/cras_unified.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698