From 3ee7690028b25705489a6c6e32c246fcbf8f80e1 Mon Sep 17 00:00:00 2001 From: Vlad Popa Date: Wed, 3 Jan 2024 05:49:22 -0800 Subject: [PATCH] CSD: Adjust code to new MelCallback interface Added the attenuated bool to the callback interface. Not used Test: trivial Bug: 315218453 Change-Id: Ibd5e90b0537bfce7d01ee7a3a0e55bc53850a216 --- audio/aidl/default/SoundDose.cpp | 3 ++- audio/aidl/default/include/core-impl/SoundDose.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/audio/aidl/default/SoundDose.cpp b/audio/aidl/default/SoundDose.cpp index 1c9e081353..6c3a067139 100644 --- a/audio/aidl/default/SoundDose.cpp +++ b/audio/aidl/default/SoundDose.cpp @@ -119,7 +119,8 @@ void SoundDose::onNewMelValues(const std::vector& mels, size_t offset, si void SoundDose::MelCallback::onNewMelValues(const std::vector& mels, size_t offset, size_t length, audio_port_handle_t deviceId - __attribute__((__unused__))) const { + __attribute__((__unused__)), + bool attenuated __attribute__((__unused__))) const { mSoundDose.onNewMelValues(mels, offset, length, deviceId); } diff --git a/audio/aidl/default/include/core-impl/SoundDose.h b/audio/aidl/default/include/core-impl/SoundDose.h index 82c1077f1b..f58e5419c2 100644 --- a/audio/aidl/default/include/core-impl/SoundDose.h +++ b/audio/aidl/default/include/core-impl/SoundDose.h @@ -64,7 +64,7 @@ class SoundDose final : public BnSoundDose, public StreamDataProcessorInterface // ------------------------------------ MelCallback ---------------------------------------- void onNewMelValues(const std::vector& mels, size_t offset, size_t length, - audio_port_handle_t deviceId) const override; + audio_port_handle_t deviceId, bool attenuated) const override; void onMomentaryExposure(float currentMel, audio_port_handle_t deviceId) const override; SoundDose& mSoundDose; // must outlive MelCallback, not owning