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

Commit 5ac8cd42 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

RENDER dynamic policies: fix address check 

Fix mix / output address comparison when registering dynamic
  policy mixes with a MIX_ROUTE_FLAG_RENDER flag.
Fix mix registration code path where the matching output is
  not found, but no error is reported.
Improve logs.

Bug 25448664

Change-Id: I3679aead00304b38f7cc42dd9083644450771a15
parent a8d309df

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

+4 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#define LOG_TAG "APM::AudioPolicyMix"

#define LOG_TAG "APM_AudioPolicyMix"

//#define LOG_NDEBUG 0



#include "AudioPolicyMix.h"
@@ -107,6 +107,7 @@ void AudioPolicyMixCollection::closeOutput(sp<SwAudioOutputDescriptor> &desc) 
status_t AudioPolicyMixCollection::getOutputForAttr(audio_attributes_t attributes, uid_t uid,

                                                    sp<SwAudioOutputDescriptor> &desc)

{

    ALOGV("getOutputForAttr() querying %zu mixes:", size());

    desc = 0;

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

        sp<AudioPolicyMix> policyMix = valueAt(i);
@@ -129,7 +130,8 @@ status_t AudioPolicyMixCollection::getOutputForAttr(audio_attributes_t attribute 


            // iterate over all mix criteria to list what rules this mix contains

            for (size_t j = 0; j < mix->mCriteria.size(); j++) {

                ALOGV("getOutputForAttr: inspecting mix %zu of %zu", i, mix->mCriteria.size());

                ALOGV(" getOutputForAttr: mix %zu: inspecting mix criteria %zu of %zu",

                        i, j, mix->mCriteria.size());



                // if there is an address match, prioritize that match

                if (strncmp(attributes.tags, "addr=", strlen("addr=")) == 0 &&

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+15 −6
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#define LOG_TAG "AudioPolicyManager"

#define LOG_TAG "APM_AudioPolicyManager"

//#define LOG_NDEBUG 0



//#define VERY_VERBOSE_LOGGING
@@ -2051,7 +2051,7 @@ status_t AudioPolicyManager::registerPolicyMixes(Vector<AudioMix> mixes) 
            String8 address = mixes[i].mDeviceAddress;



            if (mPolicyMixes.registerMix(address, mixes[i], 0 /*output desc*/) != NO_ERROR) {

                ALOGE(" Error regisering mix %zu for address %s", i, address.string());

                ALOGE(" Error registering mix %zu for address %s", i, address.string());

                res = INVALID_OPERATION;

                break;

            }
@@ -2076,21 +2076,25 @@ status_t AudioPolicyManager::registerPolicyMixes(Vector<AudioMix> mixes) 
                        address.string(), "remote-submix");

            }

        } else if ((mixes[i].mRouteFlags & MIX_ROUTE_FLAG_RENDER) == MIX_ROUTE_FLAG_RENDER) {

            ALOGV("registerPolicyMixes() mix %zu of %zu is RENDER", i, mixes.size());

            String8 address = mixes[i].mDeviceAddress;



            audio_devices_t device = mixes[i].mDeviceType;

            ALOGV(" registerPolicyMixes() mix %zu of %zu is RENDER, dev=0x%X addr=%s",

                    i, mixes.size(), device, address.string());



            bool foundOutput = false;

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

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

                sp<AudioPatch> patch = mAudioPatches.valueFor(desc->getPatchHandle());

                if ((patch != 0) && (patch->mPatch.num_sinks != 0)

                        && (patch->mPatch.sinks[0].type == AUDIO_PORT_TYPE_DEVICE)

                        && (patch->mPatch.sinks[0].ext.device.type == device)

                        && (patch->mPatch.sinks[0].ext.device.address == address)) {

                        && (strncmp(patch->mPatch.sinks[0].ext.device.address, address.string(),

                                AUDIO_DEVICE_MAX_ADDRESS_LEN) == 0)) {



                    if (mPolicyMixes.registerMix(address, mixes[i], desc) != NO_ERROR) {

                        res = INVALID_OPERATION;

                    } else {

                        foundOutput = true;

                    }

                    break;

                }
@@ -2101,6 +2105,11 @@ status_t AudioPolicyManager::registerPolicyMixes(Vector<AudioMix> mixes) 
                        i, device, address.string());

                res = INVALID_OPERATION;

                break;

            } else if (!foundOutput) {

                ALOGE(" Output not found for mix %zu for device 0x%X addr %s",

                        i, device, address.string());

                res = INVALID_OPERATION;

                break;

            }

        }

    }