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

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

Issue 583833008: Set keyboard mic effect if available. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: This should be the correct setup and teardown order for tests. Created 6 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/mock_audio_manager.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 <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
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) {
81 DCHECK(GetTaskRunner()->BelongsToCurrentThread());
82
80 int user_buffer_size = GetUserBufferSize(); 83 int user_buffer_size = GetUserBufferSize();
81 int buffer_size = user_buffer_size ? 84 int buffer_size = user_buffer_size ?
82 user_buffer_size : kDefaultInputBufferSize; 85 user_buffer_size : kDefaultInputBufferSize;
86 AudioParameters::PlatformEffectsMask effects =
87 has_keyboard_mic_ ? AudioParameters::KEYBOARD_MIC
88 : AudioParameters::NO_EFFECTS;
83 89
84 // TODO(hshi): Fine-tune audio parameters based on |device_id|. The optimal 90 // TODO(hshi): Fine-tune audio parameters based on |device_id|. The optimal
85 // parameters for the loopback stream may differ from the default. 91 // parameters for the loopback stream may differ from the default.
86 return AudioParameters( 92 return AudioParameters(
87 AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO, 93 AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
88 kDefaultSampleRate, 16, buffer_size); 94 kDefaultSampleRate, 16, buffer_size, effects);
95 }
96
97 void AudioManagerCras::SetHasKeyboardMic() {
98 DCHECK(GetTaskRunner()->BelongsToCurrentThread());
99 has_keyboard_mic_ = true;
89 } 100 }
90 101
91 AudioOutputStream* AudioManagerCras::MakeLinearOutputStream( 102 AudioOutputStream* AudioManagerCras::MakeLinearOutputStream(
92 const AudioParameters& params) { 103 const AudioParameters& params) {
93 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 104 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
94 return MakeOutputStream(params); 105 return MakeOutputStream(params);
95 } 106 }
96 107
97 AudioOutputStream* AudioManagerCras::MakeLowLatencyOutputStream( 108 AudioOutputStream* AudioManagerCras::MakeLowLatencyOutputStream(
98 const AudioParameters& params, 109 const AudioParameters& params,
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 case 24: 172 case 24:
162 return SND_PCM_FORMAT_S24; 173 return SND_PCM_FORMAT_S24;
163 case 32: 174 case 32:
164 return SND_PCM_FORMAT_S32; 175 return SND_PCM_FORMAT_S32;
165 default: 176 default:
166 return SND_PCM_FORMAT_UNKNOWN; 177 return SND_PCM_FORMAT_UNKNOWN;
167 } 178 }
168 } 179 }
169 180
170 } // namespace media 181 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/cras/audio_manager_cras.h ('k') | media/audio/mock_audio_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698