commit 1fb94c71c3d0087155d96fc3b01d8d27b5f23fb8
author Mikhail Naganov <mnaganov@google.com> Tue Jan 31 19:38:07 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 31 19:38:08 2017 +0000
tree 9c55dcff75e502c3897c28c57d0393882b85ad80
parent 4357fcab8f2e973b747714d5ee1023b361d07c0c
parent ac5012a1933fa380359cb03729c4beac6158d7bb

Merge "Audio HAL: extensions for new SoC features"

audio/common/2.0/types.hal

diff --git a/audio/common/2.0/types.hal b/audio/common/2.0/types.hal
index eec4ac2..63d66db 100644
--- a/audio/common/2.0/types.hal
+++ b/audio/common/2.0/types.hal
@@ -233,7 +233,8 @@
     SBC                 = 0x1F000000UL,
     APTX                = 0x20000000UL,
     APTX_HD             = 0x21000000UL,
-    LDAC                = 0x22000000UL,
+    AC4                 = 0x22000000UL,
+    LDAC                = 0x23000000UL,
     MAIN_MASK           = 0xFF000000UL, /* Deprecated */
     SUB_MASK            = 0x00FFFFFFUL,
 
@@ -431,6 +432,9 @@
     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 |