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

Unified Diff: media/audio/pulse/audio_manager_pulse.cc

Issue 2973763002: Revert of Make OS audio buffer size limits visible. (Closed)
Patch Set: Created 3 years, 5 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/mac/audio_manager_mac.cc ('k') | media/base/audio_latency.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/pulse/audio_manager_pulse.cc
diff --git a/media/audio/pulse/audio_manager_pulse.cc b/media/audio/pulse/audio_manager_pulse.cc
index e1ea89ad413e5c479161e9d6cf1b5be9126746d5..6fa330f0e82708556ff7f6d93f31d610c9261da9 100644
--- a/media/audio/pulse/audio_manager_pulse.cc
+++ b/media/audio/pulse/audio_manager_pulse.cc
@@ -18,7 +18,6 @@
#include "media/audio/pulse/pulse_util.h"
#include "media/base/audio_parameters.h"
#include "media/base/channel_layout.h"
-#include "media/base/limits.h"
namespace media {
@@ -27,6 +26,10 @@
// Maximum number of output streams that can be open simultaneously.
static const int kMaxOutputStreams = 50;
+
+// Define bounds for the output buffer size.
+static const int kMinimumOutputBufferSize = 512;
+static const int kMaximumOutputBufferSize = 8192;
// Default input buffer size.
static const int kDefaultInputBufferSize = 1024;
@@ -161,7 +164,7 @@
// TODO(tommi): Support |output_device_id|.
VLOG_IF(0, !output_device_id.empty()) << "Not implemented!";
- int buffer_size = limits::kMinAudioBufferSize;
+ int buffer_size = kMinimumOutputBufferSize;
int bits_per_sample = 16;
// Query native parameters where applicable; Pulse does not require these to
@@ -174,7 +177,7 @@
bits_per_sample = input_params.bits_per_sample();
channel_layout = input_params.channel_layout();
buffer_size =
- std::min(static_cast<int>(limits::kMaxAudioBufferSize),
+ std::min(kMaximumOutputBufferSize,
std::max(buffer_size, input_params.frames_per_buffer()));
}
« no previous file with comments | « media/audio/mac/audio_manager_mac.cc ('k') | media/base/audio_latency.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698