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

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

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

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

Change-Id: I969f0a4046c82d9692596e9b2e587b66e1d373fc
parents 10705ba2 4d31beae

media/codec2/sfplugin/CCodecBufferChannel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1780,7 +1780,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);