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

Commit 2ffdfce9 authored by Francois Gaffie's avatar Francois Gaffie Committed by Eric Laurent
Browse files

audiopolicy: optimize set volume call sequence 



This CL simplifies call flow to set volume from stream or attributes.
It also removes unused parameter from mute setter and fix a volume
source comparison.
Also refactor logic in setVolumeIndexForAttributes() by removing the
loop on all volume sources on a given output given it was ignoring all
sources not equal to current source anyway.

Bug: 124767636
Test: AudioPolicyTests --gtest_filter=StreamTypeVolumeTest.*
  AudioPolicyTests --gtest_filter=AttributeVolume/AttributeVolumeTest.*
  AudioPolicyTests --gtest_filter=AudioProductStrategiesPlaybackVolume/AudioProductStrategiesPlaybackVolumeTest.*

Change-Id: Id816de023e917b0c0e34bb0888c8b0ad29029f8b
Signed-off-by: default avatarFrancois Gaffie <francois.gaffie@renault.com>
parent e9955729

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+51 −73
Original line number Diff line number Diff line
@@ -2389,14 +2389,9 @@ status_t AudioPolicyManager::setStreamVolumeIndex(audio_stream_type_t stream, 
                                                  audio_devices_t device)

{

    auto attributes = mEngine->getAttributesForStreamType(stream);

    auto volumeGroup = mEngine->getVolumeGroupForStreamType(stream);

    if (volumeGroup == VOLUME_GROUP_NONE) {

        ALOGE("%s: no group matching with stream %s", __FUNCTION__, toString(stream).c_str());

        return BAD_VALUE;

    }

    ALOGV("%s: stream %s attributes=%s", __func__,

          toString(stream).c_str(), toString(attributes).c_str());

    return setVolumeGroupIndex(getVolumeCurves(stream), volumeGroup, index, device, attributes);

    return setVolumeIndexForAttributes(attributes, index, device);

}



