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

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

Issue 23475037: Implement GetAudioOutputDevices for remaining platforms, consolidate tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Merge LKGR, remove anonymous namespaces. Created 7 years, 3 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/linux/audio_manager_linux.h » ('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 "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/stl_util.h" 11 #include "base/stl_util.h"
12 #include "media/audio/audio_util.h" 12 #include "media/audio/audio_util.h"
13 #include "media/audio/cras/cras_input.h" 13 #include "media/audio/cras/cras_input.h"
14 #include "media/audio/cras/cras_unified.h" 14 #include "media/audio/cras/cras_unified.h"
15 #include "media/base/channel_layout.h" 15 #include "media/base/channel_layout.h"
16 16
17 namespace media { 17 namespace media {
18 18
19 static void AddDefaultDevice(AudioDeviceNames* device_names) {
20 DCHECK(device_names->empty());
21
22 // Cras will route audio from a proper physical device automatically.
23 device_names->push_back(
24 AudioDeviceName(AudioManagerBase::kDefaultDeviceName,
25 AudioManagerBase::kDefaultDeviceId));
26 }
27
19 // Maximum number of output streams that can be open simultaneously. 28 // Maximum number of output streams that can be open simultaneously.
20 static const int kMaxOutputStreams = 50; 29 static const int kMaxOutputStreams = 50;
21 30
22 // Default sample rate for input and output streams. 31 // Default sample rate for input and output streams.
23 static const int kDefaultSampleRate = 48000; 32 static const int kDefaultSampleRate = 48000;
24 33
25 const char AudioManagerCras::kLoopbackDeviceId[] = "loopback"; 34 const char AudioManagerCras::kLoopbackDeviceId[] = "loopback";
26 35
27 bool AudioManagerCras::HasAudioOutputDevices() { 36 bool AudioManagerCras::HasAudioOutputDevices() {
28 return true; 37 return true;
29 } 38 }
30 39
31 bool AudioManagerCras::HasAudioInputDevices() { 40 bool AudioManagerCras::HasAudioInputDevices() {
32 return true; 41 return true;
33 } 42 }
34 43
35 AudioManagerCras::AudioManagerCras() { 44 AudioManagerCras::AudioManagerCras() {
36 SetMaxOutputStreamsAllowed(kMaxOutputStreams); 45 SetMaxOutputStreamsAllowed(kMaxOutputStreams);
37 } 46 }
38 47
39 AudioManagerCras::~AudioManagerCras() { 48 AudioManagerCras::~AudioManagerCras() {
40 Shutdown(); 49 Shutdown();
41 } 50 }
42 51
43 void AudioManagerCras::ShowAudioInputSettings() { 52 void AudioManagerCras::ShowAudioInputSettings() {
44 NOTIMPLEMENTED(); 53 NOTIMPLEMENTED();
45 } 54 }
46 55
47 void AudioManagerCras::GetAudioInputDeviceNames( 56 void AudioManagerCras::GetAudioInputDeviceNames(
48 media::AudioDeviceNames* device_names) { 57 AudioDeviceNames* device_names) {
49 DCHECK(device_names->empty()); 58 AddDefaultDevice(device_names);
50 GetCrasAudioInputDevices(device_names); 59 }
51 return; 60
61 void AudioManagerCras::GetAudioOutputDeviceNames(
62 AudioDeviceNames* device_names) {
63 AddDefaultDevice(device_names);
52 } 64 }
53 65
54 AudioParameters AudioManagerCras::GetInputStreamParameters( 66 AudioParameters AudioManagerCras::GetInputStreamParameters(
55 const std::string& device_id) { 67 const std::string& device_id) {
56 static const int kDefaultInputBufferSize = 1024; 68 static const int kDefaultInputBufferSize = 1024;
57 // TODO(hshi): Fine-tune audio parameters based on |device_id|. The optimal 69 // TODO(hshi): Fine-tune audio parameters based on |device_id|. The optimal
58 // parameters for the loopback stream may differ from the default. 70 // parameters for the loopback stream may differ from the default.
59 return AudioParameters( 71 return AudioParameters(
60 AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO, 72 AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
61 kDefaultSampleRate, 16, kDefaultInputBufferSize); 73 kDefaultSampleRate, 16, kDefaultInputBufferSize);
62 } 74 }
63 75
64 void AudioManagerCras::GetCrasAudioInputDevices(
65 media::AudioDeviceNames* device_names) {
66 // Cras will route audio from a proper physical device automatically.
67 device_names->push_back(
68 AudioDeviceName(AudioManagerBase::kDefaultDeviceName,
69 AudioManagerBase::kDefaultDeviceId));
70 }
71
72 AudioOutputStream* AudioManagerCras::MakeLinearOutputStream( 76 AudioOutputStream* AudioManagerCras::MakeLinearOutputStream(
73 const AudioParameters& params) { 77 const AudioParameters& params) {
74 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 78 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
75 return MakeOutputStream(params); 79 return MakeOutputStream(params);
76 } 80 }
77 81
78 AudioOutputStream* AudioManagerCras::MakeLowLatencyOutputStream( 82 AudioOutputStream* AudioManagerCras::MakeLowLatencyOutputStream(
79 const AudioParameters& params, 83 const AudioParameters& params,
80 const std::string& device_id, 84 const std::string& device_id,
81 const std::string& input_device_id) { 85 const std::string& input_device_id) {
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 const AudioParameters& params) { 134 const AudioParameters& params) {
131 return new CrasUnifiedStream(params, this); 135 return new CrasUnifiedStream(params, this);
132 } 136 }
133 137
134 AudioInputStream* AudioManagerCras::MakeInputStream( 138 AudioInputStream* AudioManagerCras::MakeInputStream(
135 const AudioParameters& params, const std::string& device_id) { 139 const AudioParameters& params, const std::string& device_id) {
136 return new CrasInputStream(params, this, device_id); 140 return new CrasInputStream(params, this, device_id);
137 } 141 }
138 142
139 } // namespace media 143 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/cras/audio_manager_cras.h ('k') | media/audio/linux/audio_manager_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698