Snap for 12727401 from 9a3ad9bdc5a31fb030af1ac00cf8001f74a5fd94 to 25Q1-release (c333e856) · Commits · e / os / android_frameworks_native

include/android/performance_hint.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -152,6 +152,9 @@ typedef struct ASessionCreationConfig ASessionCreationConfig;
		*/
		typedef struct APerformanceHintSession APerformanceHintSession;

		typedef struct ANativeWindow ANativeWindow;
		typedef struct ASurfaceControl ASurfaceControl;

		/**
		* Acquire an instance of the performance hint manager.
		*

include/android/surface_control.h

+0 −63

Original line number	Diff line number	Diff line
		@@ -780,69 +780,6 @@ void ASurfaceTransaction_setFrameRateWithChangeStrategy(ASurfaceTransaction* _No
		int8_t changeFrameRateStrategy)
		__INTRODUCED_IN(31);

		/**
		* Sets the intended frame rate for the given \a surface_control.
		*
		* On devices that are capable of running the display at different frame rates,
		* the system may choose a display refresh rate to better match this surface's frame
		* rate. Usage of this API won't introduce frame rate throttling, or affect other
		* aspects of the application's frame production pipeline. However, because the system
		* may change the display refresh rate, calls to this function may result in changes
		* to Choreographer callback timings, and changes to the time interval at which the
		* system releases buffers back to the application.
		*
		* You can register for changes in the refresh rate using
		* \a AChoreographer_registerRefreshRateCallback.
		*
		* See ASurfaceTransaction_clearFrameRate().
		*
		* Available since API level 36.
		*
		* \param desiredMinRate The desired minimum frame rate (inclusive) for the surface, specifying that
		* the surface prefers the device render rate to be at least `desiredMinRate`.
		*
		* <p>Set `desiredMinRate` = `desiredMaxRate` to indicate the surface prefers an exact frame rate.
		*
		* <p>Set `desiredMinRate` = 0 to indicate the surface has no preference
		* and any frame rate is acceptable.
		*
		* <p>The value should be greater than or equal to 0.
		*
		* \param desiredMaxRate The desired maximum frame rate (inclusive) for the surface, specifying that
		* the surface prefers the device render rate to be at most `desiredMaxRate`.
		*
		* <p>Set `desiredMaxRate` = `desiredMinRate` to indicate the surface prefers an exact frame rate.
		*
		* <p>Set `desiredMaxRate` = positive infinity to indicate the surface has no preference
		* and any frame rate is acceptable.
		*
		* <p>The value should be greater than or equal to `desiredMinRate`.
		*
		* \param fixedSourceRate The "fixed source" frame rate of the surface if the content has an
		* inherently fixed frame rate, e.g. a video that has a specific frame rate.
		*
		* <p>When the frame rate chosen for the surface is the `fixedSourceRate` or a
		* multiple, the surface can render without frame pulldown, for optimal smoothness. For
		* example, a 30 fps video (`fixedSourceRate`=30) renders just as smoothly on 30 fps,
		* 60 fps, 90 fps, 120 fps, and so on.
		*
		* <p>Setting the fixed source rate can also be used together with a desired
		* frame rate min and max via setting `desiredMinRate` and `desiredMaxRate`. This still
		* means the surface's content has a fixed frame rate of `fixedSourceRate`, but additionally
		* specifies the preference to be in the range [`desiredMinRate`, `desiredMaxRate`]. For example, an
		* app might want to specify there is 30 fps video (`fixedSourceRate`=30) as well as a smooth
		* animation on the same surface which looks good when drawing within a frame rate range such as
		* [`desiredMinRate`, `desiredMaxRate`] = [60,120].
		*
		* \param changeFrameRateStrategy Whether display refresh rate transitions caused by this surface
		* should be seamless. A seamless transition is one that doesn't have any visual interruptions, such
		* as a black screen for a second or two.
		*/
		void ASurfaceTransaction_setFrameRateParams(
		ASurfaceTransaction* _Nonnull transaction, ASurfaceControl* _Nonnull surface_control,
		float desiredMinRate, float desiredMaxRate, float fixedSourceRate,
		ANativeWindow_ChangeFrameRateStrategy changeFrameRateStrategy) __INTRODUCED_IN(36);

		/**
		* Clears the frame rate which is set for \a surface_control.
		*

libs/nativewindow/ANativeWindow.cpp

+0 −10

Original line number	Diff line number	Diff line
		@@ -265,16 +265,6 @@ int32_t ANativeWindow_setFrameRateWithChangeStrategy(ANativeWindow* window, floa
		return native_window_set_frame_rate(window, frameRate, compatibility, changeFrameRateStrategy);
		}

		int32_t ANativeWindow_setFrameRateParams(
		ANativeWindow* window, float desiredMinRate, float desiredMaxRate, float fixedSourceRate,
		ANativeWindow_ChangeFrameRateStrategy changeFrameRateStrategy) {
		if (!window \|\| !query(window, NATIVE_WINDOW_IS_VALID)) {
		return -EINVAL;
		}
		return native_window_set_frame_rate_params(window, desiredMinRate, desiredMaxRate,
		fixedSourceRate, changeFrameRateStrategy);
		}

		/**************************************************************************************************
		* vndk-stable
		**************************************************************************************************/

