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

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

Merge "CCodec: add to check pipelineFull() in... 

Merge "CCodec: add to check pipelineFull() in feedInputBufferIfAvailableInternal()" am: cd69f69c am: 07218133 am: 958c7169

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

Change-Id: Ia96bb79d321266bb4c30b62675b5b7b79f68f5d2
parents c894f7ff 958c7169

media/codec2/sfplugin/CCodecBufferChannel.cpp

+4 −1
Original line number Original line Diff line number Diff line
@@ -618,7 +618,7 @@ void CCodecBufferChannel::feedInputBufferIfAvailable() { 
}

}





void CCodecBufferChannel::feedInputBufferIfAvailableInternal() {

void CCodecBufferChannel::feedInputBufferIfAvailableInternal() {

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

    if (mInputMetEos) {

        return;

        return;

    }

    }

    {

    {
@@ -631,6 +631,9 @@ void CCodecBufferChannel::feedInputBufferIfAvailableInternal() { 
    }

    }

    size_t numInputSlots = mInput.lock()->numSlots;

    size_t numInputSlots = mInput.lock()->numSlots;

    for (size_t i = 0; i < numInputSlots; ++i) {

    for (size_t i = 0; i < numInputSlots; ++i) {

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

            return;

        }

        sp<MediaCodecBuffer> inBuffer;

        sp<MediaCodecBuffer> inBuffer;

        size_t index;

        size_t index;

        {

        {