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

Commit 0596784d authored by Mikhail Naganov's avatar Mikhail Naganov Committed by android-build-merger
Browse files

Merge "audio: Update TypeConverter" into pi-dev 

am: 3964a42e

Change-Id: I7750af1e87586217a351e05648378dca9166797b
parents 7cdf1308 3964a42e

media/libmedia/TypeConverter.cpp

+23 −3
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ const OutputDeviceConverter::Table OutputDeviceConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_BUS),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_PROXY),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_USB_HEADSET),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_HEARING_AID),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_ECHO_CANCELLER),

    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),
@@ -115,9 +117,7 @@ const OutputFlagConverter::Table OutputFlagConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_DIRECT_PCM),

    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_MMAP_NOIRQ),

    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_VOIP_RX),

    // FIXME: this cast will be removed when the flag will be

    // declared in types.hal for audio HAL V4.0 and auto imported to audio-base.h

    {"AUDIO_OUTPUT_FLAG_INCALL_MUSIC", static_cast<audio_output_flags_t>(AUDIO_OUTPUT_FLAG_INCALL_MUSIC)},

    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_INCALL_MUSIC),

    TERMINATOR

};
@@ -131,6 +131,7 @@ const InputFlagConverter::Table InputFlagConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_INPUT_FLAG_SYNC),

    MAKE_STRING_FROM_ENUM(AUDIO_INPUT_FLAG_MMAP_NOIRQ),

    MAKE_STRING_FROM_ENUM(AUDIO_INPUT_FLAG_VOIP_TX),

    MAKE_STRING_FROM_ENUM(AUDIO_INPUT_FLAG_HW_AV_SYNC),

    TERMINATOR

};
@@ -167,6 +168,7 @@ const FormatConverter::Table FormatConverter::mTable[] = { 
    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_AAC_ADTS_XHE),

    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),
@@ -197,6 +199,11 @@ const FormatConverter::Table FormatConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_APTX_HD),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AC4),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_LDAC),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_MAT),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_E_AC3_JOC),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_MAT_1_0),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_MAT_2_0),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_MAT_2_1),

    TERMINATOR

};
@@ -206,10 +213,18 @@ 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_2POINT0POINT2),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_2POINT1POINT2),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_3POINT0POINT2),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_3POINT1POINT2),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_QUAD),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_QUAD_BACK),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_QUAD_SIDE),

    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_5POINT1_BACK),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_5POINT1_SIDE),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_6POINT1),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_7POINT1),

    TERMINATOR
@@ -222,6 +237,11 @@ const InputChannelConverter::Table InputChannelConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_STEREO),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_FRONT_BACK),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_6),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_2POINT0POINT2),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_2POINT1POINT2),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_3POINT0POINT2),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_3POINT1POINT2),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_5POINT1),

    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),