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

Commit 1269c222 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Android (Google) Code Review
Browse files

Merge "Audio HAL: extensions for new SoC features"

parents 56da4ce4 c89c8910

media/libmedia/TypeConverter.cpp

+39 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ const OutputDeviceConverter::Table OutputDeviceConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_AUX_LINE),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_IP),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_BUS),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_PROXY),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_DEFAULT),

    // STUB must be after DEFAULT, so the latter is picked up by toString first.

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_STUB),
@@ -87,6 +88,7 @@ const InputDeviceConverter::Table InputDeviceConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_LOOPBACK),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_IP),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_BUS),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_PROXY),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_DEFAULT),

    // STUB must be after DEFAULT, so the latter is picked up by toString first.

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_STUB),
@@ -108,6 +110,7 @@ const OutputFlagConverter::Table OutputFlagConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_RAW),

    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_SYNC),

    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_IEC958_NONAUDIO),

    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_DIRECT_PCM),

    TERMINATOR

};
@@ -145,6 +148,16 @@ const FormatConverter::Table FormatConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_LD),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_HE_V2),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ELD),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_MAIN),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_LC),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_SSR),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_LTP),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_HE_V1),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_SCALABLE),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_ERLC),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_LD),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_HE_V2),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_ELD),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_VORBIS),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_HE_AAC_V1),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_HE_AAC_V2),
@@ -155,6 +168,25 @@ const FormatConverter::Table FormatConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_DTS_HD),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_IEC61937),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_DOLBY_TRUEHD),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_EVRC),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_EVRCB),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_EVRCWB),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_EVRCNW),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADIF),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_WMA),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_WMA_PRO),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AMR_WB_PLUS),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_MP2),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_QCELP),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_DSD),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_FLAC),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_ALAC),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_APE),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_SBC),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_APTX),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_APTX_HD),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_LDAC),

    TERMINATOR

};
@@ -163,8 +195,12 @@ template <> 
const OutputChannelConverter::Table OutputChannelConverter::mTable[] = {

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_MONO),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_STEREO),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_2POINT1),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_QUAD),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_SURROUND),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_PENTA),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_5POINT1),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_6POINT1),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_7POINT1),

    TERMINATOR

};
@@ -175,6 +211,9 @@ const InputChannelConverter::Table InputChannelConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_MONO),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_STEREO),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_FRONT_BACK),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_VOICE_UPLINK_MONO),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_VOICE_DNLINK_MONO),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_VOICE_CALL_MONO),

    TERMINATOR

};