Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa815e21 authored by Ravi Kumar Alamanda's avatar Ravi Kumar Alamanda Committed by Steve Kondik
Browse files

system/core: Add audio enums for new features support 

- Added required enums for QCELP/EVRC, FM and ANC features.

Change-Id: Ie553f4693a9e0b160355c2d664fe34873d128382
parent 320973b2

include/system/audio.h

+32 −9
Original line number Diff line number Diff line
@@ -46,6 +46,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,

    AUDIO_STREAM_FM               = 10,



    AUDIO_STREAM_CNT,

    AUDIO_STREAM_MAX              = AUDIO_STREAM_CNT - 1,
@@ -63,6 +64,8 @@ typedef enum { 
    AUDIO_SOURCE_CAMCORDER           = 5,

    AUDIO_SOURCE_VOICE_RECOGNITION   = 6,

    AUDIO_SOURCE_VOICE_COMMUNICATION = 7,

    AUDIO_SOURCE_FM_RX               = 8,

    AUDIO_SOURCE_FM_RX_A2DP          = 9,



    AUDIO_SOURCE_CNT,

    AUDIO_SOURCE_MAX                 = AUDIO_SOURCE_CNT - 1,
@@ -138,6 +141,8 @@ typedef enum { 
    AUDIO_FORMAT_HE_AAC_V1           = 0x05000000UL,

    AUDIO_FORMAT_HE_AAC_V2           = 0x06000000UL,

    AUDIO_FORMAT_VORBIS              = 0x07000000UL,

    AUDIO_FORMAT_QCELP               = 0x08000000UL,

    AUDIO_FORMAT_EVRC                = 0x09000000UL,

    AUDIO_FORMAT_MAIN_MASK           = 0xFF000000UL,

    AUDIO_FORMAT_SUB_MASK            = 0x00FFFFFFUL,
@@ -288,7 +293,12 @@ typedef enum { 
    AUDIO_DEVICE_OUT_AUX_DIGITAL               = 0x400,

    AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET         = 0x800,

    AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET         = 0x1000,

    AUDIO_DEVICE_OUT_DEFAULT                   = 0x8000,

    AUDIO_DEVICE_OUT_FM                        = 0x2000,

    AUDIO_DEVICE_OUT_ANC_HEADSET               = 0x4000,

    AUDIO_DEVICE_OUT_ANC_HEADPHONE             = 0x8000,

    AUDIO_DEVICE_OUT_FM_TX                     = 0x10000,

    AUDIO_DEVICE_OUT_DIRECTOUTPUT              = 0x20000,

    AUDIO_DEVICE_OUT_DEFAULT                   = 0x80000,

    AUDIO_DEVICE_OUT_ALL      = (AUDIO_DEVICE_OUT_EARPIECE |

                                 AUDIO_DEVICE_OUT_SPEAKER |

                                 AUDIO_DEVICE_OUT_WIRED_HEADSET |
@@ -302,6 +312,11 @@ typedef enum { 
                                 AUDIO_DEVICE_OUT_AUX_DIGITAL |

                                 AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET |

                                 AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET |

                                 AUDIO_DEVICE_OUT_FM |

                                 AUDIO_DEVICE_OUT_ANC_HEADSET |

                                 AUDIO_DEVICE_OUT_ANC_HEADPHONE |

                                 AUDIO_DEVICE_OUT_FM_TX |

                                 AUDIO_DEVICE_OUT_DIRECTOUTPUT |

                                 AUDIO_DEVICE_OUT_DEFAULT),

    AUDIO_DEVICE_OUT_ALL_A2DP = (AUDIO_DEVICE_OUT_BLUETOOTH_A2DP |

                                 AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES |
@@ -311,14 +326,17 @@ typedef enum { 
                                 AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT),



    /* input devices */

    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,

    AUDIO_DEVICE_IN_COMMUNICATION         = 0x100000,

    AUDIO_DEVICE_IN_AMBIENT               = 0x200000,

    AUDIO_DEVICE_IN_BUILTIN_MIC           = 0x400000,

    AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET = 0x800000,

    AUDIO_DEVICE_IN_WIRED_HEADSET         = 0x1000000,

    AUDIO_DEVICE_IN_AUX_DIGITAL           = 0x2000000,

    AUDIO_DEVICE_IN_VOICE_CALL            = 0x4000000,

    AUDIO_DEVICE_IN_BACK_MIC              = 0x8000000,

    AUDIO_DEVICE_IN_ANC_HEADSET           = 0x10000000,

    AUDIO_DEVICE_IN_FM_RX                 = 0x20000000,

    AUDIO_DEVICE_IN_FM_RX_A2DP            = 0x40000000,

    AUDIO_DEVICE_IN_DEFAULT               = 0x80000000,



    AUDIO_DEVICE_IN_ALL     = (AUDIO_DEVICE_IN_COMMUNICATION |
@@ -329,6 +347,9 @@ typedef enum { 
                               AUDIO_DEVICE_IN_AUX_DIGITAL |

                               AUDIO_DEVICE_IN_VOICE_CALL |

                               AUDIO_DEVICE_IN_BACK_MIC |

                               AUDIO_DEVICE_IN_ANC_HEADSET |

                               AUDIO_DEVICE_IN_FM_RX |

                               AUDIO_DEVICE_IN_FM_RX_A2DP |

                               AUDIO_DEVICE_IN_DEFAULT),

    AUDIO_DEVICE_IN_ALL_SCO = AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET,

} audio_devices_t;
@@ -397,6 +418,8 @@ static inline bool audio_is_valid_format(uint32_t format) 
    case AUDIO_FORMAT_HE_AAC_V1:

    case AUDIO_FORMAT_HE_AAC_V2:

    case AUDIO_FORMAT_VORBIS:

    case AUDIO_FORMAT_QCELP:

    case AUDIO_FORMAT_EVRC:

        return true;

    default:

        return false;