diff options
author | Mikhail Naganov <mnaganov@google.com> | 2021-01-27 02:16:53 +0000 |
---|---|---|
committer | Mikhail Naganov <mnaganov@google.com> | 2021-01-28 21:27:43 +0000 |
commit | ff611980f317888607389d0cb258bd86f11f2dfb (patch) | |
tree | c0c25fc7cf56730823b5cbe2b5552caac488457a /audio/common/7.0/example/Effect.cpp | |
parent | 31f2eb37915bf81117a77fc48af01ec7bdb4e381 (diff) |
audio: Update common types to better match legacy structs
HAL V7 types were updated to better match data structure
definitions from the legacy HAL:
- Added 'AudioConfigBaseOptional' struct to match
legacy structs that have 'mask' field to specify
initialized fields.
- All fields in 'AudioConfigBase' made mandatory.
- Removed 'EffectConfigParameters' in favor of
'AudioConfigBaseOptional' and safe_unions.
- Added missing enum string values to ensure that round-trip
conversions from the legacy HAL to HIDL and back to legacy
preserve enum values.
Bug: 142480271
Test: atest android.hardware.audio.common@7.0-util_tests
Test: atest VtsHalAudioV6_0TargetTest
Test: atest VtsHalAudioV7_0TargetTest
Test: atest VtsHalAudioEffectV7_0TargetTest
Change-Id: If02a81b3f6790a8eb315fa57123141aad2419132
Diffstat (limited to 'audio/common/7.0/example/Effect.cpp')
-rw-r--r-- | audio/common/7.0/example/Effect.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/audio/common/7.0/example/Effect.cpp b/audio/common/7.0/example/Effect.cpp index 27f28c6ea6..578881148a 100644 --- a/audio/common/7.0/example/Effect.cpp +++ b/audio/common/7.0/example/Effect.cpp @@ -107,14 +107,13 @@ Return<Result> Effect::setInputDevice(const DeviceAddress& device) { } Return<void> Effect::getConfig(getConfig_cb _hidl_cb) { - const EffectConfig config = { - {} /* inputCfg */, - // outputCfg - {{} /* buffer */, - {toString(xsd::AudioFormat::AUDIO_FORMAT_PCM_16_BIT), 48000 /* samplingRateHz */, - toString(xsd::AudioChannelMask::AUDIO_CHANNEL_OUT_STEREO)}, /* base */ - EffectBufferAccess::ACCESS_ACCUMULATE, - 0 /* mask */}}; + EffectConfig config; + // inputCfg left unspecified. + config.outputCfg.base.format.value(toString(xsd::AudioFormat::AUDIO_FORMAT_PCM_16_BIT)); + config.outputCfg.base.sampleRateHz.value(48000); + config.outputCfg.base.channelMask.value( + toString(xsd::AudioChannelMask::AUDIO_CHANNEL_OUT_STEREO)); + config.outputCfg.accessMode.value(EffectBufferAccess::ACCESS_ACCUMULATE); _hidl_cb(Result::OK, config); return Void(); } |