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

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

Issue 10991019: audio_manager_linux: Allow CRAS to decide if sample rate conversion is needed. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: comment fix. 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 | « no previous file | no next file » | 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 b19e9603b602f2f26dfbc6669d98b865f1692685..5f2496588ea68f5cabac541dcc194d96e7677137 100644
--- a/media/audio/linux/audio_manager_linux.cc
+++ b/media/audio/linux/audio_manager_linux.cc
@@ -350,19 +350,20 @@ AudioParameters AudioManagerLinux::GetPreferredLowLatencyOutputStreamParameters(
// 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()) {
+ int buffer_size = GetAudioHardwareBufferSize();
+ if (static_cast<size_t>(input_params.frames_per_buffer()) < buffer_size)
DaleCurtis 2012/09/25 20:49:46 Drop static_cast now.
scherkus (not reviewing) 2012/09/25 20:52:39 nit: you can remove static_cast<>
buffer_size = input_params.frames_per_buffer();
- } else {
- buffer_size = GetAudioHardwareBufferSize();
- }
+
+ int sample_rate = GetAudioHardwareSampleRate();
+ // CRAS will sample rate convert if needed, pass the desired sample rate.
DaleCurtis 2012/09/25 20:49:46 s/pass/so pass through input sample rate./
+ if (UseCras())
+ sample_rate = input_params.sample_rate();
// 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);
+ sample_rate, 16, buffer_size);
}
} // namespace media
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698