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

Commit ed63bf96 authored by Jiabin Huang's avatar Jiabin Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix odd values in aaudio metrics." into sc-v2-dev am: 76f5644f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15405285

Change-Id: I4ba3806b6ccc4631bbc7e2ad6fa5d53e27b16e66
parents 06a4d86e 76f5644f

media/libaaudio/src/client/AudioStreamInternal.cpp

+5 −2
Original line number Diff line number Diff line
@@ -156,8 +156,11 @@ aaudio_result_t AudioStreamInternal::open(const AudioStreamBuilder &builder) { 


    // This must match the key generated in oboeservice/AAudioServiceStreamBase.cpp

    // so the client can have permission to log.

    if (!mInService) {

        // No need to log if it is from service side.

        mMetricsId = std::string(AMEDIAMETRICS_KEY_PREFIX_AUDIO_STREAM)

                     + std::to_string(mServiceStreamHandle);

    }



    android::mediametrics::LogItem(mMetricsId)

            .set(AMEDIAMETRICS_PROP_PERFORMANCEMODE,

services/mediametrics/AudioAnalytics.cpp

+20 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <audio_utils/clock.h>    // clock conversions

#include <cutils/properties.h>

#include <statslog.h>             // statsd

#include <system/audio.h>



#include "AudioTypes.h"           // string to int conversions

#include "MediaMetricsService.h"  // package info
@@ -958,6 +959,25 @@ void AudioAnalytics::AAudioStreamInfo::endAAudioStream( 
    int32_t channelCount = -1;

    mAudioAnalytics.mAnalyticsState->timeMachine().get(

            key, AMEDIAMETRICS_PROP_CHANNELCOUNT, &channelCount);

    if (channelCount == -1) {

        // Try to get channel count from channel mask. From the legacy path,

        // only channel mask are logged.

        int32_t channelMask = 0;

        mAudioAnalytics.mAnalyticsState->timeMachine().get(

                key, AMEDIAMETRICS_PROP_CHANNELMASK, &channelMask);

        if (channelMask != 0) {

            switch (direction) {

                case 1: // Output, keep sync with AudioTypes#getAAudioDirection()

                    channelCount = audio_channel_count_from_out_mask(channelMask);

                    break;

                case 2: // Input, keep sync with AudioTypes#getAAudioDirection()

                    channelCount = audio_channel_count_from_in_mask(channelMask);

                    break;

                default:

                    ALOGW("Invalid direction %d", direction);

            }

        }

    }



    int64_t totalFramesTransferred = -1;

    mAudioAnalytics.mAnalyticsState->timeMachine().get(