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

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

AudioPolicy: AudioOutputDescriptor set/get for patch handle 

For symmetry with AudioInputDescriptor: no direct access to the
  field for the patch handle.

Change-Id: I5bffecf7a157ec042d749064208bc6c279008542
parent 8c7cf3b7

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

+4 −1
Original line number Diff line number Diff line
@@ -71,9 +71,11 @@ public: 


    audio_module_handle_t getModuleHandle() const;



    audio_patch_handle_t getPatchHandle() const { return mPatchHandle; };

    void setPatchHandle(audio_patch_handle_t handle) { mPatchHandle = handle; };



    sp<AudioPort>       mPort;

    audio_devices_t mDevice;                   // current device this output is routed to

    audio_patch_handle_t mPatchHandle;

    uint32_t mRefCount[AUDIO_STREAM_CNT]; // number of streams of each type using this output

    nsecs_t mStopTime[AUDIO_STREAM_CNT];

    float mCurVolume[AUDIO_STREAM_CNT];   // current stream volume in dB
@@ -83,6 +85,7 @@ public: 
    AudioPolicyClientInterface *mClientInterface;



protected:

    audio_patch_handle_t mPatchHandle;

    audio_port_handle_t mId;

};

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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ namespace android { 
AudioOutputDescriptor::AudioOutputDescriptor(const sp<AudioPort>& port,

                                             AudioPolicyClientInterface *clientInterface)

    : mPort(port), mDevice(AUDIO_DEVICE_NONE),

      mPatchHandle(0), mClientInterface(clientInterface), mId(0)

      mClientInterface(clientInterface), mPatchHandle(0), mId(0)

{

    // clear usage count for all stream types

    for (int i = 0; i < AUDIO_STREAM_CNT; i++) {

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+8 −8
Original line number Diff line number Diff line
@@ -3939,7 +3939,7 @@ void AudioPolicyManager::closeOutput(audio_io_handle_t output) 


    nextAudioPortGeneration();



    ssize_t index = mAudioPatches.indexOfKey(outputDesc->mPatchHandle);

    ssize_t index = mAudioPatches.indexOfKey(outputDesc->getPatchHandle());

    if (index >= 0) {

        sp<AudioPatch> patchDesc = mAudioPatches.valueAt(index);

        status_t status = mpClientInterface->releaseAudioPatch(patchDesc->mAfPatchHandle, 0);
@@ -4153,12 +4153,12 @@ audio_devices_t AudioPolicyManager::getNewOutputDevice(const sp<AudioOutputDescr 
{

    audio_devices_t device = AUDIO_DEVICE_NONE;



    ssize_t index = mAudioPatches.indexOfKey(outputDesc->mPatchHandle);

    ssize_t index = mAudioPatches.indexOfKey(outputDesc->getPatchHandle());

    if (index >= 0) {

        sp<AudioPatch> patchDesc = mAudioPatches.valueAt(index);

        if (patchDesc->mUid != mUidCached) {

            ALOGV("getNewOutputDevice() device %08x forced by patch %d",

                  outputDesc->device(), outputDesc->mPatchHandle);

                  outputDesc->device(), outputDesc->getPatchHandle());

            return outputDesc->device();

        }

    }
@@ -4513,7 +4513,7 @@ uint32_t AudioPolicyManager::setOutputDevice(const sp<AudioOutputDescriptor>& ou 
    // Doing this check here allows the caller to call setOutputDevice() without conditions

    if ((device == AUDIO_DEVICE_NONE || device == prevDevice) &&

        !force &&

        outputDesc->mPatchHandle != 0) {

        outputDesc->getPatchHandle() != 0) {

        ALOGV("setOutputDevice() setting same device 0x%04x or null device", device);

        return muteWaitMs;

    }
@@ -4540,7 +4540,7 @@ uint32_t AudioPolicyManager::setOutputDevice(const sp<AudioOutputDescriptor>& ou 
            if (patchHandle && *patchHandle != AUDIO_PATCH_HANDLE_NONE) {

                index = mAudioPatches.indexOfKey(*patchHandle);

            } else {

                index = mAudioPatches.indexOfKey(outputDesc->mPatchHandle);

                index = mAudioPatches.indexOfKey(outputDesc->getPatchHandle());

            }

            sp< AudioPatch> patchDesc;

            audio_patch_handle_t afPatchHandle = AUDIO_PATCH_HANDLE_NONE;
@@ -4566,7 +4566,7 @@ uint32_t AudioPolicyManager::setOutputDevice(const sp<AudioOutputDescriptor>& ou 
                if (patchHandle) {

                    *patchHandle = patchDesc->mHandle;

                }

                outputDesc->mPatchHandle = patchDesc->mHandle;

                outputDesc->setPatchHandle(patchDesc->mHandle);

                nextAudioPortGeneration();

                mpClientInterface->onAudioPatchListUpdate();

            }
@@ -4601,7 +4601,7 @@ status_t AudioPolicyManager::resetOutputDevice(const sp<AudioOutputDescriptor>& 
    if (patchHandle) {

        index = mAudioPatches.indexOfKey(*patchHandle);

    } else {

        index = mAudioPatches.indexOfKey(outputDesc->mPatchHandle);

        index = mAudioPatches.indexOfKey(outputDesc->getPatchHandle());

    }

    if (index < 0) {

        return INVALID_OPERATION;
@@ -4609,7 +4609,7 @@ status_t AudioPolicyManager::resetOutputDevice(const sp<AudioOutputDescriptor>& 
    sp< AudioPatch> patchDesc = mAudioPatches.valueAt(index);

    status_t status = mpClientInterface->releaseAudioPatch(patchDesc->mAfPatchHandle, delayMs);

    ALOGV("resetOutputDevice() releaseAudioPatch returned %d", status);

    outputDesc->mPatchHandle = 0;

    outputDesc->setPatchHandle(0);

    removeAudioPatch(patchDesc->mHandle);

    nextAudioPortGeneration();

    mpClientInterface->onAudioPatchListUpdate();