Commit: 8850557b90e93415ad73658cbc8f2e517ac8f28e - frameworks-base (git)

frameworks/base

Commit MetaInfo

• Revision: 8850557b90e93415ad73658cbc8f2e517ac8f28e (tree)
• Time: 2011-08-11 12:47:40
• Author: Wallace Wang <Wallace1.Wang@gmai...>
• Commiter: Chih-Wei Huang

Log Message

make audio recorder ok

Change Summary

• modified: include/media/AudioSystem.h

Incremental Difference

--- a/include/media/AudioSystem.h
+++ b/include/media/AudioSystem.h
@@ -103,6 +103,7 @@ public:
     // Channel mask definitions must be kept in sync with JAVA values in /media/java/android/media/AudioFormat.java
     enum audio_channels {
         // output channels
+        CHANNEL_OUT_DEFAULT = 0x1,
         CHANNEL_OUT_FRONT_LEFT = 0x4,
         CHANNEL_OUT_FRONT_RIGHT = 0x8,
         CHANNEL_OUT_FRONT_CENTER = 0x10,
@@ -123,11 +124,12 @@ public:
         CHANNEL_OUT_7POINT1 = (CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT |
                 CHANNEL_OUT_FRONT_CENTER | CHANNEL_OUT_LOW_FREQUENCY | CHANNEL_OUT_BACK_LEFT | CHANNEL_OUT_BACK_RIGHT |
                 CHANNEL_OUT_FRONT_LEFT_OF_CENTER | CHANNEL_OUT_FRONT_RIGHT_OF_CENTER),
-        CHANNEL_OUT_ALL = (CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT |
+        CHANNEL_OUT_ALL = (CHANNEL_OUT_DEFAULT | CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT |
                 CHANNEL_OUT_FRONT_CENTER | CHANNEL_OUT_LOW_FREQUENCY | CHANNEL_OUT_BACK_LEFT | CHANNEL_OUT_BACK_RIGHT |
                 CHANNEL_OUT_FRONT_LEFT_OF_CENTER | CHANNEL_OUT_FRONT_RIGHT_OF_CENTER | CHANNEL_OUT_BACK_CENTER),
 
         // input channels
+        CHANNEL_IN_DEFAULT = 0x1,
         CHANNEL_IN_LEFT = 0x4,
         CHANNEL_IN_RIGHT = 0x8,
         CHANNEL_IN_FRONT = 0x10,
@@ -144,7 +146,7 @@ public:
         CHANNEL_IN_VOICE_DNLINK = 0x8000,
         CHANNEL_IN_MONO = CHANNEL_IN_FRONT,
         CHANNEL_IN_STEREO = (CHANNEL_IN_LEFT | CHANNEL_IN_RIGHT),
-        CHANNEL_IN_ALL = (CHANNEL_IN_LEFT | CHANNEL_IN_RIGHT | CHANNEL_IN_FRONT | CHANNEL_IN_BACK|
+        CHANNEL_IN_ALL = (CHANNEL_IN_DEFAULT | CHANNEL_IN_LEFT | CHANNEL_IN_RIGHT | CHANNEL_IN_FRONT | CHANNEL_IN_BACK|
                 CHANNEL_IN_LEFT_PROCESSED | CHANNEL_IN_RIGHT_PROCESSED | CHANNEL_IN_FRONT_PROCESSED | CHANNEL_IN_BACK_PROCESSED|
                 CHANNEL_IN_PRESSURE | CHANNEL_IN_X_AXIS | CHANNEL_IN_Y_AXIS | CHANNEL_IN_Z_AXIS |
                 CHANNEL_IN_VOICE_UPLINK | CHANNEL_IN_VOICE_DNLINK)