Merge "Allow BlastBufferQueue to acquire an additional buffer" into sc-dev (aebf2476) · Commits · e / os / platform_frameworks_native

libs/gui/BLASTBufferQueue.cpp

+19 −11

Original line number	Diff line number	Diff line
		@@ -248,7 +248,7 @@ void BLASTBufferQueue::transactionCallback(nsecs_t /latchTime/, const sp<Fence
		mPendingReleaseItem.item = std::move(mSubmitted.front());
		mSubmitted.pop();

		processNextBufferLocked(false);
		processNextBufferLocked(false /* useNextTransaction */);

		currFrameNumber = mPendingReleaseItem.item.mFrameNumber;
		if (mTransactionCompleteCallback && mTransactionCompleteFrameNumber == currFrameNumber) {
		@@ -269,9 +269,10 @@ void BLASTBufferQueue::processNextBufferLocked(bool useNextTransaction) {
		ATRACE_CALL();
		BQA_LOGV("processNextBufferLocked useNextTransaction=%s", toString(useNextTransaction));

		// Wait to acquire a buffer if there are no frames available or we have acquired the max
		// number of buffers.
		if (mNumFrameAvailable == 0 \|\| maxBuffersAcquired()) {
		// If the next transaction is set, we want to guarantee the our acquire will not fail, so don't
		// include the extra buffer when checking if we can acquire the next buffer.
		const bool includeExtraAcquire = !useNextTransaction;
		if (mNumFrameAvailable == 0 \|\| maxBuffersAcquired(includeExtraAcquire)) {
		BQA_LOGV("processNextBufferLocked waiting for frame available or callback");
		mCallbackCV.notify_all();
		return;
		@@ -295,7 +296,10 @@ void BLASTBufferQueue::processNextBufferLocked(bool useNextTransaction) {

		status_t status =
		mBufferItemConsumer->acquireBuffer(&bufferItem, 0 /* expectedPresent */, false);
		if (status != OK) {
		if (status == BufferQueue::NO_BUFFER_AVAILABLE) {
		BQA_LOGV("Failed to acquire a buffer, err=NO_BUFFER_AVAILABLE");
		return;
		} else if (status != OK) {
		BQA_LOGE("Failed to acquire a buffer, err=%s", statusToString(status).c_str());
		return;
		}
		@@ -414,7 +418,7 @@ void BLASTBufferQueue::onFrameAvailable(const BufferItem& item) {
		item.mFrameNumber, toString(nextTransactionSet), toString(mFlushShadowQueue));

		if (nextTransactionSet \|\| mFlushShadowQueue) {
		while (mNumFrameAvailable > 0 \|\| maxBuffersAcquired()) {
		while (mNumFrameAvailable > 0 \|\| maxBuffersAcquired(false /* includeExtraAcquire */)) {
		BQA_LOGV("waiting in onFrameAvailable...");
		mCallbackCV.wait(_lock);
		}
		@@ -422,7 +426,7 @@ void BLASTBufferQueue::onFrameAvailable(const BufferItem& item) {
		mFlushShadowQueue = false;
		// add to shadow queue
		mNumFrameAvailable++;
		processNextBufferLocked(true);
		processNextBufferLocked(nextTransactionSet /* useNextTransaction */);
		}

		void BLASTBufferQueue::onFrameReplaced(const BufferItem& item) {
		@@ -482,9 +486,12 @@ void BLASTBufferQueue::setTransactionCompleteCallback(
		// Check if we have acquired the maximum number of buffers.
		// As a special case, we wait for the first callback before acquiring the second buffer so we
		// can ensure the first buffer is presented if multiple buffers are queued in succession.
		bool BLASTBufferQueue::maxBuffersAcquired() const {
		return mNumAcquired == MAX_ACQUIRED_BUFFERS + 1 \|\|
		(!mInitialCallbackReceived && mNumAcquired == 1);
		// Consumer can acquire an additional buffer if that buffer is not droppable. Set
		// includeExtraAcquire is true to include this buffer to the count. Since this depends on the state
		// of the buffer, the next acquire may return with NO_BUFFER_AVAILABLE.
		bool BLASTBufferQueue::maxBuffersAcquired(bool includeExtraAcquire) const {
		int maxAcquiredBuffers = MAX_ACQUIRED_BUFFERS + (includeExtraAcquire ? 2 : 1);
		return mNumAcquired == maxAcquiredBuffers \|\| (!mInitialCallbackReceived && mNumAcquired == 1);
		}

		class BBQSurface : public Surface {
		@@ -654,7 +661,8 @@ void BLASTBufferQueue::createBufferQueue(sp<IGraphicBufferProducer>* outProducer
		LOG_ALWAYS_FATAL_IF(producer == nullptr,
		"BLASTBufferQueue: failed to create BBQBufferQueueProducer");

		sp<IGraphicBufferConsumer> consumer(new BufferQueueConsumer(core));
		sp<BufferQueueConsumer> consumer(new BufferQueueConsumer(core));
		consumer->setAllowExtraAcquire(true);
		LOG_ALWAYS_FATAL_IF(consumer == nullptr,
		"BLASTBufferQueue: failed to create BufferQueueConsumer");

libs/gui/BufferQueueConsumer.cpp

+12 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,10 @@ status_t BufferQueueConsumer::acquireBuffer(BufferItem* outBuffer,
		++numAcquiredBuffers;
		}
		}
		if (numAcquiredBuffers >= mCore->mMaxAcquiredBufferCount + 1) {
		const bool acquireNonDroppableBuffer = mCore->mAllowExtraAcquire &&
		numAcquiredBuffers == mCore->mMaxAcquiredBufferCount + 1;
		if (numAcquiredBuffers >= mCore->mMaxAcquiredBufferCount + 1 &&
		!acquireNonDroppableBuffer) {
		BQ_LOGE("acquireBuffer: max acquired buffer count reached: %d (max %d)",
		numAcquiredBuffers, mCore->mMaxAcquiredBufferCount);
		return INVALID_OPERATION;
		@@ -254,6 +257,9 @@ status_t BufferQueueConsumer::acquireBuffer(BufferItem* outBuffer,
		outBuffer->mIsStale = false;
		outBuffer->mAutoRefresh = mCore->mSharedBufferMode &&
		mCore->mAutoRefresh;
		} else if (acquireNonDroppableBuffer && front->mIsDroppable) {
		BQ_LOGV("acquireBuffer: front buffer is not droppable");
		return NO_BUFFER_AVAILABLE;
		} else {
		slot = front->mSlot;
		outBuffer = front;
		@@ -824,4 +830,9 @@ status_t BufferQueueConsumer::dumpState(const String8& prefix, String8* outResul
		return NO_ERROR;
		}

		void BufferQueueConsumer::setAllowExtraAcquire(bool allow) {
		std::lock_guard<std::mutex> lock(mCore->mMutex);
		mCore->mAllowExtraAcquire = allow;
		}

		} // namespace android

libs/gui/include/gui/BLASTBufferQueue.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ private:
		Rect computeCrop(const BufferItem& item) REQUIRES(mMutex);
		// Return true if we need to reject the buffer based on the scaling mode and the buffer size.
		bool rejectBuffer(const BufferItem& item) REQUIRES(mMutex);
		bool maxBuffersAcquired() const REQUIRES(mMutex);
		bool maxBuffersAcquired(bool includeExtraAcquire) const REQUIRES(mMutex);

		std::string mName;
		sp<SurfaceControl> mSurfaceControl;

libs/gui/include/gui/BufferQueueConsumer.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -174,6 +174,10 @@ public:
		// Value used to determine if present time is valid.
		constexpr static int MAX_REASONABLE_NSEC = 1'000'000'000ULL; // 1 second

		// This allows the consumer to acquire an additional buffer if that buffer is not droppable and
		// will eventually be released or acquired by the consumer.
		void setAllowExtraAcquire(bool /* allow */);

		private:
		sp<BufferQueueCore> mCore;

libs/gui/include/gui/BufferQueueCore.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -354,6 +354,9 @@ private:
		// mTransformHintInUse is to cache the mTransformHint used by the producer.
		uint32_t mTransformHintInUse;

		// This allows the consumer to acquire an additional buffer if that buffer is not droppable and
		// will eventually be released or acquired by the consumer.
		bool mAllowExtraAcquire = false;
		}; // class BufferQueueCore

		} // namespace android