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

Unified Diff: content/renderer/media/audio_renderer_mixer_manager.cc

Issue 16348003: Merge 202233 "Allow sample rate pass through on Linux." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1500/src/
Patch Set: Created 7 years, 6 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 | « no previous file | media/audio/pulse/audio_manager_pulse.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/audio_renderer_mixer_manager.cc
===================================================================
--- content/renderer/media/audio_renderer_mixer_manager.cc (revision 204027)
+++ content/renderer/media/audio_renderer_mixer_manager.cc (working copy)
@@ -52,9 +52,9 @@
return it->second.mixer;
}
- // On ChromeOS we can rely on the playback device to handle resampling, so
- // don't waste cycles on it here.
-#if defined(OS_CHROMEOS)
+ // On ChromeOS and Linux we can rely on the playback device to handle
+ // resampling, so don't waste cycles on it here.
+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
int sample_rate = params.sample_rate();
#else
int sample_rate = hardware_config_->GetOutputSampleRate();
« no previous file with comments | « no previous file | media/audio/pulse/audio_manager_pulse.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698