Merge "Only process passback transactions during onFrameAvailable" (336e2712) · Commits · e / os / android_frameworks_native

libs/gui/BLASTBufferQueue.cpp

+9 −2

Original line number	Diff line number	Diff line
		@@ -174,7 +174,9 @@ void BLASTBufferQueue::transactionCallback(nsecs_t /latchTime/, const sp<Fence
		}
		mPendingReleaseItem.item = std::move(mSubmitted.front());
		mSubmitted.pop();
		if (mNextTransaction == nullptr) {
		processNextBufferLocked();
		}
		mCallbackCV.notify_all();
		decStrong((void*)transactionCallbackThunk);
		}
		@@ -252,8 +254,13 @@ Rect BLASTBufferQueue::computeCrop(const BufferItem& item) {

		void BLASTBufferQueue::onFrameAvailable(const BufferItem& /item/) {
		ATRACE_CALL();
		std::lock_guard _lock{mMutex};
		std::unique_lock _lock{mMutex};

		if (mNextTransaction != nullptr) {
		while (mNumFrameAvailable > 0 \|\| mNumAcquired == MAX_ACQUIRED_BUFFERS) {
		mCallbackCV.wait(_lock);
		}
		}
		// add to shadow queue
		mNumFrameAvailable++;
		processNextBufferLocked();