Merge "Send releaseCallbackId and releaseFence to correct listener" into sc-v2-dev (9ea0a767) · Commits · e / os / android_frameworks_native-old

libs/gui/LayerState.cpp

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -174,6 +174,7 @@ status_t layer_state_t::write(Parcel& output) const
	SAFE_PARCEL(output.write, destinationFrame);		SAFE_PARCEL(output.write, destinationFrame);
	SAFE_PARCEL(output.writeBool, isTrustedOverlay);		SAFE_PARCEL(output.writeBool, isTrustedOverlay);

			SAFE_PARCEL(output.writeStrongBinder, releaseBufferEndpoint);
	return NO_ERROR;		return NO_ERROR;
	}		}

	@@ -303,6 +304,7 @@ status_t layer_state_t::read(const Parcel& input)
	SAFE_PARCEL(input.read, destinationFrame);		SAFE_PARCEL(input.read, destinationFrame);
	SAFE_PARCEL(input.readBool, &isTrustedOverlay);		SAFE_PARCEL(input.readBool, &isTrustedOverlay);

			SAFE_PARCEL(input.readNullableStrongBinder, &releaseBufferEndpoint);
	return NO_ERROR;		return NO_ERROR;
	}		}

libs/gui/SurfaceComposerClient.cpp

+10 −1

Original line number	Original line	Diff line number	Diff line
	@@ -147,8 +147,16 @@ int64_t TransactionCompletedListener::getNextIdLocked() {
	return mCallbackIdCounter++;		return mCallbackIdCounter++;
	}		}

			sp<TransactionCompletedListener> TransactionCompletedListener::sInstance = nullptr;

			void TransactionCompletedListener::setInstance(const sp<TransactionCompletedListener>& listener) {
			sInstance = listener;
			}

	sp<TransactionCompletedListener> TransactionCompletedListener::getInstance() {		sp<TransactionCompletedListener> TransactionCompletedListener::getInstance() {
	static sp<TransactionCompletedListener> sInstance = new TransactionCompletedListener;		if (sInstance == nullptr) {
			sInstance = new TransactionCompletedListener;
			}
	return sInstance;		return sInstance;
	}		}

	@@ -1274,6 +1282,7 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setBuffe
	removeReleaseBufferCallback(s);		removeReleaseBufferCallback(s);
	s->what \|= layer_state_t::eBufferChanged;		s->what \|= layer_state_t::eBufferChanged;
	s->buffer = buffer;		s->buffer = buffer;
			s->releaseBufferEndpoint = IInterface::asBinder(TransactionCompletedListener::getIInstance());
	if (mIsAutoTimestamp) {		if (mIsAutoTimestamp) {
	mDesiredPresentTime = systemTime();		mDesiredPresentTime = systemTime();
	}		}

libs/gui/include/gui/LayerState.h

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -242,6 +242,11 @@ struct layer_state_t {
	// is used to remove the old callback from the client process map if it is		// is used to remove the old callback from the client process map if it is
	// overwritten by another setBuffer call.		// overwritten by another setBuffer call.
	ReleaseCallbackId releaseCallbackId;		ReleaseCallbackId releaseCallbackId;

			// Stores which endpoint the release information should be sent to. We don't want to send the
			// releaseCallbackId and release fence to all listeners so we store which listener the setBuffer
			// was called with.
			sp<IBinder> releaseBufferEndpoint;
	};		};

	struct ComposerState {		struct ComposerState {

libs/gui/include/gui/SurfaceComposerClient.h

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -655,8 +655,10 @@ public:
	};		};

	class TransactionCompletedListener : public BnTransactionCompletedListener {		class TransactionCompletedListener : public BnTransactionCompletedListener {
			public:
	TransactionCompletedListener();		TransactionCompletedListener();

			protected:
	int64_t getNextIdLocked() REQUIRES(mMutex);		int64_t getNextIdLocked() REQUIRES(mMutex);

	std::mutex mMutex;		std::mutex mMutex;
	@@ -734,8 +736,12 @@ public:
	void onReleaseBuffer(ReleaseCallbackId, sp<Fence> releaseFence, uint32_t transformHint,		void onReleaseBuffer(ReleaseCallbackId, sp<Fence> releaseFence, uint32_t transformHint,
	uint32_t currentMaxAcquiredBufferCount) override;		uint32_t currentMaxAcquiredBufferCount) override;

			// For Testing Only
			static void setInstance(const sp<TransactionCompletedListener>&);

	private:		private:
	ReleaseBufferCallback popReleaseBufferCallbackLocked(const ReleaseCallbackId&);		ReleaseBufferCallback popReleaseBufferCallbackLocked(const ReleaseCallbackId&);
			static sp<TransactionCompletedListener> sInstance;
	};		};

	} // namespace android		} // namespace android

