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

Commit c9ee2dd9 authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge "Send onFrameRendered differently depending on whether the surface is a... 

Merge "Send onFrameRendered differently depending on whether the surface is a display" into udc-dev am: 06f98204

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



Change-Id: I27d3767bca6a3d315961268e3f6c56dde4d2f65e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 58afd024 06f98204

media/codec2/sfplugin/CCodecBufferChannel.cpp

+21 −3
Original line number Diff line number Diff line
@@ -147,6 +147,8 @@ CCodecBufferChannel::CCodecBufferChannel( 
      mCCodecCallback(callback),

      mFrameIndex(0u),

      mFirstValidFrameIndex(0u),

      mIsSurfaceToDisplay(false),

      mHasPresentFenceTimes(false),

      mMetaMode(MODE_NONE),

      mInputMetEos(false),

      mSendEncryptedInfoBuffer(false) {
@@ -988,20 +990,36 @@ status_t CCodecBufferChannel::renderOutputBuffer( 


    int64_t mediaTimeUs = 0;

    (void)buffer->meta()->findInt64("timeUs", &mediaTimeUs);

    if (mIsSurfaceToDisplay) {

        trackReleasedFrame(qbo, mediaTimeUs, timestampNs);

        processRenderedFrames(qbo.frameTimestamps);

    } else {

        // When the surface is an intermediate surface, onFrameRendered is triggered immediately

        // when the frame is queued to the non-display surface

        mCCodecCallback->onOutputFramesRendered(mediaTimeUs, timestampNs);

    }



    return OK;

}



void CCodecBufferChannel::initializeFrameTrackingFor(ANativeWindow * window) {

    mTrackedFrames.clear();



    int isSurfaceToDisplay = 0;

    window->query(window, NATIVE_WINDOW_QUEUES_TO_WINDOW_COMPOSER, &isSurfaceToDisplay);

    mIsSurfaceToDisplay = isSurfaceToDisplay == 1;

    // No frame tracking is needed if we're not sending frames to the display

    if (!mIsSurfaceToDisplay) {

        // Return early so we don't call into SurfaceFlinger (requiring permissions)

        return;

    }



    int hasPresentFenceTimes = 0;

    window->query(window, NATIVE_WINDOW_FRAME_TIMESTAMPS_SUPPORTS_PRESENT, &hasPresentFenceTimes);

    mHasPresentFenceTimes = hasPresentFenceTimes == 1;

    if (mHasPresentFenceTimes) {

        ALOGI("Using latch times for frame rendered signals - present fences not supported");

    }

    mTrackedFrames.clear();

}



void CCodecBufferChannel::trackReleasedFrame(const IGraphicBufferProducer::QueueBufferOutput& qbo,

media/codec2/sfplugin/CCodecBufferChannel.h

+1 −0
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ private: 
    sp<MemoryDealer> makeMemoryDealer(size_t heapSize);



    std::deque<TrackedFrame> mTrackedFrames;

    bool mIsSurfaceToDisplay;

    bool mHasPresentFenceTimes;



    struct OutputSurface {