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

Commit f33115dd authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

Use system/audio to/from string converters in TypeConverter 

Use of system functions eliminates the need for listing all enum
values in TypeConverter tables.

Slight changes in the converting functions:

1. 'channelMaskFromString' function now also accepts indexed
   masks.
2. Fixed UB in 'formatFromString' function.
3. Removed 'deviceFromString' function, use
   'DeviceConverter::fromString' instead.

Replaced direct includes of 'system/audio-base.h' with
includes of 'system/audio.h'.

Bug: 142480271
Test: m
Test: atest libmedia_helper_tests
Change-Id: Ia0e725026be80621bdc797299e63e134419b2b3d
parent d6fe406c

media/libaaudio/src/utility/AAudioUtilities.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include "core/AudioGlobal.h"

#include <aaudio/AAudioTesting.h>

#include <math.h>

#include <system/audio-base.h>

#include <system/audio.h>

#include <assert.h>



#include "utility/AAudioUtilities.h"

media/libeffects/config/src/EffectsConfig.cpp

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ bool stringToStreamType(const char *streamName, Type* type) 


template <>

bool stringToStreamType(const char *streamName, audio_devices_t* type) {

    return deviceFromString(streamName, *type);

    return DeviceConverter::fromString(streamName, *type);

}



/** Parse a library xml note and push the result in libraries or return false on failure. */

media/libmediahelper/TEST_MAPPING

0 → 100644
+7 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "libmedia_helper_tests"

    }

  ]

}

media/libmediahelper/TypeConverter.cpp

+9 −376
Original line number Diff line number Diff line
@@ -18,315 +18,9 @@ 


namespace android {



#define MAKE_STRING_FROM_ENUM(string) { #string, string }

#define MAKE_STRING_FROM_ENUM(enumval) { #enumval, enumval }

#define TERMINATOR { .literal = nullptr }



template <>

const OutputDeviceConverter::Table OutputDeviceConverter::mTable[] = {

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_NONE),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_EARPIECE),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_SPEAKER),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_SPEAKER_SAFE),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_WIRED_HEADSET),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_WIRED_HEADPHONE),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_BLUETOOTH_SCO),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT),

    // TODO(mnaganov): Remove from here, use 'audio_is_bluetooth_out_sco_device' function.

    { "AUDIO_DEVICE_OUT_ALL_SCO", static_cast<audio_devices_t>(AUDIO_DEVICE_OUT_ALL_SCO) },

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_BLUETOOTH_A2DP),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER),

    // TODO(mnaganov): Remove from here, use 'audio_is_a2dp_out_device' function.

    { "AUDIO_DEVICE_OUT_ALL_A2DP", static_cast<audio_devices_t>(AUDIO_DEVICE_OUT_ALL_A2DP) },

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_AUX_DIGITAL),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_HDMI),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_USB_ACCESSORY),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_USB_DEVICE),

    // TODO(mnaganov): Remove from here, use 'audio_is_usb_out_device' function.

    { "AUDIO_DEVICE_OUT_ALL_USB", static_cast<audio_devices_t>(AUDIO_DEVICE_OUT_ALL_USB) },

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_REMOTE_SUBMIX),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_TELEPHONY_TX),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_LINE),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_HDMI_ARC),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_SPDIF),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_FM),

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

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_BLE_SPEAKER),

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

    TERMINATOR

};



template <>

const InputDeviceConverter::Table InputDeviceConverter::mTable[] = {

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_NONE),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_COMMUNICATION),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_AMBIENT),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_BUILTIN_MIC),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET),

    // TODO(mnaganov): Remove from here, use 'audio_is_bluetooth_in_sco_device' function.

    { "AUDIO_DEVICE_IN_ALL_SCO", static_cast<audio_devices_t>(AUDIO_DEVICE_IN_ALL_SCO) },

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_WIRED_HEADSET),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_AUX_DIGITAL),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_HDMI),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_HDMI_ARC),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_TELEPHONY_RX),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_VOICE_CALL),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_BACK_MIC),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_REMOTE_SUBMIX),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_USB_ACCESSORY),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_USB_DEVICE),

    // TODO(mnaganov): Remove from here, use 'audio_is_usb_in_device' function.

    { "AUDIO_DEVICE_IN_ALL_USB", static_cast<audio_devices_t>(AUDIO_DEVICE_IN_ALL_USB) },

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_FM_TUNER),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_TV_TUNER),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_LINE),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_SPDIF),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_BLUETOOTH_A2DP),

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

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_BLUETOOTH_BLE),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_ECHO_REFERENCE),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_BLE_HEADSET),

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

    TERMINATOR

};





template <>

