Audio HAL: extensions for new SoC features

Extend audio channel mask.

Added AC4 format.

Change-Id: I413ff4099601e6d8449593cc88ee55dda1d9d8e9
Test: make

diff --git a/audio/include/system/audio-base.h b/audio/include/system/audio-base.h
index d5884cf..09b258f 100644 (file)
--- a/audio/include/system/audio-base.h
+++ b/audio/include/system/audio-base.h
@@ -96,7 +96,8 @@ typedef enum {
     AUDIO_FORMAT_SBC = 520093696u, // 0x1F000000UL
     AUDIO_FORMAT_APTX = 536870912u, // 0x20000000UL
     AUDIO_FORMAT_APTX_HD = 553648128u, // 0x21000000UL
-    AUDIO_FORMAT_LDAC = 570425344u, // 0x22000000UL
+    AUDIO_FORMAT_AC4 = 570425344u, // 0x22000000UL
+    AUDIO_FORMAT_LDAC = 587202560u, // 0x23000000UL
     AUDIO_FORMAT_MAIN_MASK = 4278190080u, // 0xFF000000UL
     AUDIO_FORMAT_SUB_MASK = 16777215u, // 0x00FFFFFFUL
     AUDIO_FORMAT_PCM_SUB_16_BIT = 1u, // 0x1
@@ -205,6 +206,7 @@ enum {
     AUDIO_CHANNEL_IN_MONO = 16u, // IN_FRONT
     AUDIO_CHANNEL_IN_STEREO = 12u, // (IN_LEFT | IN_RIGHT)
     AUDIO_CHANNEL_IN_FRONT_BACK = 48u, // (IN_FRONT | IN_BACK)
+    AUDIO_CHANNEL_IN_6 = 252u, // (((((IN_LEFT | IN_RIGHT) | IN_FRONT) | IN_BACK) | IN_LEFT_PROCESSED) | IN_RIGHT_PROCESSED)
     AUDIO_CHANNEL_IN_VOICE_UPLINK_MONO = 16400u, // (IN_VOICE_UPLINK | IN_MONO)
     AUDIO_CHANNEL_IN_VOICE_DNLINK_MONO = 32784u, // (IN_VOICE_DNLINK | IN_MONO)
     AUDIO_CHANNEL_IN_VOICE_CALL_MONO = 49168u, // (IN_VOICE_UPLINK_MONO | IN_VOICE_DNLINK_MONO)

diff --git a/audio/include/system/audio.h b/audio/include/system/audio.h
index ceee3b9..6404208 100644 (file)
--- a/audio/include/system/audio.h
+++ b/audio/include/system/audio.h
@@ -848,6 +848,7 @@ static inline bool audio_is_valid_format(audio_format_t format)
     case AUDIO_FORMAT_WMA:
     case AUDIO_FORMAT_WMA_PRO:
     case AUDIO_FORMAT_DSD:
+    case AUDIO_FORMAT_AC4:
     case AUDIO_FORMAT_LDAC:
         return true;
     default: