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

Commit 7a29a3df authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I00375414,Idccd758d into sc-dev 

* changes:
  Revert "CCodec: don't drop metadata for output with flag FLAG_DROP_FRAME."
  Revert "CCodec: drop buffer and not notify client if outputformat isn't changed for FLAG_DROP_FRAME."
parents 0dfad22f 06f1f0de

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,