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

Commit 66a6961c authored by Brian Lindahl's avatar Brian Lindahl Committed by Automerger Merge Worker
Browse files

Merge changes Ic93dd0c7,Ibabbb998,I3a26f901,I9708086f into main am: da30ff98 

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



Change-Id: Ieda6fc5b898446394f60830589d661b34703b3c5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da4bcfc6 da30ff98

media/libstagefright/MediaCodec.cpp

+2 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ static const char *kCodecShapingEnhanced = "android.media.mediacodec.shaped"; 
// Render metrics

static const char *kCodecPlaybackDurationSec = "android.media.mediacodec.playback-duration-sec";

static const char *kCodecFirstRenderTimeUs = "android.media.mediacodec.first-render-time-us";

static const char *kCodecLastRenderTimeUs = "android.media.mediacodec.last-render-time-us";

static const char *kCodecFramesReleased = "android.media.mediacodec.frames-released";

static const char *kCodecFramesRendered = "android.media.mediacodec.frames-rendered";

static const char *kCodecFramesDropped = "android.media.mediacodec.frames-dropped";
@@ -1345,6 +1346,7 @@ void MediaCodec::updateMediametrics() { 
        const VideoRenderQualityMetrics &m = mVideoRenderQualityTracker.getMetrics();

        if (m.frameReleasedCount > 0) {

            mediametrics_setInt64(mMetricsHandle, kCodecFirstRenderTimeUs, m.firstRenderTimeUs);

            mediametrics_setInt64(mMetricsHandle, kCodecLastRenderTimeUs, m.lastRenderTimeUs);

            mediametrics_setInt64(mMetricsHandle, kCodecFramesReleased, m.frameReleasedCount);

            mediametrics_setInt64(mMetricsHandle, kCodecFramesRendered, m.frameRenderedCount);

            mediametrics_setInt64(mMetricsHandle, kCodecFramesSkipped, m.frameSkippedCount);

media/libstagefright/VideoRenderQualityTracker.cpp

+2 −0
Original line number Diff line number Diff line
@@ -495,6 +495,8 @@ void VideoRenderQualityTracker::processMetricsForRenderedFrame(int64_t contentTi 
    if (mMetrics.firstRenderTimeUs == 0) {

        mMetrics.firstRenderTimeUs = actualRenderTimeUs;

    }

    // Capture the timestamp at which the last frame was rendered

    mMetrics.lastRenderTimeUs = actualRenderTimeUs;



    mMetrics.frameRenderedCount++;

media/libstagefright/include/media/stagefright/VideoRenderQualityTracker.h

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ struct VideoRenderQualityMetrics { 
    // The render time of the first video frame.

    int64_t firstRenderTimeUs;



    // The render time of the last video frame.

    int64_t lastRenderTimeUs;



    // The number of frames released to be rendered.

    int64_t frameReleasedCount;