Move AudioDevice* from android.media -> a.m.audio.common SAIDL
Bug: 198812639
Test: m
Test: atest audio_aidl_conversion_tests
Change-Id: I9193593bf17634e9bf05dc7cf56ac826c4755443
diff --git a/media/libaudioclient/AudioSystem.cpp b/media/libaudioclient/AudioSystem.cpp
index 97cb9af..afc65d7 100644
--- a/media/libaudioclient/AudioSystem.cpp
+++ b/media/libaudioclient/AudioSystem.cpp
@@ -55,6 +55,8 @@
using media::IAudioPolicyService;
using media::audio::common::AudioConfig;
using media::audio::common::AudioConfigBase;
+using media::audio::common::AudioDevice;
+using media::audio::common::AudioDeviceDescription;
using media::audio::common::AudioFormatDescription;
using media::audio::common::AudioOffloadInfo;
using media::audio::common::AudioSource;
@@ -853,7 +855,7 @@
name = device_name;
}
- media::AudioDevice deviceAidl;
+ AudioDevice deviceAidl;
deviceAidl.type = VALUE_OR_RETURN_STATUS(
legacy2aidl_audio_devices_t_AudioDeviceDescription(device));
deviceAidl.address = address;
@@ -874,7 +876,7 @@
if (aps == 0) return AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE;
auto result = [&]() -> ConversionResult<audio_policy_dev_state_t> {
- media::AudioDevice deviceAidl;
+ AudioDevice deviceAidl;
deviceAidl.type = VALUE_OR_RETURN(
legacy2aidl_audio_devices_t_AudioDeviceDescription(device));
deviceAidl.address = device_address;
@@ -905,7 +907,7 @@
name = device_name;
}
- media::AudioDevice deviceAidl;
+ AudioDevice deviceAidl;
deviceAidl.type = VALUE_OR_RETURN_STATUS(
legacy2aidl_audio_devices_t_AudioDeviceDescription(device));
deviceAidl.address = address;
@@ -1177,7 +1179,7 @@
AudioStreamType streamAidl = VALUE_OR_RETURN_STATUS(
legacy2aidl_audio_stream_type_t_AudioStreamType(stream));
int32_t indexAidl = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(index));
- media::AudioDeviceDescription deviceAidl = VALUE_OR_RETURN_STATUS(
+ AudioDeviceDescription deviceAidl = VALUE_OR_RETURN_STATUS(
legacy2aidl_audio_devices_t_AudioDeviceDescription(device));
return statusTFromBinderStatus(
aps->setStreamVolumeIndex(streamAidl, deviceAidl, indexAidl));
@@ -1191,7 +1193,7 @@
AudioStreamType streamAidl = VALUE_OR_RETURN_STATUS(
legacy2aidl_audio_stream_type_t_AudioStreamType(stream));
- media::AudioDeviceDescription deviceAidl = VALUE_OR_RETURN_STATUS(
+ AudioDeviceDescription deviceAidl = VALUE_OR_RETURN_STATUS(
legacy2aidl_audio_devices_t_AudioDeviceDescription(device));
int32_t indexAidl;
RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
@@ -1211,7 +1213,7 @@
media::AudioAttributesInternal attrAidl = VALUE_OR_RETURN_STATUS(
legacy2aidl_audio_attributes_t_AudioAttributesInternal(attr));
int32_t indexAidl = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(index));
- media::AudioDeviceDescription deviceAidl = VALUE_OR_RETURN_STATUS(
+ AudioDeviceDescription deviceAidl = VALUE_OR_RETURN_STATUS(
legacy2aidl_audio_devices_t_AudioDeviceDescription(device));
return statusTFromBinderStatus(
aps->setVolumeIndexForAttributes(attrAidl, deviceAidl, indexAidl));
@@ -1225,7 +1227,7 @@
media::AudioAttributesInternal attrAidl = VALUE_OR_RETURN_STATUS(
legacy2aidl_audio_attributes_t_AudioAttributesInternal(attr));
- media::AudioDeviceDescription deviceAidl = VALUE_OR_RETURN_STATUS(
+ AudioDeviceDescription deviceAidl = VALUE_OR_RETURN_STATUS(
legacy2aidl_audio_devices_t_AudioDeviceDescription(device));
int32_t indexAidl;
RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
@@ -1282,7 +1284,7 @@
auto result = [&]() -> ConversionResult<DeviceTypeSet> {
AudioStreamType streamAidl = VALUE_OR_RETURN(
legacy2aidl_audio_stream_type_t_AudioStreamType(stream));
- std::vector<media::AudioDeviceDescription> resultAidl;
+ std::vector<AudioDeviceDescription> resultAidl;
RETURN_IF_ERROR(statusTFromBinderStatus(
aps->getDevicesForStream(streamAidl, &resultAidl)));
return convertContainer<DeviceTypeSet>(resultAidl,
@@ -1301,7 +1303,7 @@
media::AudioAttributesEx aaAidl = VALUE_OR_RETURN_STATUS(
legacy2aidl_AudioAttributes_AudioAttributesEx(aa));
- std::vector<media::AudioDevice> retAidl;
+ std::vector<AudioDevice> retAidl;
RETURN_STATUS_IF_ERROR(
statusTFromBinderStatus(aps->getDevicesForAttributes(aaAidl, &retAidl)));
*devices = VALUE_OR_RETURN_STATUS(
@@ -1750,8 +1752,8 @@
if (aps == 0) return PERMISSION_DENIED;
int32_t uidAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_uid_t_int32_t(uid));
- std::vector<media::AudioDevice> devicesAidl = VALUE_OR_RETURN_STATUS(
- convertContainer<std::vector<media::AudioDevice>>(devices,
+ std::vector<AudioDevice> devicesAidl = VALUE_OR_RETURN_STATUS(
+ convertContainer<std::vector<AudioDevice>>(devices,
legacy2aidl_AudioDeviceTypeAddress));
return statusTFromBinderStatus(aps->setUidDeviceAffinities(uidAidl, devicesAidl));
}
@@ -1770,9 +1772,9 @@
if (aps == 0) return PERMISSION_DENIED;
int32_t userIdAidl = VALUE_OR_RETURN_STATUS(convertReinterpret<int32_t>(userId));
- std::vector<media::AudioDevice> devicesAidl = VALUE_OR_RETURN_STATUS(
- convertContainer<std::vector<media::AudioDevice>>(devices,
- legacy2aidl_AudioDeviceTypeAddress));
+ std::vector<AudioDevice> devicesAidl = VALUE_OR_RETURN_STATUS(
+ convertContainer<std::vector<AudioDevice>>(devices,
+ legacy2aidl_AudioDeviceTypeAddress));
return statusTFromBinderStatus(
aps->setUserIdDeviceAffinities(userIdAidl, devicesAidl));
}
@@ -1848,7 +1850,7 @@
AudioStreamType streamAidl = VALUE_OR_RETURN(
legacy2aidl_audio_stream_type_t_AudioStreamType(stream));
int32_t indexAidl = VALUE_OR_RETURN(convertIntegral<int32_t>(index));
- media::AudioDeviceDescription deviceAidl = VALUE_OR_RETURN(
+ AudioDeviceDescription deviceAidl = VALUE_OR_RETURN(
legacy2aidl_audio_devices_t_AudioDeviceDescription(device));
float retAidl;
RETURN_IF_ERROR(statusTFromBinderStatus(
@@ -2134,9 +2136,9 @@
int32_t strategyAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_product_strategy_t_int32_t(strategy));
media::DeviceRole roleAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_device_role_t_DeviceRole(role));
- std::vector<media::AudioDevice> devicesAidl = VALUE_OR_RETURN_STATUS(
- convertContainer<std::vector<media::AudioDevice>>(devices,
- legacy2aidl_AudioDeviceTypeAddress));
+ std::vector<AudioDevice> devicesAidl = VALUE_OR_RETURN_STATUS(
+ convertContainer<std::vector<AudioDevice>>(devices,
+ legacy2aidl_AudioDeviceTypeAddress));
return statusTFromBinderStatus(
aps->setDevicesRoleForStrategy(strategyAidl, roleAidl, devicesAidl));
}
@@ -2162,7 +2164,7 @@
}
int32_t strategyAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_product_strategy_t_int32_t(strategy));
media::DeviceRole roleAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_device_role_t_DeviceRole(role));
- std::vector<media::AudioDevice> devicesAidl;
+ std::vector<AudioDevice> devicesAidl;
RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
aps->getDevicesForRoleAndStrategy(strategyAidl, roleAidl, &devicesAidl)));
devices = VALUE_OR_RETURN_STATUS(
@@ -2182,9 +2184,9 @@
AudioSource audioSourceAidl = VALUE_OR_RETURN_STATUS(
legacy2aidl_audio_source_t_AudioSource(audioSource));
media::DeviceRole roleAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_device_role_t_DeviceRole(role));
- std::vector<media::AudioDevice> devicesAidl = VALUE_OR_RETURN_STATUS(
- convertContainer<std::vector<media::AudioDevice>>(devices,
- legacy2aidl_AudioDeviceTypeAddress));
+ std::vector<AudioDevice> devicesAidl = VALUE_OR_RETURN_STATUS(
+ convertContainer<std::vector<AudioDevice>>(devices,
+ legacy2aidl_AudioDeviceTypeAddress));
return statusTFromBinderStatus(
aps->setDevicesRoleForCapturePreset(audioSourceAidl, roleAidl, devicesAidl));
}
@@ -2199,9 +2201,9 @@
AudioSource audioSourceAidl = VALUE_OR_RETURN_STATUS(
legacy2aidl_audio_source_t_AudioSource(audioSource));
media::DeviceRole roleAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_device_role_t_DeviceRole(role));
- std::vector<media::AudioDevice> devicesAidl = VALUE_OR_RETURN_STATUS(
- convertContainer<std::vector<media::AudioDevice>>(devices,
- legacy2aidl_AudioDeviceTypeAddress));
+ std::vector<AudioDevice> devicesAidl = VALUE_OR_RETURN_STATUS(
+ convertContainer<std::vector<AudioDevice>>(devices,
+ legacy2aidl_AudioDeviceTypeAddress));
return statusTFromBinderStatus(
aps->addDevicesRoleForCapturePreset(audioSourceAidl, roleAidl, devicesAidl));
}
@@ -2215,9 +2217,9 @@
AudioSource audioSourceAidl = VALUE_OR_RETURN_STATUS(
legacy2aidl_audio_source_t_AudioSource(audioSource));
media::DeviceRole roleAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_device_role_t_DeviceRole(role));
- std::vector<media::AudioDevice> devicesAidl = VALUE_OR_RETURN_STATUS(
- convertContainer<std::vector<media::AudioDevice>>(devices,
- legacy2aidl_AudioDeviceTypeAddress));
+ std::vector<AudioDevice> devicesAidl = VALUE_OR_RETURN_STATUS(
+ convertContainer<std::vector<AudioDevice>>(devices,
+ legacy2aidl_AudioDeviceTypeAddress));
return statusTFromBinderStatus(
aps->removeDevicesRoleForCapturePreset(audioSourceAidl, roleAidl, devicesAidl));
}
@@ -2245,7 +2247,7 @@
AudioSource audioSourceAidl = VALUE_OR_RETURN_STATUS(
legacy2aidl_audio_source_t_AudioSource(audioSource));
media::DeviceRole roleAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_device_role_t_DeviceRole(role));
- std::vector<media::AudioDevice> devicesAidl;
+ std::vector<AudioDevice> devicesAidl;
RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
aps->getDevicesForRoleAndCapturePreset(audioSourceAidl, roleAidl, &devicesAidl)));
devices = VALUE_OR_RETURN_STATUS(
@@ -2286,9 +2288,9 @@
legacy2aidl_audio_attributes_t_AudioAttributesInternal(attributes));
std::optional<AudioConfig> configAidl = VALUE_OR_RETURN_STATUS(
legacy2aidl_audio_config_t_AudioConfig(configuration, false /*isInput*/));
- std::vector<media::AudioDevice> devicesAidl = VALUE_OR_RETURN_STATUS(
- convertContainer<std::vector<media::AudioDevice>>(devices,
- legacy2aidl_AudioDeviceTypeAddress));
+ std::vector<AudioDevice> devicesAidl = VALUE_OR_RETURN_STATUS(
+ convertContainer<std::vector<AudioDevice>>(devices,
+ legacy2aidl_AudioDeviceTypeAddress));
RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
aps->canBeSpatialized(attrAidl, configAidl, devicesAidl, canBeSpatialized)));
return OK;