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

Commit 7958631d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CCodec: Guard against null output->buffers" into rvc-dev am: 19d51164 

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

Change-Id: I24c4961bdfbef7ba6f9b10772f2bb3d21b462fc9
parents 6afa052d 19d51164

media/codec2/sfplugin/CCodecBufferChannel.cpp

+6 −5
Original line number Diff line number Diff line
@@ -618,13 +618,14 @@ void CCodecBufferChannel::feedInputBufferIfAvailable() { 
}



void CCodecBufferChannel::feedInputBufferIfAvailableInternal() {

    if (mInputMetEos ||

           mOutput.lock()->buffers->hasPending() ||

           mPipelineWatcher.lock()->pipelineFull()) {

    if (mInputMetEos || mPipelineWatcher.lock()->pipelineFull()) {

        return;

    } else {

    }

    {

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

        if (!output->buffers || output->buffers->numClientBuffers() >= output->numSlots) {

        if (!output->buffers ||

                output->buffers->hasPending() ||

                output->buffers->numClientBuffers() >= output->numSlots) {

            return;

        }

    }