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

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

Issue 10952022: Revert 157524 - Pass through small buffer sizes without FIFO on Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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/linux/audio_manager_linux.h ('k') | media/audio/win/audio_manager_win.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 (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_parameters.h"
14 #include "media/audio/audio_output_dispatcher.h" 13 #include "media/audio/audio_output_dispatcher.h"
15 #include "media/audio/audio_util.h"
16 #include "media/audio/linux/alsa_input.h" 14 #include "media/audio/linux/alsa_input.h"
17 #include "media/audio/linux/alsa_output.h" 15 #include "media/audio/linux/alsa_output.h"
18 #include "media/audio/linux/alsa_wrapper.h" 16 #include "media/audio/linux/alsa_wrapper.h"
19 #if defined(USE_PULSEAUDIO) 17 #if defined(USE_PULSEAUDIO)
20 #include "media/audio/pulse/pulse_output.h" 18 #include "media/audio/pulse/pulse_output.h"
21 #endif 19 #endif
22 #if defined(USE_CRAS) 20 #if defined(USE_CRAS)
23 #include "media/audio/linux/cras_input.h" 21 #include "media/audio/linux/cras_input.h"
24 #include "media/audio/linux/cras_output.h" 22 #include "media/audio/linux/cras_output.h"
25 #endif 23 #endif
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 switches::kAlsaInputDevice); 335 switches::kAlsaInputDevice);
338 } 336 }
339 337
340 return new AlsaPcmInputStream(this, device_name, params, wrapper_.get()); 338 return new AlsaPcmInputStream(this, device_name, params, wrapper_.get());
341 } 339 }
342 340
343 AudioManager* CreateAudioManager() { 341 AudioManager* CreateAudioManager() {
344 return new AudioManagerLinux(); 342 return new AudioManagerLinux();
345 } 343 }
346 344
347 AudioParameters AudioManagerLinux::GetPreferredLowLatencyOutputStreamParameters(
348 const AudioParameters& input_params) {
349 // Since Linux doesn't actually have a low latency path the hardware buffer
350 // size is quite large in order to prevent glitches with general usage. Some
351 // clients, such as WebRTC, have a more limited use case and work acceptably
352 // with a smaller buffer size. The check below allows clients which want to
353 // try a smaller buffer size on Linux to do so.
354 int buffer_size = std::min(
355 static_cast<size_t>(input_params.frames_per_buffer()),
356 GetAudioHardwareBufferSize());
357
358 // TODO(dalecurtis): This should include bits per channel and channel layout
359 // eventually.
360 return AudioParameters(
361 AudioParameters::AUDIO_PCM_LOW_LATENCY, input_params.channel_layout(),
362 GetAudioHardwareSampleRate(), 16, buffer_size);
363 }
364
365 } // namespace media 345 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/linux/audio_manager_linux.h ('k') | media/audio/win/audio_manager_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698