Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9746e5b6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clean up some formatting problems in the setFrameRate ndk docs" into... 

Merge "Clean up some formatting problems in the setFrameRate ndk docs" into rvc-dev am: e22e38d2 am: ab235bf2 am: b9b44384 am: 5d02dbd3

Change-Id: I890f554e6691a1963ea09610bf957ed4e665bfd7
parents b0eee065 5d02dbd3

include/android/surface_control.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -409,7 +409,7 @@ void ASurfaceTransaction_setHdrMetadata_cta861_3(ASurfaceTransaction* transactio 




#if __ANDROID_API__ >= 30

#if __ANDROID_API__ >= 30





/*

/**

 * Sets the intended frame rate for |surface_control|.

 * Sets the intended frame rate for |surface_control|.

 *

 *

 * On devices that are capable of running the display at different refresh rates, the system may

 * On devices that are capable of running the display at different refresh rates, the system may
@@ -421,9 +421,9 @@ void ASurfaceTransaction_setHdrMetadata_cta861_3(ASurfaceTransaction* transactio 
 *

 *

 * |frameRate| is the intended frame rate of this surface, in frames per second. 0 is a special

 * |frameRate| is the intended frame rate of this surface, in frames per second. 0 is a special

 * value that indicates the app will accept the system's choice for the display frame rate, which is

 * value that indicates the app will accept the system's choice for the display frame rate, which is

 * the default behavior if this function isn't called. The frameRate param does *not* need to be a

 * the default behavior if this function isn't called. The frameRate param does <em>not</em> need to

 * valid refresh rate for this device's display - e.g., it's fine to pass 30fps to a device that can

 * be a valid refresh rate for this device's display - e.g., it's fine to pass 30fps to a device

 * only run the display at 60fps.

 * that can only run the display at 60fps.

 *

 *

 * |compatibility| The frame rate compatibility of this surface. The compatibility value may

 * |compatibility| The frame rate compatibility of this surface. The compatibility value may

 * influence the system's choice of display frame rate. To specify a compatibility use the

 * influence the system's choice of display frame rate. To specify a compatibility use the

libs/nativewindow/include/android/native_window.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -233,15 +233,15 @@ int32_t ANativeWindow_getBuffersDataSpace(ANativeWindow* window) __INTRODUCED_IN 




#if __ANDROID_API__ >= 30

#if __ANDROID_API__ >= 30





/* Parameter for ANativeWindow_setFrameRate */

/** Compatibility value for ANativeWindow_setFrameRate. */

enum {

enum ANativeWindow_FrameRateCompatibility {

    /**

    /**

     * There are no inherent restrictions on the frame rate of this window.

     * There are no inherent restrictions on the frame rate of this window.

     */

     */

    ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT = 0,

    ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT = 0,

    /**

    /**

     * This window is being used to display content with an inherently fixed

     * This window is being used to display content with an inherently fixed

     * frame rate, e.g. a video that has a specific frame rate. When the system

     * frame rate, e.g.\ a video that has a specific frame rate. When the system

     * selects a frame rate other than what the app requested, the app will need

     * selects a frame rate other than what the app requested, the app will need

     * to do pull down or use some other technique to adapt to the system's

     * to do pull down or use some other technique to adapt to the system's

     * frame rate. The user experience is likely to be worse (e.g. more frame

     * frame rate. The user experience is likely to be worse (e.g. more frame
@@ -272,9 +272,9 @@ enum { 
 * \param frameRate The intended frame rate of this window, in frames per

 * \param frameRate The intended frame rate of this window, in frames per

 * second. 0 is a special value that indicates the app will accept the system's

 * second. 0 is a special value that indicates the app will accept the system's

 * choice for the display frame rate, which is the default behavior if this

 * choice for the display frame rate, which is the default behavior if this

 * function isn't called. The frameRate param does *not* need to be a valid

 * function isn't called. The frameRate param does <em>not</em> need to be a

 * refresh rate for this device's display - e.g., it's fine to pass 30fps to a

 * valid refresh rate for this device's display - e.g., it's fine to pass 30fps

 * device that can only run the display at 60fps.

 * to a device that can only run the display at 60fps.

 *

 *

 * \param compatibility The frame rate compatibility of this window. The

 * \param compatibility The frame rate compatibility of this window. The

 * compatibility value may influence the system's choice of display refresh

 * compatibility value may influence the system's choice of display refresh