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

Commit 2cfa7ef0 authored by Jaideep Sharma's avatar Jaideep Sharma Committed by Mikhail Naganov
Browse files

audiopolicy: skip opening mmap profile during new device connection 

During the new device connection, all listed mix ports ported are
opened, but for mmap case, when output or input is opened, it neads to
call createMmapBuffer which goes till audio DSP, adding up to latency
during device connections.

Skip opening input/output for mmap profiles during device connections.
Once, device is connected, if client needs a mmap session, mmap
sessions can be opened on the go.

Flag: EXEMPT bugfix
Bug: 345692843
Test: connect an external device, check opened inputs / outputs,
      verify logs, after device connection play mmap
Test: run audiopolicy_tests
Change-Id: Iefcc3db8f30348347e1b107a6281cf8b6268d493
parent 26e31c28

services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h

+5 −0
Original line number Diff line number Diff line
@@ -282,6 +282,11 @@ public: 


    const AudioProfileVector& getSupportedProfiles() { return mSupportedProfiles; }



    /**

     * @brief checks if all devices in device vector are attached to the HwModule or not

     * @return true if all the devices in device vector are attached, otherwise false

     */

    bool areAllDevicesAttached() const;

    // Return a string to describe the DeviceVector. The sensitive information will only be

    // added to the string if `includeSensitiveInfo` is true.

    std::string toString(bool includeSensitiveInfo = false) const;

services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp

+10 −0
Original line number Diff line number Diff line
@@ -541,4 +541,14 @@ DeviceVector DeviceVector::filterForEngine() const 
    return filteredDevices;

}



bool DeviceVector::areAllDevicesAttached() const

{

    for (const auto &device : *this) {

        if (!device->isAttached()) {

            return false;

        }

    }

    return true;

}



} // namespace android

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+26 −1
Original line number Diff line number Diff line
@@ -6690,6 +6690,14 @@ void AudioPolicyManager::onNewAudioModulesAvailableInt(DeviceVector *newDevices) 
            if (!mConfig->getOutputDevices().contains(supportedDevice)) {

                continue;

            }



            if (outProfile->isMmap() && !outProfile->hasDynamicAudioProfile()

                && availProfileDevices.areAllDevicesAttached()) {

                ALOGV("%s skip opening output for mmap profile %s", __func__,

                        outProfile->getTagName().c_str());

                continue;

            }



            sp<SwAudioOutputDescriptor> outputDesc = new SwAudioOutputDescriptor(outProfile,

                                                                                 mpClientInterface);

            audio_io_handle_t output = AUDIO_IO_HANDLE_NONE;
@@ -6749,6 +6757,14 @@ void AudioPolicyManager::onNewAudioModulesAvailableInt(DeviceVector *newDevices) 
                    __func__, inProfile->getTagName().c_str());

                continue;

            }



            if (inProfile->isMmap() && !inProfile->hasDynamicAudioProfile()

                && availProfileDevices.areAllDevicesAttached()) {

                ALOGV("%s skip opening input for mmap profile %s", __func__,

                        inProfile->getTagName().c_str());

                continue;

            }



            sp<AudioInputDescriptor> inputDesc = new AudioInputDescriptor(

                    inProfile, mpClientInterface, false /*isPreemptor*/);
@@ -6903,7 +6919,11 @@ status_t AudioPolicyManager::checkOutputsForDevice(const sp<DeviceDescriptor>& d 
            if (j != outputs.size()) {

                continue;

            }



            if (profile->isMmap() && !profile->hasDynamicAudioProfile()) {

                ALOGV("%s skip opening output for mmap profile %s",

                      __func__, profile->getTagName().c_str());

                continue;

            }

            if (!profile->canOpenNewIo()) {

                ALOGW("Max Output number %u already opened for this profile %s",

                      profile->maxOpenCount, profile->getTagName().c_str());
@@ -7054,6 +7074,11 @@ status_t AudioPolicyManager::checkInputsForDevice(const sp<DeviceDescriptor>& de 
                continue;

            }



            if (profile->isMmap() && !profile->hasDynamicAudioProfile()) {

                ALOGV("%s skip opening input for mmap profile %s",

                      __func__, profile->getTagName().c_str());

                continue;

            }

            if (!profile->canOpenNewIo()) {

                ALOGW("Max Input number %u already opened for this profile %s",

                      profile->maxOpenCount, profile->getTagName().c_str());