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

Commit 143df1be authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "Use floating point volume in mixer for mute checking" am: 24cc4b73 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2619248



Change-Id: I0667cdfd250bc23f00dc12813325be09b812251f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6c803710 24cc4b73

media/libaudioprocessing/AudioMixerBase.cpp

+5 −5
Original line number Diff line number Diff line
@@ -453,9 +453,9 @@ void AudioMixerBase::setParameter(int name, int target, int param, void *value) 
                        &track->mVolume[param - VOLUME0],

                        &track->mPrevVolume[param - VOLUME0],

                        &track->mVolumeInc[param - VOLUME0])) {

                    ALOGV("setParameter(%s, VOLUME%d: %04x)",

                    ALOGV("setParameter(%s, VOLUME%d: %f)",

                          target == VOLUME ? "VOLUME" : "RAMP_VOLUME", param - VOLUME0,

                                    track->volume[param - VOLUME0]);

                          track->mVolume[param - VOLUME0]);

                    invalidate();

                }

            } else {
@@ -630,7 +630,7 @@ void AudioMixerBase::process__validate() 


        if (t->volumeInc[0]|t->volumeInc[1]) {

            volumeRamp = true;

        } else if (!t->doesResample() && t->volumeRL == 0) {

        } else if (!t->doesResample() && t->isVolumeMuted()) {

            n |= NEEDS_MUTE;

        }

        t->needs = n;
@@ -730,7 +730,7 @@ void AudioMixerBase::process__validate() 


        for (const int name : mEnabled) {

            const std::shared_ptr<TrackBase> &t = mTracks[name];

            if (!t->doesResample() && t->volumeRL == 0) {

            if (!t->doesResample() && t->isVolumeMuted()) {

                t->needs |= NEEDS_MUTE;

                t->hook = &TrackBase::track__nop;

            } else {

media/libaudioprocessing/include/media/AudioMixerBase.h

+10 −0
Original line number Diff line number Diff line
@@ -290,6 +290,16 @@ public: 
        audio_channel_mask_t mMixerChannelMask;

        uint32_t             mMixerChannelCount;



        // consider volume muted only if all channel volume (floating point) is 0.f

        inline bool isVolumeMuted() const {

            for (const auto volume : mVolume) {

                if (volume != 0) {

                    return false;

                }

            }

            return true;

        }



      protected:



        // hooks