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

Commit b407f062 authored by jiabin's avatar jiabin Committed by Automerger Merge Worker
Browse files

Cache MMAP client silenced state. am: 5ee38243 

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



Change-Id: I19e6e5afbfdd0eb8769764929ef08b7a0c961f56
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e2a8a1e3 5ee38243

services/audioflinger/Threads.cpp

+12 −0
Original line number Diff line number Diff line
@@ -8658,6 +8658,12 @@ status_t AudioFlinger::MmapThread::start(const AudioClient& client, 
    if (isOutput()) {

        ret = AudioSystem::startOutput(portId);

    } else {

        {

            // Add the track record before starting input so that the silent status for the

            // client can be cached.

            Mutex::Autolock _l(mLock);

            setClientSilencedStateIfNotExist_l(client.clientUid, false /*silenced*/);

        }

        ret = AudioSystem::startInput(portId);

    }
@@ -8676,6 +8682,7 @@ status_t AudioFlinger::MmapThread::start(const AudioClient& client, 
        } else {

            mHalStream->stop();

        }

        eraseClientSilenceStateIfNoActiveClient_l(client.clientUid);

        return PERMISSION_DENIED;

    }
@@ -8683,6 +8690,9 @@ status_t AudioFlinger::MmapThread::start(const AudioClient& client, 
    sp<MmapTrack> track = new MmapTrack(this, mAttr, mSampleRate, mFormat, mChannelMask, mSessionId,

                                        isOutput(), client.clientUid, client.clientPid,

                                        IPCThreadState::self()->getCallingPid(), portId);

    if (!isOutput()) {

        track->setSilenced_l(isClientSilenced_l(client.clientUid));

    }



    if (isOutput()) {

        // force volume update when a new track is added
@@ -8738,6 +8748,7 @@ status_t AudioFlinger::MmapThread::stop(audio_port_handle_t handle) 
    }



    mActiveTracks.remove(track);

    eraseClientSilenceStateIfNoActiveClient_l(track->uid());



    mLock.unlock();

    if (isOutput()) {
@@ -9500,6 +9511,7 @@ void AudioFlinger::MmapCaptureThread::setRecordSilenced(uid_t uid, bool silenced 
            broadcast_l();

        }

    }

    setClientSilencedIfExists_l(uid, silenced);

}



void AudioFlinger::MmapCaptureThread::toAudioPortConfig(struct audio_port_config *config)

services/audioflinger/Threads.h

+30 −0
Original line number Diff line number Diff line
@@ -1787,6 +1787,35 @@ class MmapThread : public ThreadBase 
                // Sets the UID records silence

    virtual     void        setRecordSilenced(uid_t uid __unused, bool silenced __unused) {}



                void        setClientSilencedStateIfNotExist_l(uid_t uid, bool silenced) {

                                if (mClientSilencedStates.count(uid) == 0) {

                                    mClientSilencedStates[uid] = silenced;

                                }

                            }



                size_t      eraseClientSilenceStateIfNoActiveClient_l(uid_t uid) {

                                bool found = false;

                                for (const auto& t : mActiveTracks) {

                                    if (t->uid() == uid) {

                                        found = true;

                                    }

                                }

                                // Only erase when there is no active client for the given uid.

                                return found ? 0 : mClientSilencedStates.erase(uid);

                            }



                bool        isClientSilenced_l(uid_t uid) const {

                                const auto it = mClientSilencedStates.find(uid);

                                return it != mClientSilencedStates.end() ? it->second : false;

                            }



                void        setClientSilencedIfExists_l(uid_t uid, bool silenced) {

                                const auto it = mClientSilencedStates.find(uid);

                                if (it != mClientSilencedStates.end()) {

                                    it->second = silenced;

                                }

                            }



 protected:

                void        dumpInternals_l(int fd, const Vector<String16>& args) override;

                void        dumpTracks_l(int fd, const Vector<String16>& args) override;
@@ -1801,6 +1830,7 @@ class MmapThread : public ThreadBase 
                AudioHwDevice* const    mAudioHwDev;

                ActiveTracks<MmapTrack> mActiveTracks;

                float                   mHalVolFloat;

                std::map<uid_t, bool>   mClientSilencedStates;



                int32_t                 mNoCallbackWarningCount;

     static     constexpr int32_t       kMaxNoCallbackWarnings = 5;