Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up some formatting problems in the setFrameRate sdk docs" into rvc-dev am: b2e92b6a5a

Browse Source 
Change-Id: I3898950618e14e25f8dcf8704170400b09251523
This commit is contained in:
Steven Thomas
2020-03-27 23:02:38 +00:00
committed by Automerger Merge Worker
parent 7283b11ae3 b2e92b6a5a
commit 7e5e1dc230
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/view/Surface.java
View File

@@ -871,24 +871,24 @@ public class Surface implements Parcelable {
/** /**
* Sets the intended frame rate for this surface. * Sets the intended frame rate for this surface.
* *
* On devices that are capable of running the display at different refresh rates, the * <p>On devices that are capable of running the display at different refresh rates,
* system may choose a display refresh rate to better match this surface's frame * 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 * 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 * 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 * 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 * to Choreographer callback timings, and changes to the time interval at which the
* system releases buffers back to the application. * system releases buffers back to the application.</p>
* *
* Note that this only has an effect for surfaces presented on the display. If this * <p>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 * surface is consumed by something other than the system compositor, e.g. a media
* codec, this call has no effect. * codec, this call has no effect.</p>
* *
* @param frameRate The intended frame rate of this surface, in frames per second. 0 * @param frameRate 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 * 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 function isn't * display frame rate, which is the default behavior if this function isn't
* called. The frameRate param does *not* need to be a valid refresh rate for this * called. The frameRate param does <em>not</em> need to be a valid refresh rate for
* device's display - e.g., it's fine to pass 30fps to a device that can only run the * this device's display - e.g., it's fine to pass 30fps to a device that can only run
* display at 60fps. * the display at 60fps.
* *
* @param compatibility The frame rate compatibility of this surface. The * @param compatibility The frame rate compatibility of this surface. The
* compatibility value may influence the system's choice of display frame rate. See * compatibility value may influence the system's choice of display frame rate. See

8
core/java/android/view/SurfaceControl.java
View File

@@ -2738,7 +2738,7 @@ public final class SurfaceControl implements Parcelable {
/** /**
* Sets the intended frame rate for the surface {@link SurfaceControl}. * Sets the intended frame rate for the surface {@link SurfaceControl}.
* * <p>
* On devices that are capable of running the display at different refresh rates, the system * On devices that are capable of running the display at different refresh rates, the system
* may choose a display refresh rate to better match this surface's frame rate. Usage of * may choose a display refresh rate to better match this surface's frame rate. Usage of
* this API won't directly affect the application's frame production pipeline. However, * this API won't directly affect the application's frame production pipeline. However,
@@ -2750,9 +2750,9 @@ public final class SurfaceControl implements Parcelable {
* @param frameRate The intended frame rate for this surface, in frames per second. 0 is a * @param frameRate The intended frame rate for this surface, in frames per second. 0 is a
* special value that indicates the app will accept the system's choice for * special value that indicates the app will accept the system's choice for
* the display frame rate, which is the default behavior if this function * 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 refresh * isn't called. The frameRate param does <em>not</em> need to be a valid
* rate for this device's display - e.g., it's fine to pass 30fps to a * 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 surface. The compatibility * @param compatibility The frame rate compatibility of this surface. The compatibility
* value may influence the system's choice of display frame rate. See * value may influence the system's choice of display frame rate. See
* the Surface.FRAME_RATE_COMPATIBILITY_* values for more info. * the Surface.FRAME_RATE_COMPATIBILITY_* values for more info.