status_t AudioPolicyManager::getStreamVolumeIndex(audio_stream_type_t stream,
@@ -2411,27 +2406,19 @@ status_t AudioPolicyManager::getStreamVolumeIndex(audio_stream_type_t stream, 
    return getVolumeIndex(getVolumeCurves(stream), *index, device);

}



status_t AudioPolicyManager::setVolumeIndexForAttributes(const audio_attributes_t &attr,

status_t AudioPolicyManager::setVolumeIndexForAttributes(const audio_attributes_t &attributes,

                                                         int index,

                                                         audio_devices_t device)

{

    // Get Volume group matching the Audio Attributes

    auto volumeGroup = mEngine->getVolumeGroupForAttributes(attr);

    if (volumeGroup == VOLUME_GROUP_NONE) {

        ALOGD("%s: could not find group matching with %s", __FUNCTION__, toString(attr).c_str());

    auto group = mEngine->getVolumeGroupForAttributes(attributes);

    if (group == VOLUME_GROUP_NONE) {

        ALOGD("%s: no group matching with %s", __FUNCTION__, toString(attributes).c_str());

        return BAD_VALUE;

    }

    ALOGV("%s: group %d matching with %s", __FUNCTION__, volumeGroup, toString(attr).c_str());

    return setVolumeGroupIndex(getVolumeCurves(attr), volumeGroup, index, device, attr);

}



status_t AudioPolicyManager::setVolumeGroupIndex(IVolumeCurves &curves, volume_group_t group,

                                                 int index,

                                                 audio_devices_t device,

                                                 const audio_attributes_t attributes)

{

    ALOGVV("%s: group=%d", __func__, group);

    ALOGV("%s: group %d matching with %s", __FUNCTION__, group, toString(attributes).c_str());

    status_t status = NO_ERROR;

    IVolumeCurves &curves = getVolumeCurves(attributes);

    VolumeSource vs = toVolumeSource(group);

    product_strategy_t strategy = mEngine->getProductStrategyForAttributes(attributes);
@@ -2440,6 +2427,21 @@ status_t AudioPolicyManager::setVolumeGroupIndex(IVolumeCurves &curves, volume_g 
        ALOGE("%s failed to set curve index for group %d device 0x%X", __func__, group, device);

        return status;

    }



    audio_devices_t curSrcDevice;

    auto curCurvAttrs = curves.getAttributes();

    if (!curCurvAttrs.empty() && curCurvAttrs.front() != defaultAttr) {

        auto attr = curCurvAttrs.front();

        curSrcDevice = mEngine->getOutputDevicesForAttributes(attr, nullptr, false).types();

    } else if (!curves.getStreamTypes().empty()) {

        auto stream = curves.getStreamTypes().front();

        curSrcDevice = mEngine->getOutputDevicesForStream(stream, false).types();

    } else {

        ALOGE("%s: Invalid src %d: no valid attributes nor stream",__func__, vs);

        return BAD_VALUE;

    }

    curSrcDevice = Volume::getDeviceForVolume(curSrcDevice);



    // update volume on all outputs and streams matching the following:

    // - The requested stream (or a stream matching for volume control) is active on the output

    // - The device (or devices) selected by the engine for this stream includes
@@ -2450,7 +2452,7 @@ status_t AudioPolicyManager::setVolumeGroupIndex(IVolumeCurves &curves, volume_g 
    // no specific device volume value exists for currently selected device.

    for (size_t i = 0; i < mOutputs.size(); i++) {

        sp<SwAudioOutputDescriptor> desc = mOutputs.valueAt(i);

        audio_devices_t curDevice = Volume::getDeviceForVolume(desc->devices().types());

        audio_devices_t curDevice = desc->devices().types();



        // Inter / intra volume group priority management: Loop on strategies arranged by priority

        // If a higher priority strategy is active, and the output is routed to a device with a
@@ -2501,34 +2503,15 @@ status_t AudioPolicyManager::setVolumeGroupIndex(IVolumeCurves &curves, volume_g 
            }

            continue;

        }

        for (auto curVolGroup : getVolumeGroups()) {

            VolumeSource curVolSrc = toVolumeSource(curVolGroup);

            if (curVolSrc != vs) {

                continue;

            }

        if (!(desc->isActive(vs) || isInCall())) {

            continue;

        }

            audio_devices_t curSrcDevice;

            auto &curCurves = getVolumeCurves(curVolSrc);

            auto curCurvAttrs = curCurves.getAttributes();

            if (!curCurvAttrs.empty() && curCurvAttrs.front() != defaultAttr) {

                auto attr = curCurvAttrs.front();

                curSrcDevice = mEngine->getOutputDevicesForAttributes(attr, nullptr, false).types();

            } else if (!curCurves.getStreamTypes().empty()) {

                auto stream = curCurves.getStreamTypes().front();

                curSrcDevice = mEngine->getOutputDevicesForStream(stream, false).types();

            } else {

                ALOGE("%s: Invalid src %d: no valid attributes nor stream",__func__, curVolSrc);

                continue;

            }

            curSrcDevice = Volume::getDeviceForVolume(curSrcDevice);

        if ((device != AUDIO_DEVICE_OUT_DEFAULT_FOR_VOLUME) && ((curDevice & device) == 0)) {

            continue;

        }

        if (device != AUDIO_DEVICE_OUT_DEFAULT_FOR_VOLUME) {

            curSrcDevice |= device;

                applyVolume = (curDevice & curSrcDevice) != 0;

            applyVolume = (Volume::getDeviceForVolume(curDevice) & curSrcDevice) != 0;

        } else {

            applyVolume = !curves.hasVolumeIndexForDevice(curSrcDevice);

        }
@@ -2537,7 +2520,7 @@ status_t AudioPolicyManager::setVolumeGroupIndex(IVolumeCurves &curves, volume_g 
            // delayed volume change for system stream to be removed when the problem is

            // handled by system UI

            status_t volStatus = checkAndSetVolume(

                            curCurves, curVolSrc, index, desc, curDevice,

                        curves, vs, index, desc, curDevice,

                        ((vs == toVolumeSource(AUDIO_STREAM_SYSTEM))?

                             TOUCH_SOUND_FIXED_DELAY_MS : 0));

            if (volStatus != NO_ERROR) {
@@ -2545,7 +2528,6 @@ status_t AudioPolicyManager::setVolumeGroupIndex(IVolumeCurves &curves, volume_g 
            }

        }

    }

    }

    mpClientInterface->onAudioVolumeGroupChanged(group, 0 /*flags*/);

    return status;

}
@@ -5730,14 +5712,14 @@ float AudioPolicyManager::computeVolume(IVolumeCurves &curves, 
}



int AudioPolicyManager::rescaleVolumeIndex(int srcIndex,

                                           audio_stream_type_t srcStream,

                                           audio_stream_type_t dstStream)

                                           VolumeSource fromVolumeSource,

                                           VolumeSource toVolumeSource)

{

    if (srcStream == dstStream) {

    if (fromVolumeSource == toVolumeSource) {

        return srcIndex;

    }

    auto &srcCurves = getVolumeCurves(srcStream);

    auto &dstCurves = getVolumeCurves(dstStream);

    auto &srcCurves = getVolumeCurves(fromVolumeSource);

    auto &dstCurves = getVolumeCurves(toVolumeSource);

    float minSrc = (float)srcCurves.getVolumeIndexMin();

    float maxSrc = (float)srcCurves.getVolumeIndexMax();

    float minDst = (float)dstCurves.getVolumeIndexMin();
@@ -5851,12 +5833,8 @@ void AudioPolicyManager::setVolumeSourceMute(VolumeSource volumeSource, 
                                             bool on,

                                             const sp<AudioOutputDescriptor>& outputDesc,

                                             int delayMs,

                                             audio_devices_t device,

                                             bool activeOnly)

                                             audio_devices_t device)

{

    if (activeOnly && !outputDesc->isActive(volumeSource)) {

        return;

    }

    if (device == AUDIO_DEVICE_NONE) {

        device = outputDesc->devices().types();

    }

services/audiopolicy/managerdefault/AudioPolicyManager.h

+3 −8
Original line number Diff line number Diff line
@@ -171,9 +171,6 @@ public: 


        virtual status_t getMinVolumeIndexForAttributes(const audio_attributes_t &attr, int &index);



        status_t setVolumeGroupIndex(IVolumeCurves &volumeCurves, volume_group_t group, int index,

                                     audio_devices_t device, const audio_attributes_t attributes);



        status_t setVolumeCurveIndex(int index,

                                     audio_devices_t device,

                                     IVolumeCurves &volumeCurves);
@@ -425,8 +422,8 @@ protected: 


        // rescale volume index from srcStream within range of dstStream

        int rescaleVolumeIndex(int srcIndex,

                               audio_stream_type_t srcStream,

                               audio_stream_type_t dstStream);

                               VolumeSource fromVolumeSource,

                               VolumeSource toVolumeSource);

        // check that volume change is permitted, compute and send new volume to audio hardware

        virtual status_t checkAndSetVolume(IVolumeCurves &curves,

                                           VolumeSource volumeSource, int index,
@@ -461,14 +458,12 @@ protected: 
         * @param outputDesc on which the client following the volume group shall be muted/umuted

         * @param delayMs

         * @param device

         * @param activeOnly if true, mute only if the volume group is active on the output.

         */

        void setVolumeSourceMute(VolumeSource volumeSource,

                                 bool on,

                                 const sp<AudioOutputDescriptor>& outputDesc,

                                 int delayMs = 0,

                                 audio_devices_t device = AUDIO_DEVICE_NONE,

                                 bool activeOnly = false);

                                 audio_devices_t device = AUDIO_DEVICE_NONE);



        audio_mode_t getPhoneState();