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

Commit 4d31beae authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CCodecBufferChannel: add null checks" am: 324ee076 am: fece72c9 

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

Change-Id: I8fa3fb64ec841fd884f5e46a94521baee56111b9
parents 4b3fdef0 fece72c9

media/codec2/sfplugin/CCodecBufferChannel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1761,7 +1761,7 @@ bool CCodecBufferChannel::handleWork( 
        {

            Mutexed<Output>::Locked output(mOutput);

            numOutputSlots = output->numSlots;

            reorderDepth = output->buffers->getReorderDepth();

            reorderDepth = output->buffers ? output->buffers->getReorderDepth() : 0;

        }

        Mutexed<OutputSurface>::Locked output(mOutputSurface);

        output->maxDequeueBuffers = numOutputSlots + reorderDepth + kRenderingDepth;