diff options
author | 2022-09-28 19:03:21 +0000 | |
---|---|---|
committer | 2022-09-28 19:03:21 +0000 | |
commit | 87dd9242373a8c86fc34dd12eea48be20352c213 (patch) | |
tree | 3b5450fee32e421f94fb9682e7698e7ab20a2f1e | |
parent | 5e05a02c9cdfc58f5ab450587f9fb78898e001e5 (diff) | |
parent | 42efa76749b40d33ac391115e3d385162eb63e63 (diff) |
Merge "Camera: Update API doc for DISPLAY_SYNC timestamp base" into tm-qpr-dev
-rw-r--r-- | core/java/android/hardware/camera2/params/OutputConfiguration.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/hardware/camera2/params/OutputConfiguration.java b/core/java/android/hardware/camera2/params/OutputConfiguration.java index 9e8703779863..90e92dbe2ab0 100644 --- a/core/java/android/hardware/camera2/params/OutputConfiguration.java +++ b/core/java/android/hardware/camera2/params/OutputConfiguration.java @@ -159,8 +159,9 @@ public final class OutputConfiguration implements Parcelable { * * <li> For a SurfaceView output surface, the timestamp base is {@link * #TIMESTAMP_BASE_CHOREOGRAPHER_SYNCED}. The timestamp is overridden with choreographer - * pulses from the display subsystem for smoother display of camera frames. The timestamp - * is roughly in the same time base as {@link android.os.SystemClock#uptimeMillis}.</li> + * pulses from the display subsystem for smoother display of camera frames when the camera + * device runs in fixed frame rate. The timestamp is roughly in the same time base as + * {@link android.os.SystemClock#uptimeMillis}.</li> * <li> For an output surface of MediaRecorder, MediaCodec, or ImageReader with {@link * android.hardware.HardwareBuffer#USAGE_VIDEO_ENCODE} usge flag, the timestamp base is * {@link #TIMESTAMP_BASE_MONOTONIC}, which is roughly the same time base as @@ -231,7 +232,8 @@ public final class OutputConfiguration implements Parcelable { * * <p>The timestamp of the output images are overridden with choreographer pulses from the * display subsystem for smoother display of camera frames. An output target of SurfaceView - * uses this time base by default.</p> + * uses this time base by default. Note that the timestamp override is done for fixed camera + * frame rate only.</p> * * <p>This timestamp base isn't applicable to SurfaceTexture targets. SurfaceTexture's * {@link android.graphics.SurfaceTexture#updateTexImage updateTexImage} function always |