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

Commit 20d6cbf0 authored by Emilian Peev's avatar Emilian Peev Committed by android-build-merger
Browse files

Merge "Camera: Relax maximum Hal buffers and acquired count check" am: 6bff4d55 

am: a0f9adaf

Change-Id: I96b594a7ae6151425aa6c6429ec31ad8db516ba0
parents 644bdbcb a0f9adaf

services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp

+5 −5
Original line number Diff line number Diff line
@@ -253,6 +253,10 @@ status_t Camera3StreamSplitter::addOutputLocked(size_t surfaceId, const sp<Surfa 
    // Add new entry into mOutputs

    mOutputs[surfaceId] = gbp;

    mConsumerBufferCount[surfaceId] = maxConsumerBuffers;

    if (mConsumerBufferCount[surfaceId] > mMaxHalBuffers) {

        SP_LOGW("%s: Consumer buffer count %zu larger than max. Hal buffers: %zu", __FUNCTION__,

                mConsumerBufferCount[surfaceId], mMaxHalBuffers);

    }

    mNotifiers[gbp] = listener;

    mOutputSlots[gbp] = std::make_unique<OutputSlots>(totalBufferCount);
@@ -324,11 +328,7 @@ status_t Camera3StreamSplitter::removeOutputLocked(size_t surfaceId) { 
    }



    mNotifiers[gbp] = nullptr;

    if (mConsumerBufferCount[surfaceId] < mMaxHalBuffers) {

    mMaxConsumerBuffers -= mConsumerBufferCount[surfaceId];

    } else {

        SP_LOGE("%s: Cached consumer buffer count mismatch!", __FUNCTION__);

    }

    mConsumerBufferCount[surfaceId] = 0;



    return res;