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

Commit 39b41a0b authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "AAudio: enable playerIId metrics tracking" into sc-dev

parents 445b8958 400f056d

media/libaaudio/src/core/AAudioAudio.cpp

+0 −1
Original line number Diff line number Diff line
@@ -209,7 +209,6 @@ AAUDIO_API aaudio_result_t AAudioStreamBuilder_openStream(AAudioStreamBuilder* 
    AudioStreamBuilder *streamBuilder = COMMON_GET_FROM_BUILDER_OR_RETURN(streamPtr);

    aaudio_result_t result = streamBuilder->build(&audioStream);

    if (result == AAUDIO_OK) {

        audioStream->registerPlayerBase();

        *streamPtr = (AAudioStream*) audioStream;

        id = audioStream->getId();

    } else {

media/libaaudio/src/core/AudioStream.cpp

+10 −6
Original line number Diff line number Diff line
@@ -119,12 +119,16 @@ aaudio_result_t AudioStream::open(const AudioStreamBuilder& builder) 


void AudioStream::logOpen() {

    if (mMetricsId.size() > 0) {

        android::mediametrics::LogItem(mMetricsId)

        android::mediametrics::LogItem item(mMetricsId);

        item.set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_OPEN)

            .set(AMEDIAMETRICS_PROP_PERFORMANCEMODE,

                AudioGlobal_convertPerformanceModeToText(getPerformanceMode()))

            .set(AMEDIAMETRICS_PROP_SHARINGMODE,

                     AudioGlobal_convertSharingModeToText(getSharingMode()))

                .record();

                AudioGlobal_convertSharingModeToText(getSharingMode()));

        if (getDirection() == AAUDIO_DIRECTION_OUTPUT) {

            item.set(AMEDIAMETRICS_PROP_PLAYERIID, mPlayerBase->getPlayerIId());

        }

        item.record();

    }

}

media/libaaudio/src/core/AudioStream.h

+5 −0
Original line number Diff line number Diff line
@@ -475,6 +475,11 @@ protected: 
            return mResult;

        }



        // Returns the playerIId if registered, -1 otherwise.

        int32_t getPlayerIId() const {

            return mPIId;

        }



    private:

        // Use a weak pointer so the AudioStream can be deleted.

        std::mutex               mParentLock;

media/libaaudio/src/core/AudioStreamBuilder.cpp

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ aaudio_result_t AudioStreamBuilder::build(AudioStream** streamPtr) { 
            }

        }

        if (result == AAUDIO_OK) {

            audioStream->registerPlayerBase();

            audioStream->logOpen();

            *streamPtr = startUsingStream(audioStream);

        } // else audioStream will go out of scope and be deleted