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

Commit 4ca628c4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I73e6136f,Ifeeb0b29 

* changes:
  Revert "Revert "audio policy: fix regression in A2DP playback""
  Revert "Revert "audio policy: add parsing for profile max open and active count""
parents 1ef495d3 447d5363

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

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ struct MixPortTraits 
        static const char name[];

        static const char role[];

        static const char flags[];

        static const char maxOpenCount[];

        static const char maxActiveCount[];

    };



    typedef IOProfile Element;

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

+3 −0
Original line number Diff line number Diff line
@@ -241,6 +241,9 @@ void AudioInputDescriptor::close() 
        mClientInterface->closeInput(mIoHandle);

        LOG_ALWAYS_FATAL_IF(mProfile->curOpenCount < 1, "%s profile open count %u",

                            __FUNCTION__, mProfile->curOpenCount);

        if (isActive()) {

            mProfile->curActiveCount--;

        }

        mProfile->curOpenCount--;

        mIoHandle = AUDIO_IO_HANDLE_NONE;

    }

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

+3 −0
Original line number Diff line number Diff line
@@ -454,6 +454,9 @@ void SwAudioOutputDescriptor::close() 


        LOG_ALWAYS_FATAL_IF(mProfile->curOpenCount < 1, "%s profile open count %u",

                            __FUNCTION__, mProfile->curOpenCount);

        if (isActive()) {

            mProfile->curActiveCount--;

        }

        mProfile->curOpenCount--;

        mIoHandle = AUDIO_IO_HANDLE_NONE;

    }

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

+10 −0
Original line number Diff line number Diff line
@@ -217,6 +217,8 @@ const char *const MixPortTraits::tag = "mixPort"; 
const char MixPortTraits::Attributes::name[] = "name";

const char MixPortTraits::Attributes::role[] = "role";

const char MixPortTraits::Attributes::flags[] = "flags";

const char MixPortTraits::Attributes::maxOpenCount[] = "maxOpenCount";

const char MixPortTraits::Attributes::maxActiveCount[] = "maxActiveCount";



status_t MixPortTraits::deserialize(_xmlDoc *doc, const _xmlNode *child, PtrElement &mixPort,

                                    PtrSerializingCtx /*serializingContext*/)
@@ -259,6 +261,14 @@ status_t MixPortTraits::deserialize(_xmlDoc *doc, const _xmlNode *child, PtrElem 
            mixPort->setFlags(InputFlagConverter::maskFromString(flags));

        }

    }

    string maxOpenCount = getXmlAttribute(child, Attributes::maxOpenCount);

    if (!maxOpenCount.empty()) {

        convertTo(maxOpenCount, mixPort->maxOpenCount);

    }

    string maxActiveCount = getXmlAttribute(child, Attributes::maxActiveCount);

    if (!maxActiveCount.empty()) {

        convertTo(maxActiveCount, mixPort->maxActiveCount);

    }

    // Deserialize children

    AudioGainTraits::Collection gains;

    deserializeCollection<AudioGainTraits>(doc, child, gains, NULL);