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

Unified Diff: media/audio/android/audio_manager_android.cc

Issue 1921963004: Add support for multichannel playback to OpenSLES output. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Avoid multichannel on KitKat. Created 4 years, 8 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/BUILD.gn ('k') | media/audio/android/opensles_input.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/android/audio_manager_android.cc
diff --git a/media/audio/android/audio_manager_android.cc b/media/audio/android/audio_manager_android.cc
index 8325801e4bf4fd75bbd826a01e69f1837dcb19b2..e48aa5bb785fe229f08ffcf97f42f867eba83558 100644
--- a/media/audio/android/audio_manager_android.cc
+++ b/media/audio/android/audio_manager_android.cc
@@ -314,7 +314,16 @@ AudioParameters AudioManagerAndroid::GetPreferredOutputStreamParameters(
// Use the client's input parameters if they are valid.
sample_rate = input_params.sample_rate();
bits_per_sample = input_params.bits_per_sample();
- channel_layout = input_params.channel_layout();
+
+ // Pre-Lollipop devices don't support > stereo OpenSLES output and the
+ // AudioManager APIs for GetOptimalOutputFrameSize() don't support channel
+ // layouts greater than stereo unless low latency audio is supported.
+ if (input_params.channels() <= 2 ||
+ (base::android::BuildInfo::GetInstance()->sdk_int() >= 21 &&
+ IsAudioLowLatencySupported())) {
+ channel_layout = input_params.channel_layout();
+ }
+
buffer_size = GetOptimalOutputFrameSize(
sample_rate, ChannelLayoutToChannelCount(channel_layout));
}
« no previous file with comments | « media/audio/BUILD.gn ('k') | media/audio/android/opensles_input.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698