summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2015-06-09 15:40:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-09 15:40:28 +0000
commit3a0f65a96a56f18954088bcb43a7b0a57efe2bc0 (patch)
treee8d807c4ad51dfdcedb43e0516bdd5362fb6115f /src
parentba0b2c989ecbbae4678903954a4629ef342e1089 (diff)
parent6805ee0037e981af43e990d309280950d13addad (diff)
downloadandroid_frameworks_wilhelm-3a0f65a96a56f18954088bcb43a7b0a57efe2bc0.tar.gz
android_frameworks_wilhelm-3a0f65a96a56f18954088bcb43a7b0a57efe2bc0.tar.bz2
android_frameworks_wilhelm-3a0f65a96a56f18954088bcb43a7b0a57efe2bc0.zip
Merge "Take advantage of audio_channel_in_mask_from_count" into mnc-dev
Diffstat (limited to 'src')
-rw-r--r--src/android/AudioRecorder_to_android.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/android/AudioRecorder_to_android.cpp b/src/android/AudioRecorder_to_android.cpp
index 0a205dc..e5fbc26 100644
--- a/src/android/AudioRecorder_to_android.cpp
+++ b/src/android/AudioRecorder_to_android.cpp
@@ -427,8 +427,9 @@ SLresult android_audioRecorder_realize(CAudioRecorder* ar, SLboolean async) {
ar->mRecordSource, // source
sampleRate, // sample rate in Hertz
sles_to_android_sampleFormat(df_pcm), // format
- // FIXME ignores df_pcm->channelMask, assumes positional,
- // and only handles mono and stereo
+ // FIXME ignores df_pcm->channelMask,
+ // and assumes positional mask for mono or stereo,
+ // or indexed mask for > 2 channels
audio_channel_in_mask_from_count(df_pcm->numChannels),
android::String16(), // app ops
0, // frameCount