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

Commit 3f2365a0 authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Update mutex annotation for debug information and setVolumeInternal am: 12629837 am: 8d6c4d51 

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



Change-Id: I9d0b6a713192a985f3aea02f198d04a54ee7a3df
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8e1096c3 8d6c4d51

services/audioflinger/Effects.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1396,12 +1396,12 @@ status_t EffectModule::setVolume_l(uint32_t* left, uint32_t* right, bool control 
            ((mDescriptor.flags & EFFECT_FLAG_VOLUME_MASK) == EFFECT_FLAG_VOLUME_CTRL ||

             (mDescriptor.flags & EFFECT_FLAG_VOLUME_MASK) == EFFECT_FLAG_VOLUME_IND ||

             (mDescriptor.flags & EFFECT_FLAG_VOLUME_MASK) == EFFECT_FLAG_VOLUME_MONITOR)) {

        status = setVolumeInternal(left, right, controller);

        status = setVolumeInternal_ll(left, right, controller);

    }

    return status;

}



status_t EffectModule::setVolumeInternal(

status_t EffectModule::setVolumeInternal_ll(

        uint32_t *left, uint32_t *right, bool controller) {

    if (mVolume.has_value() && *left == mVolume.value()[0] && *right == mVolume.value()[1] &&

            !controller) {

services/audioflinger/Effects.h

+6 −5
Original line number Diff line number Diff line
@@ -269,8 +269,9 @@ private: 
                ? EFFECT_BUFFER_ACCESS_WRITE : EFFECT_BUFFER_ACCESS_ACCUMULATE;

    }



    status_t setVolumeInternal(uint32_t* left, uint32_t* right,

                               bool controller /* the volume controller effect of the chain */);

    status_t setVolumeInternal_ll(uint32_t* left, uint32_t* right,

                                  bool controller /* the volume controller effect of the chain */)

            REQUIRES(audio_utils::EffectChain_Mutex, audio_utils::EffectBase_Mutex);



    effect_config_t     mConfig;    // input and output audio configuration

    sp<EffectBufferHalInterface> mInBuffer;  // Buffers for interacting with HAL
@@ -294,12 +295,12 @@ private: 
    template <typename MUTEX>

    class AutoLockReentrant {

    public:

        AutoLockReentrant(MUTEX& mutex, pid_t allowedTid)

        AutoLockReentrant(MUTEX& mutex, pid_t allowedTid) ACQUIRE(audio_utils::EffectBase_Mutex)

            : mMutex(gettid() == allowedTid ? nullptr : &mutex)

        {

            if (mMutex != nullptr) mMutex->lock();

        }

        ~AutoLockReentrant() {

        ~AutoLockReentrant() RELEASE(audio_utils::EffectBase_Mutex) {

            if (mMutex != nullptr) mMutex->unlock();

        }

    private:
@@ -316,7 +317,7 @@ private: 
    // here is used to indicate the volume to apply before this effect.

    std::optional<std::vector<uint32_t>> mReturnedVolume;

    // TODO: b/315995877, remove this debugging string after root cause

    std::string mEffectInterfaceDebug;

    std::string mEffectInterfaceDebug GUARDED_BY(audio_utils::EffectChain_Mutex);

};



class HwAccDeviceEffectModule : public EffectModule {