libs/nativewindow/include/android/native_window.h

+3 −73

Original line number	Diff line number	Diff line
		@@ -33,8 +33,8 @@
		#ifndef ANDROID_NATIVE_WINDOW_H
		#define ANDROID_NATIVE_WINDOW_H

		#include <stdbool.h>
		#include <stdint.h>
		#include <stdbool.h>
		#include <sys/cdefs.h>

		#include <android/data_space.h>
		@@ -282,7 +282,7 @@ int32_t ANativeWindow_setFrameRate(ANativeWindow* window, float frameRate, int8_
		void ANativeWindow_tryAllocateBuffers(ANativeWindow* window) __INTRODUCED_IN(30);

		/** Change frame rate strategy value for ANativeWindow_setFrameRate. */
		typedef enum ANativeWindow_ChangeFrameRateStrategy : int8_t {
		enum ANativeWindow_ChangeFrameRateStrategy {
		/**
		* Change the frame rate only if the transition is going to be seamless.
		*/
		@@ -292,7 +292,7 @@ typedef enum ANativeWindow_ChangeFrameRateStrategy : int8_t {
		* i.e. with visual interruptions for the user.
		*/
		ANATIVEWINDOW_CHANGE_FRAME_RATE_ALWAYS = 1
		} ANativeWindow_ChangeFrameRateStrategy __INTRODUCED_IN(31);
		} __INTRODUCED_IN(31);

		/**
		* Sets the intended frame rate for this window.
		@@ -344,76 +344,6 @@ int32_t ANativeWindow_setFrameRateWithChangeStrategy(ANativeWindow* window, floa
		int8_t compatibility, int8_t changeFrameRateStrategy)
		__INTRODUCED_IN(31);

		/**
		* Sets the intended frame rate for this window.
		*
		* On devices that are capable of running the display at different frame rates,
		* the system may choose a display refresh rate to better match this surface's frame
		* rate. Usage of this API won't introduce frame rate throttling, or affect other
		* aspects of the application's frame production pipeline. However, because the system
		* may change the display refresh rate, calls to this function may result in changes
		* to Choreographer callback timings, and changes to the time interval at which the
		* system releases buffers back to the application.
		*
		* Note that this only has an effect for surfaces presented on the display. If this
		* surface is consumed by something other than the system compositor, e.g. a media
		* codec, this call has no effect.
		*
		* You can register for changes in the refresh rate using
		* \a AChoreographer_registerRefreshRateCallback.
		*
		* See ANativeWindow_clearFrameRate().
		*
		* Available since API level 36.
		*
		* \param window pointer to an ANativeWindow object.
		*
		* \param desiredMinRate The desired minimum frame rate (inclusive) for the window, specifying that
		* the surface prefers the device render rate to be at least `desiredMinRate`.
		*
		* <p>Set `desiredMinRate` = `desiredMaxRate` to indicate the surface prefers an exact frame rate.
		*
		* <p>Set `desiredMinRate` = 0 to indicate the window has no preference
		* and any frame rate is acceptable.
		*
		* <p>The value should be greater than or equal to 0.
		*
		* \param desiredMaxRate The desired maximum frame rate (inclusive) for the window, specifying that
		* the surface prefers the device render rate to be at most `desiredMaxRate`.
		*
		* <p>Set `desiredMaxRate` = `desiredMinRate` to indicate the surface prefers an exact frame rate.
		*
		* <p>Set `desiredMaxRate` = positive infinity to indicate the window has no preference
		* and any frame rate is acceptable.
		*
		* <p>The value should be greater than or equal to `desiredMinRate`.
		*
		* \param fixedSourceRate The "fixed source" frame rate of the window if the content has an
		* inherently fixed frame rate, e.g. a video that has a specific frame rate.
		*
		* <p>When the frame rate chosen for the surface is the `fixedSourceRate` or a
		* multiple, the surface can render without frame pulldown, for optimal smoothness. For
		* example, a 30 fps video (`fixedSourceRate`=30) renders just as smoothly on 30 fps,
		* 60 fps, 90 fps, 120 fps, and so on.
		*
		* <p>Setting the fixed source rate can also be used together with a desired
		* frame rate min and max via setting `desiredMinRate` and `desiredMaxRate`. This still
		* means the window's content has a fixed frame rate of `fixedSourceRate`, but additionally
		* specifies the preference to be in the range [`desiredMinRate`, `desiredMaxRate`]. For example, an
		* app might want to specify there is 30 fps video (`fixedSourceRate`=30) as well as a smooth
		* animation on the same window which looks good when drawing within a frame rate range such as
		* [`desiredMinRate`, `desiredMaxRate`] = [60,120].
		*
		* \param changeFrameRateStrategy Whether display refresh rate transitions caused by this surface
		* should be seamless. A seamless transition is one that doesn't have any visual interruptions, such
		* as a black screen for a second or two.
		*
		* \return 0 for success, -EINVAL if the arguments are invalid.
		*/
		int32_t ANativeWindow_setFrameRateParams(
		ANativeWindow* window, float desiredMinRate, float desiredMaxRate, float fixedSourceRate,
		ANativeWindow_ChangeFrameRateStrategy changeFrameRateStrategy) __INTRODUCED_IN(36);

		/**
		* Clears the frame rate which is set for this window.
		*

libs/nativewindow/include/system/window.h

+0 −17

Original line number	Diff line number	Diff line
		@@ -1156,23 +1156,6 @@ static inline int native_window_set_frame_rate(struct ANativeWindow* window, flo
		(int)compatibility, (int)changeFrameRateStrategy);
		}

		static inline int native_window_set_frame_rate_params(struct ANativeWindow* window,
		float desiredMinRate, float desiredMaxRate,
		float fixedSourceRate,
		int8_t changeFrameRateStrategy) {
		// TODO(b/362798998): Fix plumbing to send whole params
		int compatibility = fixedSourceRate == 0 ? ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT
		: ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE;
		double frameRate = compatibility == ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE
		? fixedSourceRate
		: desiredMinRate;
		if (desiredMaxRate < desiredMinRate) {
		return -EINVAL;
		}
		return window->perform(window, NATIVE_WINDOW_SET_FRAME_RATE, frameRate, compatibility,
		changeFrameRateStrategy);
		}

		struct ANativeWindowFrameTimelineInfo {
		// Frame Id received from ANativeWindow_getNextFrameId.
		uint64_t frameNumber;