diff options
| author | Eric Laurent <elaurent@google.com> | 2015-06-30 17:09:20 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2015-07-06 12:13:30 -0700 |
| commit | b9d73333cce3f9da3a7a0b33589f6bbe0f992a92 (patch) | |
| tree | 960da701639ef27e3f2f41bbf6120b351380d99f /services | |
| parent | dfad5454e0caf46f8732f1415d3b9a76f2a1242e (diff) | |
| download | frameworks_av-b9d73333cce3f9da3a7a0b33589f6bbe0f992a92.zip frameworks_av-b9d73333cce3f9da3a7a0b33589f6bbe0f992a92.tar.gz frameworks_av-b9d73333cce3f9da3a7a0b33589f6bbe0f992a92.tar.bz2 | |
audio: add definitions for devices connected over IP
Bug: 22068684.
Change-Id: Idde0eaf7121d2e43f32eee3e6b10e99d8cff4912
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 2 | ||||
| -rw-r--r-- | services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index c8f9be0..d3ea9d8 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -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; diff --git a/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h b/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h index a39006e..b9cb64f 100644 --- a/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h +++ b/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h @@ -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[] = { |