services/surfaceflinger/BufferStateLayer.cpp

+7 −9

Original line number	Original line	Diff line number	Diff line
	@@ -158,7 +158,8 @@ void BufferStateLayer::onLayerDisplayed(const sp<Fence>& releaseFence) {
	// transaction doesn't need a previous release fence.		// transaction doesn't need a previous release fence.
	sp<CallbackHandle> ch;		sp<CallbackHandle> ch;
	for (auto& handle : mDrawingState.callbackHandles) {		for (auto& handle : mDrawingState.callbackHandles) {
	if (handle->releasePreviousBuffer) {		if (handle->releasePreviousBuffer &&
			mDrawingState.releaseBufferEndpoint == handle->listener) {
	ch = handle;		ch = handle;
	break;		break;
	}		}
	@@ -199,14 +200,9 @@ void BufferStateLayer::releasePendingBuffer(nsecs_t dequeueReadyTime) {
	mFlinger->getMaxAcquiredBufferCountForCurrentRefreshRate(mOwnerUid);		mFlinger->getMaxAcquiredBufferCountForCurrentRefreshRate(mOwnerUid);
	}		}

	// If there are multiple transactions in this frame, set the previous id on the earliest
	// transacton. We don't need to pass in the released buffer id to multiple transactions.
	// The buffer id does not have to correspond to any particular transaction as long as the
	// listening end point is the same but the client expects the first transaction callback that
	// replaces the presented buffer to contain the release fence. This follows the same logic.
	// see BufferStateLayer::onLayerDisplayed.
	for (auto& handle : mDrawingState.callbackHandles) {		for (auto& handle : mDrawingState.callbackHandles) {
	if (handle->releasePreviousBuffer) {		if (handle->releasePreviousBuffer &&
			mDrawingState.releaseBufferEndpoint == handle->listener) {
	handle->previousReleaseCallbackId = mPreviousReleaseCallbackId;		handle->previousReleaseCallbackId = mPreviousReleaseCallbackId;
	break;		break;
	}		}
	@@ -420,7 +416,8 @@ bool BufferStateLayer::setBuffer(const std::shared_ptr<renderengine::ExternalTex
	nsecs_t desiredPresentTime, bool isAutoTimestamp,		nsecs_t desiredPresentTime, bool isAutoTimestamp,
	const client_cache_t& clientCacheId, uint64_t frameNumber,		const client_cache_t& clientCacheId, uint64_t frameNumber,
	std::optional<nsecs_t> dequeueTime, const FrameTimelineInfo& info,		std::optional<nsecs_t> dequeueTime, const FrameTimelineInfo& info,
	const sp<ITransactionCompletedListener>& releaseBufferListener) {		const sp<ITransactionCompletedListener>& releaseBufferListener,
			const sp<IBinder>& releaseBufferEndpoint) {
	ATRACE_CALL();		ATRACE_CALL();

	if (mDrawingState.buffer) {		if (mDrawingState.buffer) {
	@@ -485,6 +482,7 @@ bool BufferStateLayer::setBuffer(const std::shared_ptr<renderengine::ExternalTex

	mDrawingState.width = mDrawingState.buffer->getBuffer()->getWidth();		mDrawingState.width = mDrawingState.buffer->getBuffer()->getWidth();
	mDrawingState.height = mDrawingState.buffer->getBuffer()->getHeight();		mDrawingState.height = mDrawingState.buffer->getBuffer()->getHeight();
			mDrawingState.releaseBufferEndpoint = releaseBufferEndpoint;

	return true;		return true;
	}		}