Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 10:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

audio: Implement proper parsing of masks in XsdcConversion am: cc21b6f2e6 am: 19ca45f533

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2794106

Change-Id: I2719ec63386763e52ae0748a28ff40c04582dd95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mikhail Naganov
2023-10-18 18:51:56 +00:00
committed by Automerger Merge Worker
parent e67e7a04f4 19ca45f533
commit 5e57d9da81
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
audio/aidl/default/XsdcConversion.cpp
View File

@@ -141,11 +141,12 @@ ConversionResult<AudioPortExt> createAudioPortExt(const ap_xsd::MixPorts::MixPor
}
ConversionResult<int> convertGainModeToAidl(const std::vector<ap_xsd::AudioGainMode>& gainModeVec) {
static const char gainModeSeparator = ' ';
int gainModeMask = 0;
for (const ap_xsd::AudioGainMode& gainMode : gainModeVec) {
gainModeMask |= static_cast<int>(::android::GainModeConverter::maskFromString(
ap_xsd::toString(gainMode), &gainModeSeparator));
audio_gain_mode_t legacyGainMode;
if (::android::GainModeConverter::fromString(ap_xsd::toString(gainMode), legacyGainMode)) {
gainModeMask |= static_cast<int>(legacyGainMode);
}
}
return gainModeMask;
}
@@ -204,22 +205,25 @@ ConversionResult<AudioProfile> convertAudioProfileToAidl(const ap_xsd::Profile&
ConversionResult<AudioIoFlags> convertIoFlagsToAidl(
const std::vector<ap_xsd::AudioInOutFlag>& flags, const ap_xsd::Role role,
bool flagsForMixPort) {
static const char flagSeparator = ' ';
int flagMask = 0;
if ((role == ap_xsd::Role::sink && flagsForMixPort) ||
(role == ap_xsd::Role::source && !flagsForMixPort)) {
for (const ap_xsd::AudioInOutFlag& flag : flags) {
flagMask |= static_cast<int>(::android::InputFlagConverter::maskFromString(
ap_xsd::toString(flag), &flagSeparator));
audio_input_flags_t legacyFlag;
if (::android::InputFlagConverter::fromString(ap_xsd::toString(flag), legacyFlag)) {
flagMask |= static_cast<int>(legacyFlag);
}
}
return AudioIoFlags::make<AudioIoFlags::Tag::input>(flagMask);
} else {
for (const ap_xsd::AudioInOutFlag& flag : flags) {
flagMask |= static_cast<int>(::android::OutputFlagConverter::maskFromString(
ap_xsd::toString(flag), &flagSeparator));
audio_output_flags_t legacyFlag;
if (::android::OutputFlagConverter::fromString(ap_xsd::toString(flag), legacyFlag)) {
flagMask |= static_cast<int>(legacyFlag);
}
}
return AudioIoFlags::make<AudioIoFlags::Tag::output>(flagMask);
}
return AudioIoFlags::make<AudioIoFlags::Tag::output>(flagMask);
}
ConversionResult<AudioPort> convertDevicePortToAidl(