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

Commit 8e9a48b7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I00375414,Idccd758d into sc-dev am: 7a29a3df am: eb58d0d0 

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

Change-Id: I009184fe4bd8227ebf54264dc7ca01a1cfd4244c
parents a8487f43 eb58d0d0

media/codec2/sfplugin/CCodecBufferChannel.cpp

+2 −8
Original line number Diff line number Diff line
@@ -1881,13 +1881,7 @@ bool CCodecBufferChannel::handleWork( 
        }

    }



    bool drop = false;

    if (worklet->output.flags & C2FrameData::FLAG_DROP_FRAME) {

        ALOGV("[%s] onWorkDone: drop buffer but keep metadata", mName);

        drop = true;

    }



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

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

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

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

        notifyClient = false;
@@ -1914,7 +1908,7 @@ bool CCodecBufferChannel::handleWork( 
            return false;

        }

        output->buffers->pushToStash(

                drop ? nullptr : buffer,

                buffer,

                notifyClient,

                timestamp.peek(),

                flags,