Split VsyncEventData from DisplayEventDispatcher. (18c3437b) · Commits · e / os / platform_frameworks_native

libs/gui/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -198,6 +198,7 @@ cc_library_shared {
		"SurfaceComposerClient.cpp",
		"SyncFeatures.cpp",
		"TransactionTracing.cpp",
		"VsyncEventData.cpp",
		"view/Surface.cpp",
		"WindowInfosListenerReporter.cpp",
		"bufferqueue/1.0/B2HProducerListener.cpp",

libs/gui/DisplayEventDispatcher.cpp

+5 −6

Original line number	Diff line number	Diff line
		@@ -148,14 +148,13 @@ int DisplayEventDispatcher::handleEvent(int, int events, void*) {

		void DisplayEventDispatcher::populateFrameTimelines(const DisplayEventReceiver::Event& event,
		VsyncEventData* outVsyncEventData) const {
		for (size_t i = 0; i < DisplayEventReceiver::kFrameTimelinesLength; i++) {
		for (size_t i = 0; i < VsyncEventData::kFrameTimelinesLength; i++) {
		DisplayEventReceiver::Event::VSync::FrameTimeline receiverTimeline =
		event.vsync.frameTimelines[i];
		outVsyncEventData->frameTimelines[i] = {.id = receiverTimeline.vsyncId,
		.deadlineTimestamp =
		outVsyncEventData->frameTimelines[i] =
		VsyncEventData::FrameTimeline(receiverTimeline.vsyncId,
		receiverTimeline.deadlineTimestamp,
		.expectedPresentTime =
		receiverTimeline.expectedVSyncTimestamp};
		receiverTimeline.expectedVSyncTimestamp);
		}
		}

libs/gui/VsyncEventData.cpp

0 → 100644

+76 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include "gui/VsyncEventData.h"
		#include <gui/DisplayEventReceiver.h>
		#include <private/gui/ParcelUtils.h>
		#include <utils/Log.h>
		#include <utils/Looper.h>
		#include <cstdint>

		namespace android::gui {

		status_t VsyncEventData::readFromParcel(const Parcel* parcel) {
		if (parcel == nullptr) {
		ALOGE("%s: Null parcel", __func__);
		return BAD_VALUE;
		}

		SAFE_PARCEL(parcel->readInt64, &id)
		SAFE_PARCEL(parcel->readInt64, &deadlineTimestamp);
		SAFE_PARCEL(parcel->readInt64, &frameInterval);

		uint64_t uintPreferredFrameTimelineIndex;
		SAFE_PARCEL(parcel->readUint64, &uintPreferredFrameTimelineIndex);
		preferredFrameTimelineIndex = static_cast<size_t>(uintPreferredFrameTimelineIndex);

		std::vector<FrameTimeline> timelines;
		SAFE_PARCEL(parcel->readParcelableVector, &timelines);
		std::copy_n(timelines.begin(), timelines.size(), frameTimelines.begin());

		return OK;
		}
		status_t VsyncEventData::writeToParcel(Parcel* parcel) const {
		SAFE_PARCEL(parcel->writeInt64, id)
		SAFE_PARCEL(parcel->writeInt64, deadlineTimestamp);
		SAFE_PARCEL(parcel->writeInt64, frameInterval);
		SAFE_PARCEL(parcel->writeUint64, preferredFrameTimelineIndex);
		SAFE_PARCEL(parcel->writeParcelableVector,
		std::vector(frameTimelines.begin(), frameTimelines.end()));

		return OK;
		}
		status_t VsyncEventData::FrameTimeline::readFromParcel(const Parcel* parcel) {
		if (parcel == nullptr) {
		ALOGE("%s: Null parcel", __func__);
		return BAD_VALUE;
		}

		SAFE_PARCEL(parcel->readInt64, &id)
		SAFE_PARCEL(parcel->readInt64, &deadlineTimestamp);
		SAFE_PARCEL(parcel->readInt64, &expectedPresentTime);

		return OK;
		}
		status_t VsyncEventData::FrameTimeline::writeToParcel(Parcel* parcel) const {
		SAFE_PARCEL(parcel->writeInt64, id);
		SAFE_PARCEL(parcel->writeInt64, deadlineTimestamp);
		SAFE_PARCEL(parcel->writeInt64, expectedPresentTime);

		return OK;
		}

		}; // namespace android::gui

libs/gui/include/gui/DisplayEventDispatcher.h

+0 −35

Original line number	Diff line number	Diff line
		@@ -17,45 +17,10 @@
		#include <gui/DisplayEventReceiver.h>
		#include <utils/Log.h>
		#include <utils/Looper.h>
		#include <array>

		namespace android {
		using FrameRateOverride = DisplayEventReceiver::Event::FrameRateOverride;

		struct VsyncEventData {
		// The Vsync Id corresponsing to this vsync event. This will be used to
		// populate ISurfaceComposer::setFrameTimelineVsync and
		// SurfaceComposerClient::setFrameTimelineVsync
		int64_t id = FrameTimelineInfo::INVALID_VSYNC_ID;

		// The deadline in CLOCK_MONOTONIC that the app needs to complete its
		// frame by (both on the CPU and the GPU)
		int64_t deadlineTimestamp = std::numeric_limits<int64_t>::max();

		// The current frame interval in ns when this frame was scheduled.
		int64_t frameInterval = 0;

		struct FrameTimeline {
		// The Vsync Id corresponsing to this vsync event. This will be used to
		// populate ISurfaceComposer::setFrameTimelineVsync and
		// SurfaceComposerClient::setFrameTimelineVsync
		int64_t id = FrameTimelineInfo::INVALID_VSYNC_ID;

		// The deadline in CLOCK_MONOTONIC that the app needs to complete its
		// frame by (both on the CPU and the GPU)
		int64_t deadlineTimestamp = std::numeric_limits<int64_t>::max();

		// The anticipated Vsync present time.
		int64_t expectedPresentTime = 0;
		};

		// Sorted possible frame timelines.
		std::array<FrameTimeline, DisplayEventReceiver::kFrameTimelinesLength> frameTimelines;

		// Index into the frameTimelines that represents the platform's preferred frame timeline.
		size_t preferredFrameTimelineIndex = std::numeric_limits<size_t>::max();
		};

		class DisplayEventDispatcher : public LooperCallback {
		public:
		explicit DisplayEventDispatcher(

libs/gui/include/gui/DisplayEventReceiver.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@

		#include <binder/IInterface.h>
		#include <gui/ISurfaceComposer.h>
		#include <gui/VsyncEventData.h>

		// ----------------------------------------------------------------------------

		@@ -34,6 +35,7 @@ namespace android {
		// ----------------------------------------------------------------------------

		using gui::IDisplayEventConnection;
		using gui::VsyncEventData;

		namespace gui {
		class BitTube;
		@@ -49,8 +51,6 @@ static inline constexpr uint32_t fourcc(char c1, char c2, char c3, char c4) {
		// ----------------------------------------------------------------------------
		class DisplayEventReceiver {
		public:
		// Max amount of frame timelines is arbitrarily set to be reasonable.
		static constexpr int64_t kFrameTimelinesLength = 7;

		enum {
		DISPLAY_EVENT_VSYNC = fourcc('v', 's', 'y', 'n'),
		@@ -85,7 +85,7 @@ public:
		nsecs_t expectedVSyncTimestamp __attribute__((aligned(8)));
		nsecs_t deadlineTimestamp __attribute__((aligned(8)));
		int64_t vsyncId;
		} frameTimelines[kFrameTimelinesLength];
		} frameTimelines[VsyncEventData::kFrameTimelinesLength];
		};

		struct Hotplug {