Merge "Change the position of addAndGetFrameTimestamps when queueBuffer" into android10-tests-dev (7eca3198) · Commits · e / os / platform_frameworks_native

libs/gui/BufferQueueProducer.cpp

+11 −11

Original line number	Diff line number	Diff line
		@@ -972,6 +972,17 @@ status_t BufferQueueProducer::queueBuffer(int slot,
		item.mGraphicBuffer.clear();
		}

		// Update and get FrameEventHistory.
		nsecs_t postedTime = systemTime(SYSTEM_TIME_MONOTONIC);
		NewFrameEventsEntry newFrameEventsEntry = {
		currentFrameNumber,
		postedTime,
		requestedPresentTimestamp,
		std::move(acquireFenceTime)
		};
		addAndGetFrameTimestamps(&newFrameEventsEntry,
		getFrameTimestamps ? &output->frameTimestamps : nullptr);

		// Call back without the main BufferQueue lock held, but with the callback
		// lock held so we can ensure that callbacks occur in order

		@@ -1001,17 +1012,6 @@ status_t BufferQueueProducer::queueBuffer(int slot,
		mCallbackCondition.notify_all();
		}

		// Update and get FrameEventHistory.
		nsecs_t postedTime = systemTime(SYSTEM_TIME_MONOTONIC);
		NewFrameEventsEntry newFrameEventsEntry = {
		currentFrameNumber,
		postedTime,
		requestedPresentTimestamp,
		std::move(acquireFenceTime)
		};
		addAndGetFrameTimestamps(&newFrameEventsEntry,
		getFrameTimestamps ? &output->frameTimestamps : nullptr);

		// Wait without lock held
		if (connectedApi == NATIVE_WINDOW_API_EGL) {
		// Waiting here allows for two full buffers to be queued but not a