Merge "Don't update BufferQueue FrameEventStats when a frame is dropped" into sc-dev (831bb8e4) · Commits · e / os / android_frameworks_native

libs/gui/BLASTBufferQueue.cpp

+12 −9

Original line number	Diff line number	Diff line
		@@ -259,6 +259,9 @@ void BLASTBufferQueue::transactionCallback(nsecs_t /latchTime/, const sp<Fence

		mTransformHint = stat.transformHint;
		mBufferItemConsumer->setTransformHint(mTransformHint);
		// Update frametime stamps if the frame was latched and presented, indicated by a
		// valid latch time.
		if (stat.latchTime > 0) {
		mBufferItemConsumer
		->updateFrameTimestamps(stat.frameEventStats.frameNumber,
		stat.frameEventStats.refreshStartTime,
		@@ -267,7 +270,7 @@ void BLASTBufferQueue::transactionCallback(nsecs_t /latchTime/, const sp<Fence
		stat.frameEventStats.compositorTiming,
		stat.latchTime,
		stat.frameEventStats.dequeueReadyTime);

		}
		currFrameNumber = stat.frameEventStats.frameNumber;

		if (mTransactionCompleteCallback &&

libs/gui/tests/BLASTBufferQueue_test.cpp

+49 −15

Original line number	Diff line number	Diff line
		@@ -948,21 +948,22 @@ TEST_F(BLASTBufferQueueTransformTest, setTransform_ROT_270) {
		class BLASTFrameEventHistoryTest : public BLASTBufferQueueTest {
		public:
		void setUpAndQueueBuffer(const sp<IGraphicBufferProducer>& igbProducer,
		nsecs_t* requestedPresentTime, nsecs_t* postedTime,
		nsecs_t* outRequestedPresentTime, nsecs_t* postedTime,
		IGraphicBufferProducer::QueueBufferOutput* qbOutput,
		bool getFrameTimestamps, nsecs_t requestedPresentTimeDelay = 0) {
		bool getFrameTimestamps, nsecs_t requestedPresentTime = systemTime()) {
		int slot;
		sp<Fence> fence;
		sp<GraphicBuffer> buf;
		auto ret = igbProducer->dequeueBuffer(&slot, &fence, mDisplayWidth, mDisplayHeight,
		PIXEL_FORMAT_RGBA_8888, GRALLOC_USAGE_SW_WRITE_OFTEN,
		nullptr, nullptr);
		ASSERT_EQ(IGraphicBufferProducer::BUFFER_NEEDS_REALLOCATION, ret);
		if (IGraphicBufferProducer::BUFFER_NEEDS_REALLOCATION == ret) {
		ASSERT_EQ(OK, igbProducer->requestBuffer(slot, &buf));
		}

		nsecs_t requestedTime = systemTime() + requestedPresentTimeDelay;
		if (requestedPresentTime) *requestedPresentTime = requestedTime;
		IGraphicBufferProducer::QueueBufferInput input(requestedTime, false, HAL_DATASPACE_UNKNOWN,
		*outRequestedPresentTime = requestedPresentTime;
		IGraphicBufferProducer::QueueBufferInput input(requestedPresentTime, false,
		HAL_DATASPACE_UNKNOWN,
		Rect(mDisplayWidth, mDisplayHeight),
		NATIVE_WINDOW_SCALING_MODE_FREEZE, 0,
		Fence::NO_FENCE, /sticky/ 0,
		@@ -1034,9 +1035,11 @@ TEST_F(BLASTFrameEventHistoryTest, FrameEventHistory_DroppedFrame) {
		IGraphicBufferProducer::QueueBufferOutput qbOutput;
		nsecs_t requestedPresentTimeA = 0;
		nsecs_t postedTimeA = 0;
		nsecs_t presentTimeDelay = std::chrono::nanoseconds(500ms).count();
		// Present the frame sometime in the future so we can add two frames to the queue so the older
		// one will be dropped.
		nsecs_t presentTime = systemTime() + std::chrono::nanoseconds(500ms).count();
		setUpAndQueueBuffer(igbProducer, &requestedPresentTimeA, &postedTimeA, &qbOutput, true,
		presentTimeDelay);
		presentTime);
		history.applyDelta(qbOutput.frameTimestamps);

		FrameEvents* events = nullptr;
		@@ -1049,7 +1052,10 @@ TEST_F(BLASTFrameEventHistoryTest, FrameEventHistory_DroppedFrame) {
		// queue another buffer so the first can be dropped
		nsecs_t requestedPresentTimeB = 0;
		nsecs_t postedTimeB = 0;
		setUpAndQueueBuffer(igbProducer, &requestedPresentTimeB, &postedTimeB, &qbOutput, true);
		adapter.setTransactionCompleteCallback(2);
		presentTime = systemTime() + std::chrono::nanoseconds(1ms).count();
		setUpAndQueueBuffer(igbProducer, &requestedPresentTimeB, &postedTimeB, &qbOutput, true,
		presentTime);
		history.applyDelta(qbOutput.frameTimestamps);
		events = history.getFrame(1);
		ASSERT_NE(nullptr, events);
		@@ -1059,20 +1065,48 @@ TEST_F(BLASTFrameEventHistoryTest, FrameEventHistory_DroppedFrame) {
		ASSERT_EQ(requestedPresentTimeA, events->requestedPresentTime);
		ASSERT_GE(events->postedTime, postedTimeA);

		// a valid latchtime should not be set
		// a valid latchtime and pre and post composition info should not be set for the dropped frame
		ASSERT_FALSE(events->hasLatchInfo());
		ASSERT_FALSE(events->hasDequeueReadyInfo());
		ASSERT_FALSE(events->hasGpuCompositionDoneInfo());
		ASSERT_FALSE(events->hasDisplayPresentInfo());
		ASSERT_FALSE(events->hasReleaseInfo());

		ASSERT_NE(nullptr, events->gpuCompositionDoneFence);
		ASSERT_NE(nullptr, events->displayPresentFence);
		ASSERT_NE(nullptr, events->releaseFence);
		// wait for the last transaction to be completed.
		adapter.waitForCallback(2);

		// we should also have gotten the initial values for the next frame
		// queue another buffer so we query for frame event deltas
		nsecs_t requestedPresentTimeC = 0;
		nsecs_t postedTimeC = 0;
		setUpAndQueueBuffer(igbProducer, &requestedPresentTimeC, &postedTimeC, &qbOutput, true);
		history.applyDelta(qbOutput.frameTimestamps);

		// frame number, requestedPresentTime, and postTime should not have changed
		ASSERT_EQ(1, events->frameNumber);
		ASSERT_EQ(requestedPresentTimeA, events->requestedPresentTime);
		ASSERT_GE(events->postedTime, postedTimeA);

		// a valid latchtime and pre and post composition info should not be set for the dropped frame
		ASSERT_FALSE(events->hasLatchInfo());
		ASSERT_FALSE(events->hasDequeueReadyInfo());
		ASSERT_FALSE(events->hasGpuCompositionDoneInfo());
		ASSERT_FALSE(events->hasDisplayPresentInfo());
		ASSERT_FALSE(events->hasReleaseInfo());

		// we should also have gotten values for the presented frame
		events = history.getFrame(2);
		ASSERT_NE(nullptr, events);
		ASSERT_EQ(2, events->frameNumber);
		ASSERT_EQ(requestedPresentTimeB, events->requestedPresentTime);
		ASSERT_GE(events->postedTime, postedTimeB);
		ASSERT_GE(events->latchTime, postedTimeB);
		ASSERT_GE(events->dequeueReadyTime, events->latchTime);
		ASSERT_NE(nullptr, events->gpuCompositionDoneFence);
		ASSERT_NE(nullptr, events->displayPresentFence);
		ASSERT_NE(nullptr, events->releaseFence);

		// wait for any callbacks that have not been received
		adapter.waitForCallbacks();
		}

		} // namespace android