const OutputFlagConverter::Table OutputFlagConverter::mTable[] = {

    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_NONE),

    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_DIRECT),

    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_PRIMARY),

    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_FAST),

    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_DEEP_BUFFER),

    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD),

    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_NON_BLOCKING),

    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_HW_AV_SYNC),

    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_TTS),

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

    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_MMAP_NOIRQ),

    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_VOIP_RX),

    MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_INCALL_MUSIC),

    TERMINATOR

};





template <>

const InputFlagConverter::Table InputFlagConverter::mTable[] = {

    MAKE_STRING_FROM_ENUM(AUDIO_INPUT_FLAG_NONE),

    MAKE_STRING_FROM_ENUM(AUDIO_INPUT_FLAG_FAST),

    MAKE_STRING_FROM_ENUM(AUDIO_INPUT_FLAG_HW_HOTWORD),

    MAKE_STRING_FROM_ENUM(AUDIO_INPUT_FLAG_RAW),

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

    MAKE_STRING_FROM_ENUM(AUDIO_INPUT_FLAG_DIRECT),

    TERMINATOR

};





template <>

const FormatConverter::Table FormatConverter::mTable[] = {

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_PCM_16_BIT),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_PCM_8_BIT),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_PCM_32_BIT),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_PCM_8_24_BIT),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_PCM_FLOAT),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_PCM_24_BIT_PACKED),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_MP3),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AMR_NB),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AMR_WB),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_MAIN),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_LC),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_SSR),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_LTP),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_HE_V1),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_SCALABLE),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ERLC),

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

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

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_OPUS),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AC3),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_E_AC3),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_DTS),

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

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_LATM),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_LATM_LC),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_LATM_HE_V1),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_LATM_HE_V2),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_CELT),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_APTX_ADAPTIVE),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_LHDC),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_LHDC_LL),

    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_APTX_TWSP),

    TERMINATOR

};





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

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_2POINT1POINT2),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_TRI),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_TRI_BACK),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_3POINT1),

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

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_5POINT1POINT4),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_6POINT1),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_7POINT1),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_7POINT1POINT2),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_7POINT1POINT4),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_HAPTIC_A),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_MONO_HAPTIC_A),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_HAPTIC_AB),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_MONO_HAPTIC_AB),

    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_OUT_STEREO_HAPTIC_AB),

    TERMINATOR

};





template <>

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

    TERMINATOR

};



template <>

const ChannelIndexConverter::Table ChannelIndexConverter::mTable[] = {

    {"AUDIO_CHANNEL_INDEX_MASK_1", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_1)},

    {"AUDIO_CHANNEL_INDEX_MASK_2", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_2)},

    {"AUDIO_CHANNEL_INDEX_MASK_3", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_3)},

    {"AUDIO_CHANNEL_INDEX_MASK_4", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_4)},

    {"AUDIO_CHANNEL_INDEX_MASK_5", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_5)},

    {"AUDIO_CHANNEL_INDEX_MASK_6", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_6)},

    {"AUDIO_CHANNEL_INDEX_MASK_7", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_7)},

    {"AUDIO_CHANNEL_INDEX_MASK_8", static_cast<audio_channel_mask_t>(AUDIO_CHANNEL_INDEX_MASK_8)},

    TERMINATOR

};





template <>

const GainModeConverter::Table GainModeConverter::mTable[] = {

    MAKE_STRING_FROM_ENUM(AUDIO_GAIN_MODE_JOINT),

    MAKE_STRING_FROM_ENUM(AUDIO_GAIN_MODE_CHANNELS),

    MAKE_STRING_FROM_ENUM(AUDIO_GAIN_MODE_RAMP),

    TERMINATOR

};





template <>

const StreamTypeConverter::Table StreamTypeConverter::mTable[] = {

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_DEFAULT),

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_VOICE_CALL),

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_SYSTEM),

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_RING),

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_MUSIC),

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_ALARM),

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_NOTIFICATION),

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_BLUETOOTH_SCO ),

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_ENFORCED_AUDIBLE),

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_DTMF),

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_TTS),

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_ACCESSIBILITY),

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_ASSISTANT),

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_REROUTING),

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_PATCH),

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_CALL_ASSISTANT),

    TERMINATOR

};



template<>

