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

Commit c7c0f7f3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add component color format metric." into udc-dev am: 71fcfad2 am: 7c77bd06 

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



Change-Id: Id891d17aca5db39ba1e303c697444cfbfbc7d0a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8ce301de 7c77bd06

media/libstagefright/MediaCodec.cpp

+9 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ static const char *kCodecLatencyHist = "android.media.mediacodec.latency.hist"; 
static const char *kCodecLatencyUnknown = "android.media.mediacodec.latency.unknown";

static const char *kCodecQueueSecureInputBufferError = "android.media.mediacodec.queueSecureInputBufferError";

static const char *kCodecQueueInputBufferError = "android.media.mediacodec.queueInputBufferError";

static const char *kCodecComponentColorFormat = "android.media.mediacodec.component-color-format";



static const char *kCodecNumLowLatencyModeOn = "android.media.mediacodec.low-latency.on";  /* 0..n */

static const char *kCodecNumLowLatencyModeOff = "android.media.mediacodec.low-latency.off";  /* 0..n */
@@ -3811,6 +3812,14 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
                        if (interestingFormat->findInt32("level", &level)) {

                            mediametrics_setInt32(mMetricsHandle, kCodecLevel, level);

                        }

                        sp<AMessage> uncompressedFormat =

                                (mFlags & kFlagIsEncoder) ? mInputFormat : mOutputFormat;

                        int32_t componentColorFormat  = -1;

                        if (uncompressedFormat->findInt32("android._color-format",

                                &componentColorFormat)) {

                            mediametrics_setInt32(mMetricsHandle,

                                    kCodecComponentColorFormat, componentColorFormat);

                        }

                        updateHdrMetrics(true /* isConfig */);

                        int32_t codecMaxInputSize = -1;

                        if (mInputFormat->findInt32(KEY_MAX_INPUT_SIZE, &codecMaxInputSize)) {

services/mediametrics/statsd_codec.cpp

+6 −0
Original line number Diff line number Diff line
@@ -648,6 +648,12 @@ bool statsd_codec(const std::shared_ptr<const mediametrics::Item>& item, 
    }

    AStatsEvent_writeInt32(event, resolutionChangeCount);



    int32_t componentColorFormat = -1;

    if (item->getInt32("android.media.mediacodec.component-color-format", &componentColorFormat)) {

        metrics_proto.set_component_color_format(componentColorFormat);

    }

    AStatsEvent_writeInt32(event, componentColorFormat);



    int64_t firstRenderTimeUs = -1;

    item->getInt64("android.media.mediacodec.first-render-time-us", &firstRenderTimeUs);

    int64_t framesReleased = -1;