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

Commit 0e2e720d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5743241 from e151ed6e to qt-c2f2-release 

Change-Id: I419dc51f4744bb131c93e8b808e114b5d1b1ec7a
parents 85640b3b e151ed6e

media/codec2/sfplugin/CCodecBufferChannel.cpp

+9 −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 = kSmoothnessFactor + kRenderingDepth;

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

    {

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

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

        {

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

            output->maxDequeueBuffers = numOutputSlots + reorderDepth.value + kRenderingDepth;

            output->maxDequeueBuffers = numOutputSlots + numInputSlots +

                    reorderDepth.value + kRenderingDepth;

            outputSurface = output->surface ?

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

            if (outputSurface) {
@@ -1332,9 +1333,10 @@ bool CCodecBufferChannel::handleWork( 
                    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 + reorderDepth.value + kRenderingDepth;

                    output->maxDequeueBuffers = numOutputSlots + numInputSlots +

                            reorderDepth.value + kRenderingDepth;

                    if (output->surface) {

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

                    }
@@ -1382,6 +1384,7 @@ bool CCodecBufferChannel::handleWork( 


                        bool outputBuffersChanged = false;

                        size_t numOutputSlots = 0;

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

                        {

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

                            output->outputDelay = outputDelay.value;
@@ -1406,7 +1409,8 @@ bool CCodecBufferChannel::handleWork( 


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

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

                        output->maxDequeueBuffers = numOutputSlots + depth + kRenderingDepth;

                        output->maxDequeueBuffers = numOutputSlots + numInputSlots +

                                depth + kRenderingDepth;

                        if (output->surface) {

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

                        }

media/codec2/sfplugin/PipelineWatcher.cpp

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ PipelineWatcher::Clock::duration PipelineWatcher::elapsed( 
              std::chrono::duration_cast<std::chrono::milliseconds>(elapsed).count());

        durations.push_back(elapsed);

    }

    std::nth_element(durations.begin(), durations.end(), durations.begin() + n,

    std::nth_element(durations.begin(), durations.begin() + n, durations.end(),

                     std::greater<Clock::duration>());

    return durations[n];

}

services/audioflinger/Effects.cpp

+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "Configuration.h"

#include <utils/Log.h>

#include <system/audio_effects/effect_aec.h>

#include <system/audio_effects/effect_dynamicsprocessing.h>

#include <system/audio_effects/effect_ns.h>

#include <system/audio_effects/effect_visualizer.h>

#include <audio_utils/channels.h>
@@ -2569,7 +2570,8 @@ bool AudioFlinger::EffectChain::isEffectEligibleForSuspend(const effect_descript 
    if ((mSessionId == AUDIO_SESSION_OUTPUT_MIX) &&

        (((desc.flags & EFFECT_FLAG_TYPE_MASK) == EFFECT_FLAG_TYPE_AUXILIARY) ||

         (memcmp(&desc.type, SL_IID_VISUALIZATION, sizeof(effect_uuid_t)) == 0) ||

         (memcmp(&desc.type, SL_IID_VOLUME, sizeof(effect_uuid_t)) == 0))) {

         (memcmp(&desc.type, SL_IID_VOLUME, sizeof(effect_uuid_t)) == 0) ||

         (memcmp(&desc.type, SL_IID_DYNAMICSPROCESSING, sizeof(effect_uuid_t)) == 0))) {

        return false;

    }

    return true;