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

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

Merge "Log requested sharing mode." into sc-dev

parents 37b3220c c8da9034

media/libaaudio/src/client/AudioStreamInternal.cpp

+3 −1
Original line number Diff line number Diff line
@@ -159,7 +159,9 @@ aaudio_result_t AudioStreamInternal::open(const AudioStreamBuilder &builder) { 


    android::mediametrics::LogItem(mMetricsId)

            .set(AMEDIAMETRICS_PROP_PERFORMANCEMODE,

                 AudioGlobal_convertPerformanceModeToText(getPerformanceMode()))

                 AudioGlobal_convertPerformanceModeToText(builder.getPerformanceMode()))

            .set(AMEDIAMETRICS_PROP_SHARINGMODE,

                 AudioGlobal_convertSharingModeToText(builder.getSharingMode()))

            .set(AMEDIAMETRICS_PROP_ENCODINGCLIENT,

                 android::toString(requestedFormat).c_str()).record();

media/libaaudio/src/core/AudioStream.cpp

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ void AudioStream::logOpenActual() { 
        item.set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_OPEN)

            .set(AMEDIAMETRICS_PROP_PERFORMANCEMODEACTUAL,

                AudioGlobal_convertPerformanceModeToText(getPerformanceMode()))

            .set(AMEDIAMETRICS_PROP_SHARINGMODE,

            .set(AMEDIAMETRICS_PROP_SHARINGMODEACTUAL,

                AudioGlobal_convertSharingModeToText(getSharingMode()))

            .set(AMEDIAMETRICS_PROP_BUFFERCAPACITYFRAMES, getBufferCapacity())

            .set(AMEDIAMETRICS_PROP_BURSTFRAMES, getFramesPerBurst())

media/libaaudio/src/legacy/AudioStreamRecord.cpp

+3 −1
Original line number Diff line number Diff line
@@ -221,7 +221,9 @@ aaudio_result_t AudioStreamRecord::open(const AudioStreamBuilder& builder) 
            + std::to_string(mAudioRecord->getPortId());

    android::mediametrics::LogItem(mMetricsId)

            .set(AMEDIAMETRICS_PROP_PERFORMANCEMODE,

                 AudioGlobal_convertPerformanceModeToText(getPerformanceMode()))

                 AudioGlobal_convertPerformanceModeToText(builder.getPerformanceMode()))

            .set(AMEDIAMETRICS_PROP_SHARINGMODE,

                 AudioGlobal_convertSharingModeToText(builder.getSharingMode()))

            .set(AMEDIAMETRICS_PROP_ENCODINGCLIENT, toString(requestedFormat).c_str()).record();



    // Get the actual values from the AudioRecord.

media/libaaudio/src/legacy/AudioStreamTrack.cpp

+3 −1
Original line number Diff line number Diff line
@@ -191,7 +191,9 @@ aaudio_result_t AudioStreamTrack::open(const AudioStreamBuilder& builder) 
            + std::to_string(mAudioTrack->getPortId());

    android::mediametrics::LogItem(mMetricsId)

            .set(AMEDIAMETRICS_PROP_PERFORMANCEMODE,

                 AudioGlobal_convertPerformanceModeToText(getPerformanceMode()))

                 AudioGlobal_convertPerformanceModeToText(builder.getPerformanceMode()))

            .set(AMEDIAMETRICS_PROP_SHARINGMODE,

                 AudioGlobal_convertSharingModeToText(builder.getSharingMode()))

            .set(AMEDIAMETRICS_PROP_ENCODINGCLIENT, toString(getFormat()).c_str()).record();



    doSetVolume();

media/libmediametrics/include/MediaMetricsConstants.h

+2 −0
Original line number Diff line number Diff line
@@ -166,6 +166,8 @@ 
// "powerSaving"

#define AMEDIAMETRICS_PROP_PERFORMANCEMODEACTUAL "performanceModeActual" // string

#define AMEDIAMETRICS_PROP_FRAMESTRANSFERRED "framesTransferred" // int64_t, transferred frames

// string value, "exclusive", "shared". the actual selected sharing mode by the server

#define AMEDIAMETRICS_PROP_SHARINGMODEACTUAL "sharingModeActual"



// Timing values: millisecond values are suffixed with MS and the type is double

// nanosecond values are suffixed with NS and the type is int64.