summaryrefslogtreecommitdiffstats
path: root/media/audio/pulse
diff options
context:
space:
mode:
authordalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-23 20:37:38 +0000
committerdalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-23 20:37:38 +0000
commit43feaabe8b2e6655e93877f3b229e032572ed9f5 (patch)
tree40b67212b83ea4e7a90f139cdf98f2d6ea2c37f4 /media/audio/pulse
parent88d18876460bd62651df29f824a1cd638414835d (diff)
downloadchromium_src-43feaabe8b2e6655e93877f3b229e032572ed9f5.zip
chromium_src-43feaabe8b2e6655e93877f3b229e032572ed9f5.tar.gz
chromium_src-43feaabe8b2e6655e93877f3b229e032572ed9f5.tar.bz2
Always use the native sample rate for Pulse.
Lets see if this resolves the glitching issues. BUG=366433 TEST=none Review URL: https://codereview.chromium.org/339583005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/pulse')
-rw-r--r--media/audio/pulse/audio_manager_pulse.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/media/audio/pulse/audio_manager_pulse.cc b/media/audio/pulse/audio_manager_pulse.cc
index 412f2a4..f795129 100644
--- a/media/audio/pulse/audio_manager_pulse.cc
+++ b/media/audio/pulse/audio_manager_pulse.cc
@@ -175,7 +175,7 @@ AudioParameters AudioManagerPulse::GetPreferredOutputStreamParameters(
int buffer_size = kMinimumOutputBufferSize;
int bits_per_sample = 16;
int input_channels = 0;
- int sample_rate;
+ int sample_rate = GetNativeSampleRate();
if (input_params.IsValid()) {
bits_per_sample = input_params.bits_per_sample();
channel_layout = input_params.channel_layout();
@@ -183,9 +183,6 @@ AudioParameters AudioManagerPulse::GetPreferredOutputStreamParameters(
buffer_size =
std::min(kMaximumOutputBufferSize,
std::max(buffer_size, input_params.frames_per_buffer()));
- sample_rate = input_params.sample_rate();
- } else {
- sample_rate = GetNativeSampleRate();
}
int user_buffer_size = GetUserBufferSize();