commit c349636c7cec0abe3a92c220a6d828edbd21208b
author Jean-Michel Trivi <jmtrivi@google.com> Tue Jul 26 09:27:30 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 26 09:27:30 2011 -0700
tree 6ceb3b5acea7b78682a947085352a2d35a72df55
parent 9e9c18d55b34c97db2c39a9fa0a2190b423b4c0b
parent 6d4f39754bff9c1dcb8023839ea583b6d0723b14

Merge "Fix bug 4319552 Use commonly defined channel mask values in native"

include/system/audio.h

diff --git a/include/system/audio.h b/include/system/audio.h
index f4aaa4f..52ba5e7 100644
--- a/include/system/audio.h
+++ b/include/system/audio.h
@@ -152,28 +152,26 @@
                                         AUDIO_FORMAT_PCM_SUB_8_24_BIT),
 } audio_format_t;
 
-/* Channel mask definitions must be kept in sync with JAVA values in
- * frameworks/base/media/java/android/media/AudioFormat.java */
 typedef enum {
     /* output channels */
-    AUDIO_CHANNEL_OUT_FRONT_LEFT            = 0x4,
-    AUDIO_CHANNEL_OUT_FRONT_RIGHT           = 0x8,
-    AUDIO_CHANNEL_OUT_FRONT_CENTER          = 0x10,
-    AUDIO_CHANNEL_OUT_LOW_FREQUENCY         = 0x20,
-    AUDIO_CHANNEL_OUT_BACK_LEFT             = 0x40,
-    AUDIO_CHANNEL_OUT_BACK_RIGHT            = 0x80,
-    AUDIO_CHANNEL_OUT_FRONT_LEFT_OF_CENTER  = 0x100,
-    AUDIO_CHANNEL_OUT_FRONT_RIGHT_OF_CENTER = 0x200,
-    AUDIO_CHANNEL_OUT_BACK_CENTER           = 0x400,
-    AUDIO_CHANNEL_OUT_SIDE_LEFT             = 0x800,
-    AUDIO_CHANNEL_OUT_SIDE_RIGHT            = 0x1000,
-    AUDIO_CHANNEL_OUT_TOP_CENTER            = 0x2000,
-    AUDIO_CHANNEL_OUT_TOP_FRONT_LEFT        = 0x4000,
-    AUDIO_CHANNEL_OUT_TOP_FRONT_CENTER      = 0x8000,
-    AUDIO_CHANNEL_OUT_TOP_FRONT_RIGHT       = 0x10000,
-    AUDIO_CHANNEL_OUT_TOP_BACK_LEFT         = 0x20000,
-    AUDIO_CHANNEL_OUT_TOP_BACK_CENTER       = 0x40000,
-    AUDIO_CHANNEL_OUT_TOP_BACK_RIGHT        = 0x80000,
+    AUDIO_CHANNEL_OUT_FRONT_LEFT            = 0x1,
+    AUDIO_CHANNEL_OUT_FRONT_RIGHT           = 0x2,
+    AUDIO_CHANNEL_OUT_FRONT_CENTER          = 0x4,
+    AUDIO_CHANNEL_OUT_LOW_FREQUENCY         = 0x8,
+    AUDIO_CHANNEL_OUT_BACK_LEFT             = 0x10,
+    AUDIO_CHANNEL_OUT_BACK_RIGHT            = 0x20,
+    AUDIO_CHANNEL_OUT_FRONT_LEFT_OF_CENTER  = 0x40,
+    AUDIO_CHANNEL_OUT_FRONT_RIGHT_OF_CENTER = 0x80,
+    AUDIO_CHANNEL_OUT_BACK_CENTER           = 0x100,
+    AUDIO_CHANNEL_OUT_SIDE_LEFT             = 0x200,
+    AUDIO_CHANNEL_OUT_SIDE_RIGHT            = 0x400,
+    AUDIO_CHANNEL_OUT_TOP_CENTER            = 0x800,
+    AUDIO_CHANNEL_OUT_TOP_FRONT_LEFT        = 0x1000,
+    AUDIO_CHANNEL_OUT_TOP_FRONT_CENTER      = 0x2000,
+    AUDIO_CHANNEL_OUT_TOP_FRONT_RIGHT       = 0x4000,
+    AUDIO_CHANNEL_OUT_TOP_BACK_LEFT         = 0x8000,
+    AUDIO_CHANNEL_OUT_TOP_BACK_CENTER       = 0x10000,
+    AUDIO_CHANNEL_OUT_TOP_BACK_RIGHT        = 0x20000,
 
     AUDIO_CHANNEL_OUT_MONO     = AUDIO_CHANNEL_OUT_FRONT_LEFT,
     AUDIO_CHANNEL_OUT_STEREO   = (AUDIO_CHANNEL_OUT_FRONT_LEFT |