const AudioModeConverter::Table AudioModeConverter::mTable[] = {

    MAKE_STRING_FROM_ENUM(AUDIO_MODE_INVALID),
@@ -339,62 +33,6 @@ const AudioModeConverter::Table AudioModeConverter::mTable[] = { 
    TERMINATOR

};



template<>

const AudioContentTypeConverter::Table AudioContentTypeConverter::mTable[] = {

    MAKE_STRING_FROM_ENUM(AUDIO_CONTENT_TYPE_UNKNOWN),

    MAKE_STRING_FROM_ENUM(AUDIO_CONTENT_TYPE_SPEECH),

    MAKE_STRING_FROM_ENUM(AUDIO_CONTENT_TYPE_MUSIC),

    MAKE_STRING_FROM_ENUM(AUDIO_CONTENT_TYPE_MOVIE),

    MAKE_STRING_FROM_ENUM(AUDIO_CONTENT_TYPE_SONIFICATION),

    TERMINATOR

};



template <>

const UsageTypeConverter::Table UsageTypeConverter::mTable[] = {

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_UNKNOWN),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_MEDIA),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_VOICE_COMMUNICATION),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_VOICE_COMMUNICATION_SIGNALLING),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_ALARM),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_NOTIFICATION),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_NOTIFICATION_TELEPHONY_RINGTONE),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_NOTIFICATION_COMMUNICATION_REQUEST),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_NOTIFICATION_COMMUNICATION_INSTANT),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_NOTIFICATION_COMMUNICATION_DELAYED),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_NOTIFICATION_EVENT),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_ASSISTANCE_SONIFICATION),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_GAME),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_VIRTUAL_SOURCE),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_ASSISTANT),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_CALL_ASSISTANT),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_EMERGENCY),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_SAFETY),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_VEHICLE_STATUS),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_ANNOUNCEMENT),

    TERMINATOR

};



template <>

const SourceTypeConverter::Table SourceTypeConverter::mTable[] = {

    MAKE_STRING_FROM_ENUM(AUDIO_SOURCE_DEFAULT),

    MAKE_STRING_FROM_ENUM(AUDIO_SOURCE_MIC),

    MAKE_STRING_FROM_ENUM(AUDIO_SOURCE_VOICE_UPLINK),

    MAKE_STRING_FROM_ENUM(AUDIO_SOURCE_VOICE_DOWNLINK),

    MAKE_STRING_FROM_ENUM(AUDIO_SOURCE_VOICE_CALL),

    MAKE_STRING_FROM_ENUM(AUDIO_SOURCE_CAMCORDER),

    MAKE_STRING_FROM_ENUM(AUDIO_SOURCE_VOICE_RECOGNITION),

    MAKE_STRING_FROM_ENUM(AUDIO_SOURCE_VOICE_COMMUNICATION),

    MAKE_STRING_FROM_ENUM(AUDIO_SOURCE_REMOTE_SUBMIX),

    MAKE_STRING_FROM_ENUM(AUDIO_SOURCE_UNPROCESSED),

    MAKE_STRING_FROM_ENUM(AUDIO_SOURCE_VOICE_PERFORMANCE),

    MAKE_STRING_FROM_ENUM(AUDIO_SOURCE_ECHO_REFERENCE),

    MAKE_STRING_FROM_ENUM(AUDIO_SOURCE_FM_TUNER),

    MAKE_STRING_FROM_ENUM(AUDIO_SOURCE_HOTWORD),

    TERMINATOR

};



template <>

const AudioFlagConverter::Table AudioFlagConverter::mTable[] = {

    MAKE_STRING_FROM_ENUM(AUDIO_FLAG_NONE),
@@ -417,6 +55,7 @@ const AudioFlagConverter::Table AudioFlagConverter::mTable[] = { 


template class TypeConverter<OutputDeviceTraits>;

template class TypeConverter<InputDeviceTraits>;

template class TypeConverter<DeviceTraits>;

template class TypeConverter<OutputFlagTraits>;

template class TypeConverter<InputFlagTraits>;

template class TypeConverter<FormatTraits>;
@@ -430,11 +69,6 @@ template class TypeConverter<UsageTraits>; 
template class TypeConverter<SourceTraits>;

template class TypeConverter<AudioFlagTraits>;



bool deviceFromString(const std::string& literalDevice, audio_devices_t& device) {

    return InputDeviceConverter::fromString(literalDevice, device) ||

            OutputDeviceConverter::fromString(literalDevice, device);

}



SampleRateTraits::Collection samplingRatesFromString(

        const std::string &samplingRates, const char *del)

{
@@ -454,22 +88,21 @@ FormatTraits::Collection formatsFromString( 
audio_format_t formatFromString(const std::string &literalFormat, audio_format_t defaultFormat)

{

    audio_format_t format;

    if (literalFormat.empty()) {

        return defaultFormat;

    }

    FormatConverter::fromString(literalFormat, format);

    if (!literalFormat.empty() && FormatConverter::fromString(literalFormat, format)) {

        return format;

    }

    return defaultFormat;

}



audio_channel_mask_t channelMaskFromString(const std::string &literalChannels)

{

    audio_channel_mask_t channels;

    if (!OutputChannelConverter::fromString(literalChannels, channels) &&

            !InputChannelConverter::fromString(literalChannels, channels)) {

        return AUDIO_CHANNEL_INVALID;

    }

    if (!literalChannels.empty() &&

            audio_channel_mask_from_string(literalChannels.c_str(), &channels)) {

        return channels;

    }

    return AUDIO_CHANNEL_INVALID;

}



ChannelTraits::Collection channelMasksFromString(

        const std::string &channels, const char *del)