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

Commit 0cefb106 authored by Kevin Rocard's avatar Kevin Rocard Committed by Android (Google) Code Review
Browse files

Merge "AudioPolicy: make input attributes parameter const&"

parents 9fcae9fd f4f5c817

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

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public: 
     * @param[out] desc to return if an primary output could be found.

     * @param[out] secondaryDesc other desc that the audio should be routed to.

     */

    status_t getOutputForAttr(audio_attributes_t attributes, uid_t uid,

    status_t getOutputForAttr(const audio_attributes_t& attributes, uid_t uid,

                sp<SwAudioOutputDescriptor> &primaryDesc,

                std::vector<sp<SwAudioOutputDescriptor>> *secondaryDescs);
@@ -102,7 +102,7 @@ public: 
private:

    enum class MixMatchStatus { MATCH, NO_MATCH, INVALID_MIX };

    MixMatchStatus mixMatch(const AudioMix* mix, size_t mixIndex,

                            audio_attributes_t attributes, uid_t uid);

                            const audio_attributes_t& attributes, uid_t uid);

};



} // namespace android

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

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ void AudioPolicyMixCollection::closeOutput(sp<SwAudioOutputDescriptor> &desc) 
}



status_t AudioPolicyMixCollection::getOutputForAttr(

        audio_attributes_t attributes, uid_t uid, sp<SwAudioOutputDescriptor> &primaryDesc,

        const audio_attributes_t& attributes, uid_t uid, sp<SwAudioOutputDescriptor> &primaryDesc,

        std::vector<sp<SwAudioOutputDescriptor>> *secondaryDescs)

{

    ALOGV("getOutputForAttr() querying %zu mixes:", size());
@@ -203,7 +203,7 @@ status_t AudioPolicyMixCollection::getOutputForAttr( 
}



AudioPolicyMixCollection::MixMatchStatus AudioPolicyMixCollection::mixMatch(

        const AudioMix* mix, size_t mixIndex, audio_attributes_t attributes, uid_t uid) {

        const AudioMix* mix, size_t mixIndex, const audio_attributes_t& attributes, uid_t uid) {



    if (mix->mMixType == MIX_TYPE_PLAYERS) {

        // TODO if adding more player rules (currently only 2), make rule handling "generic"