diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-30 01:00:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-30 01:00:44 +0000 |
| commit | d5200fcdbae5e0a3c812a6f73448c607b19f5dbf (patch) | |
| tree | b82aeb7a554bc429f3f1e520c0352b79ca65673a /audio/common/7.0/example/Effect.cpp | |
| parent | 8d17bb783b57aa15e22f5cdd8824236ef6369194 (diff) | |
| parent | 418ad80fee08d05896081b9cd0daf95bc1a289c6 (diff) | |
Merge "audio: Update common types to better match legacy structs" am: 39059ed17f am: 418ad80fee
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1562143
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3a66c407a59a4df246ed2be195664465de18c23b
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(); } |