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

Commit c677e153 authored by Robert Wu's avatar Robert Wu Committed by Android (Google) Code Review
Browse files

Merge "AAudio: Log client sample rate metric" into main

parents 27007e85 8f8dc091

media/libaaudio/src/core/AudioStream.cpp

+2 −1
Original line number Diff line number Diff line
@@ -134,7 +134,8 @@ void AudioStream::logOpenActual() { 
            .set(AMEDIAMETRICS_PROP_ENCODINGHARDWARE,

                    android::toString(getHardwareFormat()).c_str())

            .set(AMEDIAMETRICS_PROP_CHANNELCOUNTHARDWARE, (int32_t)getHardwareSamplesPerFrame())

            .set(AMEDIAMETRICS_PROP_SAMPLERATEHARDWARE, (int32_t)getHardwareSampleRate());

            .set(AMEDIAMETRICS_PROP_SAMPLERATEHARDWARE, (int32_t)getHardwareSampleRate())

            .set(AMEDIAMETRICS_PROP_SAMPLERATECLIENT, (int32_t)getSampleRate());



        if (getDirection() == AAUDIO_DIRECTION_OUTPUT) {

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

media/libmediametrics/include/MediaMetricsConstants.h

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ 
#define AMEDIAMETRICS_PROP_PLAYERIID      "playerIId"      // int32 (-1 invalid/unset IID)

#define AMEDIAMETRICS_PROP_ROUTEDDEVICEID "routedDeviceId" // int32

#define AMEDIAMETRICS_PROP_SAMPLERATE     "sampleRate"     // int32

#define AMEDIAMETRICS_PROP_SAMPLERATECLIENT "sampleRateClient" // int32

#define AMEDIAMETRICS_PROP_SAMPLERATEHARDWARE "sampleRateHardware" // int32

#define AMEDIAMETRICS_PROP_SELECTEDDEVICEID "selectedDeviceId" // int32

#define AMEDIAMETRICS_PROP_SELECTEDMICDIRECTION "selectedMicDirection" // int32

services/mediametrics/AudioAnalytics.cpp

+9 −1
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ static constexpr const char * const AAudioStreamFields[] { 
    "channel_count_hardware",

    "sample_rate_hardware",

    "uid",

    "sample_rate_client",

};



static constexpr const char * HeadTrackerDeviceEnabledFields[] {
@@ -1379,6 +1380,10 @@ void AudioAnalytics::AAudioStreamInfo::endAAudioStream( 


    const auto uid = item->getUid();



    int32_t sampleRateClient = 0;

    mAudioAnalytics.mAnalyticsState->timeMachine().get(

            key, AMEDIAMETRICS_PROP_SAMPLERATECLIENT, &sampleRateClient);



    LOG(LOG_LEVEL) << "key:" << key

            << " path:" << path

            << " direction:" << direction << "(" << directionStr << ")"
@@ -1402,7 +1407,8 @@ void AudioAnalytics::AAudioStreamInfo::endAAudioStream( 
            << " format_hardware:" << formatHardware << "(" << formatHardwareStr << ")"

            << " channel_count_hardware:" << channelCountHardware

            << " sample_rate_hardware: " << sampleRateHardware

            << " uid: " << uid;

            << " uid: " << uid

            << " sample_rate_client: " << sampleRateClient;



    if (mAudioAnalytics.mDeliverStatistics) {

        const stats::media_metrics::BytesField bf_serialized(
@@ -1431,6 +1437,7 @@ void AudioAnalytics::AAudioStreamInfo::endAAudioStream( 
                , channelCountHardware

                , sampleRateHardware

                , uid

                , sampleRateClient

                );

        std::stringstream ss;

        ss << "result:" << result;
@@ -1458,6 +1465,7 @@ void AudioAnalytics::AAudioStreamInfo::endAAudioStream( 
                , channelCountHardware

                , sampleRateHardware

                , uid

                , sampleRateClient

                );

        ss << " " << fieldsStr;

        std::string str = ss.str();