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

Commit 718ccb5e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add format change check rule" into main

parents 79ff7cde e74e506b

media/codec2/sfplugin/CCodecBufferChannel.cpp

+9 −2
Original line number Diff line number Diff line
@@ -2128,8 +2128,15 @@ bool CCodecBufferChannel::handleWork( 


    if (notifyClient && !buffer && !flags) {

        if (mTunneled && drop && outputFormat) {

            if (mOutputFormat != outputFormat) {

                ALOGV("[%s] onWorkDone: Keep tunneled, drop frame with format change (%lld)",

                      mName, work->input.ordinal.frameIndex.peekull());

                mOutputFormat = outputFormat;

            } else {

                ALOGV("[%s] onWorkDone: Not reporting output buffer without format change (%lld)",

                      mName, work->input.ordinal.frameIndex.peekull());

                notifyClient = false;

            }

        } else {

            ALOGV("[%s] onWorkDone: Not reporting output buffer (%lld)",

                  mName, work->input.ordinal.frameIndex.peekull());

media/codec2/sfplugin/CCodecBufferChannel.h

+1 −0
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ private: 
    std::shared_ptr<C2BlockPool> mInputAllocator;

    QueueSync mQueueSync;

    std::vector<std::unique_ptr<C2Param>> mParamsToBeSet;

    sp<AMessage> mOutputFormat;



    struct Input {

        Input();