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

Commit d7463d1d authored by Sungtak Lee's avatar Sungtak Lee
Browse files

Increase max dequeue buffer count only for non-secure decoders 

Since secure buffers are limited resources, use less buffers for secure
output display.

Bug: 138295327
Bug: 140087403
Change-Id: If763bed99cecc0acdd88d0111d30aa4ab98bce71
parent 989ba107

media/codec2/sfplugin/CCodecBufferChannel.cpp

+15 −5
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ CCodecBufferChannel::CCodecBufferChannel( 
      mFirstValidFrameIndex(0u),

      mMetaMode(MODE_NONE),

      mInputMetEos(false) {

    mOutputSurface.lock()->maxDequeueBuffers = 2 * kSmoothnessFactor + kRenderingDepth;

    mOutputSurface.lock()->maxDequeueBuffers = kSmoothnessFactor + kRenderingDepth;

    {

        Mutexed<Input>::Locked input(mInput);

        input->buffers.reset(new DummyInputBuffers(""));
@@ -948,8 +948,11 @@ status_t CCodecBufferChannel::start( 
        uint32_t outputGeneration;

        {

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

            output->maxDequeueBuffers = numOutputSlots + numInputSlots +

            output->maxDequeueBuffers = numOutputSlots +

                    reorderDepth.value + kRenderingDepth;

            if (!secure) {

                output->maxDequeueBuffers += numInputSlots;

            }

            outputSurface = output->surface ?

                    output->surface->getIGraphicBufferProducer() : nullptr;

            if (outputSurface) {
@@ -1329,14 +1332,18 @@ bool CCodecBufferChannel::handleWork( 
            case C2PortReorderBufferDepthTuning::CORE_INDEX: {

                C2PortReorderBufferDepthTuning::output reorderDepth;

                if (reorderDepth.updateFrom(*param)) {

                    bool secure = mComponent->getName().find(".secure") != std::string::npos;

                    mReorderStash.lock()->setDepth(reorderDepth.value);

                    ALOGV("[%s] onWorkDone: updated reorder depth to %u",

                          mName, reorderDepth.value);

                    size_t numOutputSlots = mOutput.lock()->numSlots;

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

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

                    output->maxDequeueBuffers = numOutputSlots + numInputSlots +

                    output->maxDequeueBuffers = numOutputSlots +

                            reorderDepth.value + kRenderingDepth;

                    if (!secure) {

                        output->maxDequeueBuffers += numInputSlots;

                    }

                    if (output->surface) {

                        output->surface->setMaxDequeuedBufferCount(output->maxDequeueBuffers);

                    }
@@ -1380,6 +1387,7 @@ bool CCodecBufferChannel::handleWork( 
                    if (outputDelay.updateFrom(*param)) {

                        ALOGV("[%s] onWorkDone: updating output delay %u",

                              mName, outputDelay.value);

                        bool secure = mComponent->getName().find(".secure") != std::string::npos;

                        (void)mPipelineWatcher.lock()->outputDelay(outputDelay.value);



                        bool outputBuffersChanged = false;
@@ -1409,8 +1417,10 @@ bool CCodecBufferChannel::handleWork( 


                        uint32_t depth = mReorderStash.lock()->depth();

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

                        output->maxDequeueBuffers = numOutputSlots + numInputSlots +

                                depth + kRenderingDepth;

                        output->maxDequeueBuffers = numOutputSlots + depth + kRenderingDepth;

                        if (!secure) {

                            output->maxDequeueBuffers += numInputSlots;

                        }

                        if (output->surface) {

                            output->surface->setMaxDequeuedBufferCount(output->maxDequeueBuffers);

                        }