Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e32ffaec authored by Vlad Popa's avatar Vlad Popa Committed by Android (Google) Code Review
Browse files

Merge "CSD: Adjust code to new MelCallback interface" into main

parents ebd0a892 3ee76900

audio/aidl/default/SoundDose.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -119,7 +119,8 @@ void SoundDose::onNewMelValues(const std::vector<float>& mels, size_t offset, si 
void SoundDose::MelCallback::onNewMelValues(const std::vector<float>& mels, size_t offset,

void SoundDose::MelCallback::onNewMelValues(const std::vector<float>& mels, size_t offset,

                                            size_t length,

                                            size_t length,

                                            audio_port_handle_t deviceId

                                            audio_port_handle_t deviceId

                                            __attribute__((__unused__))) const {

                                            __attribute__((__unused__)),

                                            bool attenuated __attribute__((__unused__))) const {

    mSoundDose.onNewMelValues(mels, offset, length, deviceId);

    mSoundDose.onNewMelValues(mels, offset, length, deviceId);

}

}

audio/aidl/default/include/core-impl/SoundDose.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -64,7 +64,7 @@ class SoundDose final : public BnSoundDose, public StreamDataProcessorInterface 




        // ------------------------------------ MelCallback ----------------------------------------

        // ------------------------------------ MelCallback ----------------------------------------

        void onNewMelValues(const std::vector<float>& mels, size_t offset, size_t length,

        void onNewMelValues(const std::vector<float>& 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;

        void onMomentaryExposure(float currentMel, audio_port_handle_t deviceId) const override;





        SoundDose& mSoundDose;  // must outlive MelCallback, not owning

        SoundDose& mSoundDose;  // must outlive MelCallback, not owning