Merge "Fix for FWR SF crash" (633f509c) · Commits · e / os / android_frameworks_native

services/surfaceflinger/BufferQueueLayer.cpp

+15 −10

Original line number	Diff line number	Diff line
		@@ -125,11 +125,11 @@ bool BufferQueueLayer::isBufferDue(nsecs_t expectedPresentTime) const {
		// -----------------------------------------------------------------------

		bool BufferQueueLayer::fenceHasSignaled() const {
		Mutex::Autolock lock(mQueueItemLock);
		if (!hasFrameUpdate()) {
		return true;
		}

		Mutex::Autolock lock(mQueueItemLock);
		if (mQueueItems[0].item.mIsDroppable) {
		// Even though this buffer's fence may not have signaled yet, it could
		// be replaced by another buffer before it has a chance to, which means
		@@ -148,11 +148,12 @@ bool BufferQueueLayer::fenceHasSignaled() const {
		}

		bool BufferQueueLayer::framePresentTimeIsCurrent(nsecs_t expectedPresentTime) const {
		Mutex::Autolock lock(mQueueItemLock);

		if (!hasFrameUpdate() \|\| isRemovedFromCurrentState()) {
		return true;
		}

		Mutex::Autolock lock(mQueueItemLock);
		return mQueueItems[0].item.mTimestamp <= expectedPresentTime;
		}

		@@ -264,6 +265,7 @@ status_t BufferQueueLayer::updateTexImage(bool& recomputeVisibleRegions, nsecs_t
		// and return early
		if (queuedBuffer) {
		Mutex::Autolock lock(mQueueItemLock);
		if (mQueuedFrames > 0) {
		mConsumer->mergeSurfaceDamage(mQueueItems[0].item.mSurfaceDamage);
		mFlinger->mTimeStats->removeTimeRecord(layerId, mQueueItems[0].item.mFrameNumber);
		if (mQueueItems[0].surfaceFrame) {
		@@ -272,6 +274,7 @@ status_t BufferQueueLayer::updateTexImage(bool& recomputeVisibleRegions, nsecs_t
		mQueueItems.erase(mQueueItems.begin());
		mQueuedFrames--;
		}
		}
		return BAD_VALUE;
		} else if (updateResult != NO_ERROR \|\| mUpdateTexImageFailed) {
		// This can occur if something goes wrong when trying to create the
		@@ -300,6 +303,7 @@ status_t BufferQueueLayer::updateTexImage(bool& recomputeVisibleRegions, nsecs_t
		return BAD_VALUE;
		}

		bool more_frames_pending = false;
		if (queuedBuffer) {
		// Autolock scope
		auto currentFrameNumber = mConsumer->getFrameNumber();
		@@ -308,7 +312,7 @@ status_t BufferQueueLayer::updateTexImage(bool& recomputeVisibleRegions, nsecs_t

		// Remove any stale buffers that have been dropped during
		// updateTexImage
		while (mQueueItems[0].item.mFrameNumber != currentFrameNumber) {
		while (mQueuedFrames > 0 && mQueueItems[0].item.mFrameNumber != currentFrameNumber) {
		mConsumer->mergeSurfaceDamage(mQueueItems[0].item.mSurfaceDamage);
		mFlinger->mTimeStats->removeTimeRecord(layerId, mQueueItems[0].item.mFrameNumber);
		if (mQueueItems[0].surfaceFrame) {
		@@ -329,11 +333,12 @@ status_t BufferQueueLayer::updateTexImage(bool& recomputeVisibleRegions, nsecs_t
		latchTime);
		}
		mQueueItems.erase(mQueueItems.begin());
		more_frames_pending = (mQueuedFrames.fetch_sub(1) > 1);
		}

		// Decrement the queued-frames count. Signal another event if we
		// have more frames pending.
		if ((queuedBuffer && mQueuedFrames.fetch_sub(1) > 1) \|\| mAutoRefresh) {
		if ((queuedBuffer && more_frames_pending) \|\| mAutoRefresh) {
		mFlinger->signalLayerUpdate();
		}