audio: Disable the C++ backend for android.hardware.audio.core
android.hardware.audio.core will need to use FMQ,
which does not support the C++ backend in the AIDL version.
Migrate VTS tests from the C++ backend to the NDK backend.
Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Merged-In: Ia5d29126afdb4bb97dd063a032b96ab83b9ce36e
Change-Id: Ia5d29126afdb4bb97dd063a032b96ab83b9ce36e
(cherry picked from commit 8fcc442416d30980aa4946b6d736c2f96a4e1bc0)
diff --git a/audio/aidl/vts/ModuleConfig.h b/audio/aidl/vts/ModuleConfig.h
index 0e2738b..504c0fd 100644
--- a/audio/aidl/vts/ModuleConfig.h
+++ b/audio/aidl/vts/ModuleConfig.h
@@ -21,67 +21,69 @@
#include <utility>
#include <vector>
-#include <android/hardware/audio/core/AudioRoute.h>
-#include <android/hardware/audio/core/IModule.h>
-#include <android/media/audio/common/AudioPort.h>
-#include <binder/Status.h>
+#include <aidl/android/hardware/audio/core/AudioRoute.h>
+#include <aidl/android/hardware/audio/core/IModule.h>
+#include <aidl/android/media/audio/common/AudioPort.h>
class ModuleConfig {
public:
- using SrcSinkPair = std::pair<android::media::audio::common::AudioPortConfig,
- android::media::audio::common::AudioPortConfig>;
+ using SrcSinkPair = std::pair<aidl::android::media::audio::common::AudioPortConfig,
+ aidl::android::media::audio::common::AudioPortConfig>;
using SrcSinkGroup =
- std::pair<android::hardware::audio::core::AudioRoute, std::vector<SrcSinkPair>>;
+ std::pair<aidl::android::hardware::audio::core::AudioRoute, std::vector<SrcSinkPair>>;
- explicit ModuleConfig(android::hardware::audio::core::IModule* module);
- android::binder::Status getStatus() const { return mStatus; }
- std::string getError() const { return mStatus.toString8().c_str(); }
+ explicit ModuleConfig(aidl::android::hardware::audio::core::IModule* module);
+ const ndk::ScopedAStatus& getStatus() const { return mStatus; }
+ std::string getError() const { return mStatus.getMessage(); }
- std::vector<android::media::audio::common::AudioPort> getAttachedDevicePorts() const;
- std::vector<android::media::audio::common::AudioPort> getExternalDevicePorts() const;
- std::vector<android::media::audio::common::AudioPort> getInputMixPorts() const;
- std::vector<android::media::audio::common::AudioPort> getOutputMixPorts() const;
- std::vector<android::media::audio::common::AudioPort> getMixPorts(bool isInput) const {
+ std::vector<aidl::android::media::audio::common::AudioPort> getAttachedDevicePorts() const;
+ std::vector<aidl::android::media::audio::common::AudioPort> getExternalDevicePorts() const;
+ std::vector<aidl::android::media::audio::common::AudioPort> getInputMixPorts() const;
+ std::vector<aidl::android::media::audio::common::AudioPort> getOutputMixPorts() const;
+ std::vector<aidl::android::media::audio::common::AudioPort> getMixPorts(bool isInput) const {
return isInput ? getInputMixPorts() : getOutputMixPorts();
}
- std::vector<android::media::audio::common::AudioPort> getAttachedDevicesPortsForMixPort(
- bool isInput, const android::media::audio::common::AudioPort& mixPort) const {
+ std::vector<aidl::android::media::audio::common::AudioPort> getAttachedDevicesPortsForMixPort(
+ bool isInput, const aidl::android::media::audio::common::AudioPort& mixPort) const {
return isInput ? getAttachedSourceDevicesPortsForMixPort(mixPort)
: getAttachedSinkDevicesPortsForMixPort(mixPort);
}
- std::vector<android::media::audio::common::AudioPort> getAttachedSinkDevicesPortsForMixPort(
- const android::media::audio::common::AudioPort& mixPort) const;
- std::vector<android::media::audio::common::AudioPort> getAttachedSourceDevicesPortsForMixPort(
- const android::media::audio::common::AudioPort& mixPort) const;
- std::optional<android::media::audio::common::AudioPort> getSourceMixPortForAttachedDevice()
- const;
+ std::vector<aidl::android::media::audio::common::AudioPort>
+ getAttachedSinkDevicesPortsForMixPort(
+ const aidl::android::media::audio::common::AudioPort& mixPort) const;
+ std::vector<aidl::android::media::audio::common::AudioPort>
+ getAttachedSourceDevicesPortsForMixPort(
+ const aidl::android::media::audio::common::AudioPort& mixPort) const;
+ std::optional<aidl::android::media::audio::common::AudioPort>
+ getSourceMixPortForAttachedDevice() const;
std::optional<SrcSinkPair> getNonRoutableSrcSinkPair(bool isInput) const;
std::optional<SrcSinkPair> getRoutableSrcSinkPair(bool isInput) const;
std::vector<SrcSinkGroup> getRoutableSrcSinkGroups(bool isInput) const;
- std::vector<android::media::audio::common::AudioPortConfig>
+ std::vector<aidl::android::media::audio::common::AudioPortConfig>
getPortConfigsForAttachedDevicePorts() const {
return generateAudioDevicePortConfigs(getAttachedDevicePorts(), false);
}
- std::vector<android::media::audio::common::AudioPortConfig> getPortConfigsForMixPorts() const {
+ std::vector<aidl::android::media::audio::common::AudioPortConfig> getPortConfigsForMixPorts()
+ const {
auto inputs = generateInputAudioMixPortConfigs(getInputMixPorts(), false);
auto outputs = generateOutputAudioMixPortConfigs(getOutputMixPorts(), false);
inputs.insert(inputs.end(), outputs.begin(), outputs.end());
return inputs;
}
- std::vector<android::media::audio::common::AudioPortConfig> getPortConfigsForMixPorts(
+ std::vector<aidl::android::media::audio::common::AudioPortConfig> getPortConfigsForMixPorts(
bool isInput) const {
return isInput ? generateInputAudioMixPortConfigs(getInputMixPorts(), false)
: generateOutputAudioMixPortConfigs(getOutputMixPorts(), false);
}
- std::vector<android::media::audio::common::AudioPortConfig> getPortConfigsForMixPorts(
- bool isInput, const android::media::audio::common::AudioPort& port) const {
+ std::vector<aidl::android::media::audio::common::AudioPortConfig> getPortConfigsForMixPorts(
+ bool isInput, const aidl::android::media::audio::common::AudioPort& port) const {
return isInput ? generateInputAudioMixPortConfigs({port}, false)
: generateOutputAudioMixPortConfigs({port}, false);
}
- std::optional<android::media::audio::common::AudioPortConfig> getSingleConfigForMixPort(
+ std::optional<aidl::android::media::audio::common::AudioPortConfig> getSingleConfigForMixPort(
bool isInput) const {
const auto config = isInput ? generateInputAudioMixPortConfigs(getInputMixPorts(), true)
: generateOutputAudioMixPortConfigs(getOutputMixPorts(), true);
@@ -93,8 +95,8 @@
return {};
}
}
- std::optional<android::media::audio::common::AudioPortConfig> getSingleConfigForMixPort(
- bool isInput, const android::media::audio::common::AudioPort& port) const {
+ std::optional<aidl::android::media::audio::common::AudioPortConfig> getSingleConfigForMixPort(
+ bool isInput, const aidl::android::media::audio::common::AudioPort& port) const {
const auto config = isInput ? generateInputAudioMixPortConfigs({port}, true)
: generateOutputAudioMixPortConfigs({port}, true);
if (!config.empty()) {
@@ -104,12 +106,12 @@
}
}
- std::vector<android::media::audio::common::AudioPortConfig> getPortConfigsForDevicePort(
- const android::media::audio::common::AudioPort& port) const {
+ std::vector<aidl::android::media::audio::common::AudioPortConfig> getPortConfigsForDevicePort(
+ const aidl::android::media::audio::common::AudioPort& port) const {
return generateAudioDevicePortConfigs({port}, false);
}
- android::media::audio::common::AudioPortConfig getSingleConfigForDevicePort(
- const android::media::audio::common::AudioPort& port) const {
+ aidl::android::media::audio::common::AudioPortConfig getSingleConfigForDevicePort(
+ const aidl::android::media::audio::common::AudioPort& port) const {
const auto config = generateAudioDevicePortConfigs({port}, true);
return *config.begin();
}
@@ -117,26 +119,29 @@
std::string toString() const;
private:
- std::vector<android::media::audio::common::AudioPortConfig> generateInputAudioMixPortConfigs(
- const std::vector<android::media::audio::common::AudioPort>& ports,
+ std::vector<aidl::android::media::audio::common::AudioPortConfig>
+ generateInputAudioMixPortConfigs(
+ const std::vector<aidl::android::media::audio::common::AudioPort>& ports,
bool singleProfile) const;
- std::vector<android::media::audio::common::AudioPortConfig> generateOutputAudioMixPortConfigs(
- const std::vector<android::media::audio::common::AudioPort>& ports,
+ std::vector<aidl::android::media::audio::common::AudioPortConfig>
+ generateOutputAudioMixPortConfigs(
+ const std::vector<aidl::android::media::audio::common::AudioPort>& ports,
bool singleProfile) const;
// Unlike MixPorts, the generator for DevicePorts always returns a non-empty
// vector for a non-empty input port list. If there are no profiles in the
// port, its initial configs are looked up, if there are none,
// then an empty config is used, assuming further negotiation via setAudioPortConfig.
- std::vector<android::media::audio::common::AudioPortConfig> generateAudioDevicePortConfigs(
- const std::vector<android::media::audio::common::AudioPort>& ports,
+ std::vector<aidl::android::media::audio::common::AudioPortConfig>
+ generateAudioDevicePortConfigs(
+ const std::vector<aidl::android::media::audio::common::AudioPort>& ports,
bool singleProfile) const;
- android::binder::Status mStatus = android::binder::Status::ok();
- std::vector<android::media::audio::common::AudioPort> mPorts;
- std::vector<android::media::audio::common::AudioPortConfig> mInitialConfigs;
+ ndk::ScopedAStatus mStatus = ndk::ScopedAStatus::ok();
+ std::vector<aidl::android::media::audio::common::AudioPort> mPorts;
+ std::vector<aidl::android::media::audio::common::AudioPortConfig> mInitialConfigs;
std::set<int32_t> mAttachedSinkDevicePorts;
std::set<int32_t> mAttachedSourceDevicePorts;
std::set<int32_t> mExternalDevicePorts;
- std::vector<android::hardware::audio::core::AudioRoute> mRoutes;
+ std::vector<aidl::android::hardware::audio::core::AudioRoute> mRoutes;
};