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

Unified Diff: media/audio/linux/audio_manager_linux.cc

Issue 10937027: Reland 10952007: 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/linux/audio_manager_linux.cc
diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc
index b126ed1fdb4b3d699a05fa9bf403389f68864378..b19e9603b602f2f26dfbc6669d98b865f1692685 100644
--- a/media/audio/linux/audio_manager_linux.cc
+++ b/media/audio/linux/audio_manager_linux.cc
@@ -11,6 +11,7 @@
#include "base/process_util.h"
#include "base/stl_util.h"
#include "media/audio/audio_output_dispatcher.h"
+#include "media/audio/audio_util.h"
#include "media/audio/linux/alsa_input.h"
#include "media/audio/linux/alsa_output.h"
#include "media/audio/linux/alsa_wrapper.h"
@@ -342,4 +343,26 @@ AudioManager* CreateAudioManager() {
return new AudioManagerLinux();
}
+AudioParameters AudioManagerLinux::GetPreferredLowLatencyOutputStreamParameters(
+ const AudioParameters& input_params) {
+ // Since Linux doesn't actually have a low latency path the hardware buffer
+ // size is quite large in order to prevent glitches with general usage. Some
+ // clients, such as WebRTC, have a more limited use case and work acceptably
+ // with a smaller buffer size. The check below allows clients which want to
+ // try a smaller buffer size on Linux to do so.
+ int buffer_size = 0;
+ if (static_cast<size_t>(input_params.frames_per_buffer()) <
+ GetAudioHardwareBufferSize()) {
+ buffer_size = input_params.frames_per_buffer();
+ } else {
+ buffer_size = GetAudioHardwareBufferSize();
+ }
+
+ // TODO(dalecurtis): This should include bits per channel and channel layout
+ // eventually.
+ return AudioParameters(
+ AudioParameters::AUDIO_PCM_LOW_LATENCY, input_params.channel_layout(),
+ GetAudioHardwareSampleRate(), 16, buffer_size);
+}
+
} // namespace media
« 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