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

Commit 9f205c91 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10306978 from 20d86c24 to udc-release

Change-Id: Ibe7c3f8a7765a56e89416a9f98e2d23045260352
parents 4502db36 20d86c24
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -471,9 +471,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 {
@@ -648,7 +648,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;
@@ -748,7 +748,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 {
+10 −0
Original line number Diff line number Diff line
@@ -299,6 +299,16 @@ public:

        uint32_t       mInputFrameSize; // The track input frame size, used for tee buffer

        // 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