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

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

Issue 2787433002: audio_manager_cras: Set minimum output buffer size per board (Closed)
Patch Set: audio_manager_cras: Set minimum output buffer size per board Created 3 years, 8 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') | no next file » | 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
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/environment.h" 12 #include "base/environment.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/metrics/field_trial.h" 14 #include "base/metrics/field_trial.h"
15 #include "base/metrics/histogram_macros.h" 15 #include "base/metrics/histogram_macros.h"
16 #include "base/nix/xdg_util.h" 16 #include "base/nix/xdg_util.h"
17 #include "base/stl_util.h" 17 #include "base/stl_util.h"
18 #include "base/strings/string_number_conversions.h" 18 #include "base/strings/string_number_conversions.h"
19 #include "base/sys_info.h"
19 #include "chromeos/audio/audio_device.h" 20 #include "chromeos/audio/audio_device.h"
20 #include "chromeos/audio/cras_audio_handler.h" 21 #include "chromeos/audio/cras_audio_handler.h"
21 #include "media/audio/audio_device_description.h" 22 #include "media/audio/audio_device_description.h"
22 #include "media/audio/audio_features.h" 23 #include "media/audio/audio_features.h"
23 #include "media/audio/cras/cras_input.h" 24 #include "media/audio/cras/cras_input.h"
24 #include "media/audio/cras/cras_unified.h" 25 #include "media/audio/cras/cras_unified.h"
25 #include "media/base/channel_layout.h" 26 #include "media/base/channel_layout.h"
26 #include "media/base/localized_strings.h" 27 #include "media/base/localized_strings.h"
27 28
28 // cras_util.h headers pull in min/max macros... 29 // cras_util.h headers pull in min/max macros...
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 } 259 }
259 260
260 AudioInputStream* AudioManagerCras::MakeLowLatencyInputStream( 261 AudioInputStream* AudioManagerCras::MakeLowLatencyInputStream(
261 const AudioParameters& params, 262 const AudioParameters& params,
262 const std::string& device_id, 263 const std::string& device_id,
263 const LogCallback& log_callback) { 264 const LogCallback& log_callback) {
264 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); 265 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
265 return MakeInputStream(params, device_id); 266 return MakeInputStream(params, device_id);
266 } 267 }
267 268
269 int AudioManagerCras::GetMinimumOutputBufferSizePerBoard() {
270 // On faster boards we can use smaller buffer size for lower latency.
271 // On slower boards we should use larger buffer size to prevent underrun.
272 std::string board = base::SysInfo::GetLsbReleaseBoard();
273 if (board == "kevin")
274 return 768;
275 else if (board == "samus")
276 return 256;
277 return kMinimumOutputBufferSize;
278 }
279
268 AudioParameters AudioManagerCras::GetPreferredOutputStreamParameters( 280 AudioParameters AudioManagerCras::GetPreferredOutputStreamParameters(
269 const std::string& output_device_id, 281 const std::string& output_device_id,
270 const AudioParameters& input_params) { 282 const AudioParameters& input_params) {
271 ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO; 283 ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
272 int sample_rate = kDefaultSampleRate; 284 int sample_rate = kDefaultSampleRate;
273 int buffer_size = kMinimumOutputBufferSize; 285 int buffer_size = GetMinimumOutputBufferSizePerBoard();
274 int bits_per_sample = 16; 286 int bits_per_sample = 16;
275 if (input_params.IsValid()) { 287 if (input_params.IsValid()) {
276 sample_rate = input_params.sample_rate(); 288 sample_rate = input_params.sample_rate();
277 bits_per_sample = input_params.bits_per_sample(); 289 bits_per_sample = input_params.bits_per_sample();
278 channel_layout = input_params.channel_layout(); 290 channel_layout = input_params.channel_layout();
279 buffer_size = 291 buffer_size =
280 std::min(kMaximumOutputBufferSize, 292 std::min(kMaximumOutputBufferSize,
281 std::max(buffer_size, input_params.frames_per_buffer())); 293 std::max(buffer_size, input_params.frames_per_buffer()));
282 } 294 }
283 295
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 329
318 bool AudioManagerCras::IsDefault(const std::string& device_id, bool is_input) { 330 bool AudioManagerCras::IsDefault(const std::string& device_id, bool is_input) {
319 AudioDeviceNames device_names; 331 AudioDeviceNames device_names;
320 GetAudioDeviceNamesImpl(is_input, &device_names); 332 GetAudioDeviceNamesImpl(is_input, &device_names);
321 DCHECK(!device_names.empty()); 333 DCHECK(!device_names.empty());
322 const AudioDeviceName& device_name = device_names.front(); 334 const AudioDeviceName& device_name = device_names.front();
323 return device_name.unique_id == device_id; 335 return device_name.unique_id == device_id;
324 } 336 }
325 337
326 } // namespace media 338 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/cras/audio_manager_cras.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698