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

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

Issue 518433002: Revert of Revert of Remove the last piece of deprecated synchronous IO code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « media/audio/audio_parameters.cc ('k') | media/audio/cras/cras_unified.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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
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;
128 if (input_params.IsValid()) { 127 if (input_params.IsValid()) {
129 sample_rate = input_params.sample_rate(); 128 sample_rate = input_params.sample_rate();
130 bits_per_sample = input_params.bits_per_sample(); 129 bits_per_sample = input_params.bits_per_sample();
131 channel_layout = input_params.channel_layout(); 130 channel_layout = input_params.channel_layout();
132 input_channels = input_params.input_channels();
133 buffer_size = 131 buffer_size =
134 std::min(kMaximumOutputBufferSize, 132 std::min(kMaximumOutputBufferSize,
135 std::max(buffer_size, input_params.frames_per_buffer())); 133 std::max(buffer_size, input_params.frames_per_buffer()));
136 } 134 }
137 135
138 int user_buffer_size = GetUserBufferSize(); 136 int user_buffer_size = GetUserBufferSize();
139 if (user_buffer_size) 137 if (user_buffer_size)
140 buffer_size = user_buffer_size; 138 buffer_size = user_buffer_size;
141 139
142 return AudioParameters( 140 return AudioParameters(
143 AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, input_channels, 141 AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
144 sample_rate, bits_per_sample, buffer_size, AudioParameters::NO_EFFECTS); 142 sample_rate, bits_per_sample, buffer_size, AudioParameters::NO_EFFECTS);
145 } 143 }
146 144
147 AudioOutputStream* AudioManagerCras::MakeOutputStream( 145 AudioOutputStream* AudioManagerCras::MakeOutputStream(
148 const AudioParameters& params) { 146 const AudioParameters& params) {
149 return new CrasUnifiedStream(params, this); 147 return new CrasUnifiedStream(params, this);
150 } 148 }
151 149
152 AudioInputStream* AudioManagerCras::MakeInputStream( 150 AudioInputStream* AudioManagerCras::MakeInputStream(
153 const AudioParameters& params, const std::string& device_id) { 151 const AudioParameters& params, const std::string& device_id) {
154 return new CrasInputStream(params, this, device_id); 152 return new CrasInputStream(params, this, device_id);
155 } 153 }
156 154
157 snd_pcm_format_t AudioManagerCras::BitsToFormat(int bits_per_sample) { 155 snd_pcm_format_t AudioManagerCras::BitsToFormat(int bits_per_sample) {
158 switch (bits_per_sample) { 156 switch (bits_per_sample) {
159 case 8: 157 case 8:
160 return SND_PCM_FORMAT_U8; 158 return SND_PCM_FORMAT_U8;
161 case 16: 159 case 16:
162 return SND_PCM_FORMAT_S16; 160 return SND_PCM_FORMAT_S16;
163 case 24: 161 case 24:
164 return SND_PCM_FORMAT_S24; 162 return SND_PCM_FORMAT_S24;
165 case 32: 163 case 32:
166 return SND_PCM_FORMAT_S32; 164 return SND_PCM_FORMAT_S32;
167 default: 165 default:
168 return SND_PCM_FORMAT_UNKNOWN; 166 return SND_PCM_FORMAT_UNKNOWN;
169 } 167 }
170 } 168 }
171 169
172 } // namespace media 170 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/audio_parameters.cc ('k') | media/audio/cras/cras_unified.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698