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

Commit 4e4aca72 authored by Sungtak Lee's avatar Sungtak Lee Committed by android-build-merger
Browse files

Merge "Increase max dequeue buffer count only for non-secure decoders" into... 

Merge "Increase max dequeue buffer count only for non-secure decoders" into qt-qpr1-dev am: b34e4ac7
am: a649df43

Change-Id: I875e6ec2b04e1a9191969effedc41a5202c84e58
parents 1ac8a615 a649df43

media/codec2/sfplugin/CCodecBufferChannel.cpp

+15 −5
Original line number Diff line number Diff line
@@ -225,7 +225,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(""));
@@ -949,8 +949,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) {
@@ -1330,14 +1333,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);

                    }
@@ -1381,6 +1388,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;
@@ -1410,8 +1418,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);

                        }