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

audio: Fix parsing of I/O flags from XML config

Browse Source 
The XML parser was missing a step to convert a value
from legacy domain into AIDL.

Bug: 293384960
Test: parse config with AUDIO_OUTPUT_FLAG_VOIP_RX
Change-Id: I1e7778cbf093c2a393e9b2431c9a72b6020cf7be
This commit is contained in:
Mikhail Naganov
2023-11-28 17:07:23 -08:00
parent a1d092a818
commit 37fe9e84b5
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -205,24 +205,28 @@ ConversionResult<AudioProfile> convertAudioProfileToAidl(const ap_xsd::Profile&
ConversionResult<AudioIoFlags> convertIoFlagsToAidl(
const std::vector<ap_xsd::AudioInOutFlag>& flags, const ap_xsd::Role role,
bool flagsForMixPort) {
int flagMask = 0;
int legacyFlagMask = 0;
if ((role == ap_xsd::Role::sink && flagsForMixPort) ||
(role == ap_xsd::Role::source && !flagsForMixPort)) {
for (const ap_xsd::AudioInOutFlag& flag : flags) {
audio_input_flags_t legacyFlag;
if (::android::InputFlagConverter::fromString(ap_xsd::toString(flag), legacyFlag)) {
flagMask |= static_cast<int>(legacyFlag);
legacyFlagMask |= static_cast<int>(legacyFlag);
}
}
return AudioIoFlags::make<AudioIoFlags::Tag::input>(flagMask);
return AudioIoFlags::make<AudioIoFlags::Tag::input>(
VALUE_OR_FATAL(legacy2aidl_audio_input_flags_t_int32_t_mask(
static_cast<audio_input_flags_t>(legacyFlagMask))));
} else {
for (const ap_xsd::AudioInOutFlag& flag : flags) {
audio_output_flags_t legacyFlag;
if (::android::OutputFlagConverter::fromString(ap_xsd::toString(flag), legacyFlag)) {
flagMask |= static_cast<int>(legacyFlag);
legacyFlagMask |= static_cast<int>(legacyFlag);
}
}
return AudioIoFlags::make<AudioIoFlags::Tag::output>(flagMask);
return AudioIoFlags::make<AudioIoFlags::Tag::output>(
VALUE_OR_FATAL(legacy2aidl_audio_output_flags_t_int32_t_mask(
static_cast<audio_output_flags_t>(legacyFlagMask))));
}
}