Merge "Change the position of addAndGetFrameTimestamps when queueBuffer" am:... (03e9895b) · Commits · e / os / android_frameworks_native-old

libs/gui/BufferQueueProducer.cpp

+11 −11

Original line number	Original line	Diff line number	Diff line
	@@ -981,6 +981,17 @@ status_t BufferQueueProducer::queueBuffer(int slot,
	item.mGraphicBuffer.clear();		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		// Call back without the main BufferQueue lock held, but with the callback
	// lock held so we can ensure that callbacks occur in order		// lock held so we can ensure that callbacks occur in order

	@@ -1010,17 +1021,6 @@ status_t BufferQueueProducer::queueBuffer(int slot,
	mCallbackCondition.notify_all();		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		// Wait without lock held
	if (connectedApi == NATIVE_WINDOW_API_EGL) {		if (connectedApi == NATIVE_WINDOW_API_EGL) {
	// Waiting here allows for two full buffers to be queued but not a		// Waiting here allows for two full buffers to be queued but not a