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

Commit 75bd29fd authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audio: add definitions for devices connected over IP" into mnc-dev

parents f60b6b6c b9d73333

services/audioflinger/Threads.cpp

+2 −0
Original line number Diff line number Diff line
@@ -375,6 +375,7 @@ String8 devicesToString(audio_devices_t devices) 
        AUDIO_DEVICE_OUT_FM,                "FM",

        AUDIO_DEVICE_OUT_AUX_LINE,          "AUX_LINE",

        AUDIO_DEVICE_OUT_SPEAKER_SAFE,      "SPEAKER_SAFE",

        AUDIO_DEVICE_OUT_IP,                "IP",

        AUDIO_DEVICE_NONE,                  "NONE",         // must be last

    }, mappingsIn[] = {

        AUDIO_DEVICE_IN_COMMUNICATION,      "COMMUNICATION",
@@ -397,6 +398,7 @@ String8 devicesToString(audio_devices_t devices) 
        AUDIO_DEVICE_IN_SPDIF,              "SPDIF",

        AUDIO_DEVICE_IN_BLUETOOTH_A2DP,     "BLUETOOTH_A2DP",

        AUDIO_DEVICE_IN_LOOPBACK,           "LOOPBACK",

        AUDIO_DEVICE_IN_IP,                 "IP",

        AUDIO_DEVICE_NONE,                  "NONE",         // must be last

    };

    String8 result;

services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h

+4 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ const StringToEnum sDeviceTypeToEnumTable[] = { 
    STRING_TO_ENUM(AUDIO_DEVICE_OUT_SPDIF),

    STRING_TO_ENUM(AUDIO_DEVICE_OUT_FM),

    STRING_TO_ENUM(AUDIO_DEVICE_OUT_AUX_LINE),

    STRING_TO_ENUM(AUDIO_DEVICE_OUT_IP),

    STRING_TO_ENUM(AUDIO_DEVICE_IN_AMBIENT),

    STRING_TO_ENUM(AUDIO_DEVICE_IN_BUILTIN_MIC),

    STRING_TO_ENUM(AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET),
@@ -94,6 +95,7 @@ const StringToEnum sDeviceTypeToEnumTable[] = { 
    STRING_TO_ENUM(AUDIO_DEVICE_IN_SPDIF),

    STRING_TO_ENUM(AUDIO_DEVICE_IN_BLUETOOTH_A2DP),

    STRING_TO_ENUM(AUDIO_DEVICE_IN_LOOPBACK),

    STRING_TO_ENUM(AUDIO_DEVICE_IN_IP),

};



const StringToEnum sDeviceNameToEnumTable[] = {
@@ -124,6 +126,7 @@ const StringToEnum sDeviceNameToEnumTable[] = { 
    NAME_TO_ENUM("S/PDIF Out", AUDIO_DEVICE_OUT_SPDIF),

    NAME_TO_ENUM("FM transceiver Out", AUDIO_DEVICE_OUT_FM),

    NAME_TO_ENUM("Aux Line Out", AUDIO_DEVICE_OUT_AUX_LINE),

    NAME_TO_ENUM("IP Out", AUDIO_DEVICE_OUT_IP),

    NAME_TO_ENUM("Ambient Mic", AUDIO_DEVICE_IN_AMBIENT),

    NAME_TO_ENUM("Built-In Mic", AUDIO_DEVICE_IN_BUILTIN_MIC),

    NAME_TO_ENUM("BT SCO Headset Mic", AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET),
@@ -145,6 +148,7 @@ const StringToEnum sDeviceNameToEnumTable[] = { 
    NAME_TO_ENUM("S/PDIF In", AUDIO_DEVICE_IN_SPDIF),

    NAME_TO_ENUM("BT A2DP In", AUDIO_DEVICE_IN_BLUETOOTH_A2DP),

    NAME_TO_ENUM("Loopback In", AUDIO_DEVICE_IN_LOOPBACK),

    NAME_TO_ENUM("IP In", AUDIO_DEVICE_IN_IP),

};



const StringToEnum sOutputFlagNameToEnumTable[] = {