commit 5cb9343d2739da755186f8dcdf1da307671e7353
author Glenn Kasten <gkasten@google.com> Wed Mar 14 13:39:14 2012 -0700
committer Glenn Kasten <gkasten@google.com> Wed Mar 14 17:32:50 2012 -0700
tree 7114d43c8d58c27a7875ee373e8d96f46837c14a
parent cde9b8b8bd0c84c62de49e73c08d224274280bfa

audio_channel_in/out_mask_from_count

Change-Id: Id62e9dee55367495c1cff04ea0b9ff7f07742e58

src/android/android_sles_conversions.h

diff --git a/src/android/android_sles_conversions.h b/src/android/android_sles_conversions.h
index b818cc4..6a27dc0 100644
--- a/src/android/android_sles_conversions.h
+++ b/src/android/android_sles_conversions.h
@@ -64,17 +64,13 @@
 
 static inline int sles_to_android_channelMaskIn(SLuint32 nbChannels, SLuint32 channelMask) {
     // FIXME handle channel mask mapping between SL ES and Android
-    return (nbChannels == 1 ?
-            AUDIO_CHANNEL_IN_MONO :
-            AUDIO_CHANNEL_IN_STEREO);
+    return audio_channel_in_mask_from_count(nbChannels);
 }
 
 
 static inline int sles_to_android_channelMaskOut(SLuint32 nbChannels, SLuint32 channelMask) {
     // FIXME handle channel mask mapping between SL ES and Android
-    return (nbChannels == 1 ?
-            AUDIO_CHANNEL_OUT_MONO :
-            AUDIO_CHANNEL_OUT_STEREO);
+    return audio_channel_out_mask_from_count(nbChannels);
 }