OSDN Git Service

Audio HAL: extensions for new SoC features
authorMikhail Naganov <mnaganov@google.com>
Mon, 23 Jan 2017 18:44:14 +0000 (10:44 -0800)
committerMikhail Naganov <mnaganov@google.com>
Fri, 27 Jan 2017 01:54:04 +0000 (17:54 -0800)
Extend audio channel mask.

Added AC4 format.

Change-Id: I8d365d60127eeea2939fcf6094c5306fa36ab648
Test: make

audio/common/2.0/types.hal

index eec4ac2..63d66db 100644 (file)
@@ -233,7 +233,8 @@ enum AudioFormat : uint32_t {
     SBC                 = 0x1F000000UL,
     APTX                = 0x20000000UL,
     APTX_HD             = 0x21000000UL,
-    LDAC                = 0x22000000UL,
+    AC4                 = 0x22000000UL,
+    LDAC                = 0x23000000UL,
     MAIN_MASK           = 0xFF000000UL, /* Deprecated */
     SUB_MASK            = 0x00FFFFFFUL,
 
@@ -431,6 +432,9 @@ enum AudioChannelMask : uint32_t {
     IN_MONO   = IN_FRONT,
     IN_STEREO = (IN_LEFT | IN_RIGHT),
     IN_FRONT_BACK = (IN_FRONT | IN_BACK),
+    IN_6 = (IN_LEFT | IN_RIGHT |
+            IN_FRONT | IN_BACK |
+            IN_LEFT_PROCESSED | IN_RIGHT_PROCESSED),
     IN_VOICE_UPLINK_MONO = (IN_VOICE_UPLINK | IN_MONO),
     IN_VOICE_DNLINK_MONO = (IN_VOICE_DNLINK | IN_MONO),
     IN_VOICE_CALL_MONO   = (IN_VOICE_UPLINK_MONO |