STE FM AUDIO

Author: percy-g2

include/system/audio.h

@@ -47,9 +47,7 @@ typedef enum {
     AUDIO_STREAM_ENFORCED_AUDIBLE = 7, /* Sounds that cannot be muted by user and must be routed to speaker */
     AUDIO_STREAM_DTMF             = 8,
     AUDIO_STREAM_TTS              = 9,
-#ifdef QCOM_FM_ENABLED
     AUDIO_STREAM_FM               = 10,
-#endif
 
     AUDIO_STREAM_CNT,
     AUDIO_STREAM_MAX              = AUDIO_STREAM_CNT - 1,
@@ -67,10 +65,8 @@ typedef enum {
     AUDIO_SOURCE_CAMCORDER           = 5,
     AUDIO_SOURCE_VOICE_RECOGNITION   = 6,
     AUDIO_SOURCE_VOICE_COMMUNICATION = 7,
-#if defined(QCOM_FM_ENABLED) || defined(STE_FM)
     AUDIO_SOURCE_FM_RX               = 8,
     AUDIO_SOURCE_FM_RX_A2DP          = 9,
-#endif
 
     AUDIO_SOURCE_CNT,
     AUDIO_SOURCE_MAX                 = AUDIO_SOURCE_CNT - 1,
@@ -156,6 +152,18 @@ typedef enum {
     AUDIO_FORMAT_HE_AAC_V1           = 0x05000000UL,
     AUDIO_FORMAT_HE_AAC_V2           = 0x06000000UL,
     AUDIO_FORMAT_VORBIS              = 0x07000000UL,
+    /* ST-E support for extended audio formats */
+    AUDIO_FORMAT_AC3                 = 0x08000000UL,
+    AUDIO_FORMAT_MPEG1               = 0x09000000UL,
+    AUDIO_FORMAT_MPEG2               = 0x0A000000UL,
+    AUDIO_FORMAT_DTS                 = 0x0B000000UL,
+    AUDIO_FORMAT_ATRAC               = 0x0C000000UL,
+    AUDIO_FORMAT_OBA                 = 0x0D000000UL,
+    AUDIO_FORMAT_DDPLUS              = 0x0E000000UL,
+    AUDIO_FORMAT_DTS_HD              = 0x0F000000UL,
+    AUDIO_FORMAT_MAT                 = 0x10000000UL,
+    AUDIO_FORMAT_DST                 = 0x11000000UL,
+    AUDIO_FORMAT_WMA_PRO             = 0x12000000UL,
 #ifdef QCOM_HARDWARE
     AUDIO_FORMAT_EVRC                = 0x08000000UL,
     AUDIO_FORMAT_QCELP               = 0x09000000UL,
@@ -349,10 +357,8 @@ typedef enum {
     AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET         = 0x1000,
     AUDIO_DEVICE_OUT_USB_ACCESSORY             = 0x2000,
     AUDIO_DEVICE_OUT_USB_DEVICE                = 0x4000,
-#if defined(QCOM_FM_ENABLED) || defined(STE_FM)
     AUDIO_DEVICE_OUT_FM                        = 0x8000,
     AUDIO_DEVICE_OUT_FM_TX                     = 0x10000,
-#endif
 #ifdef QCOM_HARDWARE
     AUDIO_DEVICE_OUT_PROXY                     = 0x80000,
     AUDIO_DEVICE_OUT_DEFAULT                   = AUDIO_DEVICE_OUT_SPEAKER,
@@ -374,10 +380,8 @@ typedef enum {
                                  AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET |
                                  AUDIO_DEVICE_OUT_USB_ACCESSORY |
                                  AUDIO_DEVICE_OUT_USB_DEVICE |
-#if defined(QCOM_FM_ENABLED) || defined(STE_FM)
                                  AUDIO_DEVICE_OUT_FM |
                                  AUDIO_DEVICE_OUT_FM_TX |
-#endif
 #ifdef QCOM_HARDWARE
                                  AUDIO_DEVICE_OUT_PROXY |
 #endif
@@ -401,30 +405,10 @@ typedef enum {
     AUDIO_DEVICE_IN_AUX_DIGITAL           = 0x2000000,
     AUDIO_DEVICE_IN_VOICE_CALL            = 0x4000000,
     AUDIO_DEVICE_IN_BACK_MIC              = 0x8000000,
-#if defined(QCOM_FM_ENABLED)
-    AUDIO_DEVICE_IN_FM_RX                 = 0x20000000,
-#elif defined(STE_FM)
     AUDIO_DEVICE_IN_FM_RX                 = 0x1000000,
-#endif
-#if defined(QCOM_FM_ENABLED) || defined(STE_FM)
     AUDIO_DEVICE_IN_FM_RX_A2DP            = 0x40000000,
-#endif
     AUDIO_DEVICE_IN_PROXY                 = 0x80000000,
     AUDIO_DEVICE_IN_DEFAULT               = AUDIO_DEVICE_IN_BUILTIN_MIC,
-#else
-    AUDIO_DEVICE_IN_COMMUNICATION         = 0x10000,
-    AUDIO_DEVICE_IN_AMBIENT               = 0x20000,
-    AUDIO_DEVICE_IN_BUILTIN_MIC           = 0x40000,
-    AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET = 0x80000,
-    AUDIO_DEVICE_IN_WIRED_HEADSET         = 0x100000,
-    AUDIO_DEVICE_IN_AUX_DIGITAL           = 0x200000,
-    AUDIO_DEVICE_IN_VOICE_CALL            = 0x400000,
-    AUDIO_DEVICE_IN_BACK_MIC              = 0x800000,
-#if defined(STE_FM)
-    AUDIO_DEVICE_IN_FM_RX                 = 0x1000000,
-#endif
-    AUDIO_DEVICE_IN_DEFAULT               = 0x80000000,
-#endif
 
     AUDIO_DEVICE_IN_ALL     = (AUDIO_DEVICE_IN_COMMUNICATION |
                                AUDIO_DEVICE_IN_AMBIENT |
@@ -434,10 +418,8 @@ typedef enum {
                                AUDIO_DEVICE_IN_AUX_DIGITAL |
                                AUDIO_DEVICE_IN_VOICE_CALL |
                                AUDIO_DEVICE_IN_BACK_MIC |
-#if defined(QCOM_FM_ENABLED) || defined(STE_FM)
                                AUDIO_DEVICE_IN_FM_RX |
                                AUDIO_DEVICE_IN_FM_RX_A2DP |
-#endif
 #ifdef QCOM_HARDWARE
                                AUDIO_DEVICE_IN_PROXY |
 #endif
@@ -451,7 +433,7 @@ typedef enum {
 // explicitly defined in the enum audio_input_clients
 #define AUDIO_INPUT_CLIENT_ID_BASE AUDIO_INPUT_CLIENT_ID1
 
-// AUDIO_INPUT_CLIENT_ID_BASE provide a means to refer to client Id´s not explicitly defined in the enum audio_input_clients
+// AUDIO_INPUT_CLIENT_ID_BASE provide a means to refer to client Ids not explicitly defined in the enum audio_input_clients
 typedef enum audio_input_clients {
         AUDIO_INPUT_CLIENT_ID1 = 0x1,
         AUDIO_INPUT_CLIENT_ID2 = 0x2,