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

Commit d02d538a authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Android (Google) Code Review
Browse files

Merge "Camera: Address API review feedback for readout timestamp"

parents 0625ccde a36f7e87

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -19035,15 +19035,15 @@ package android.hardware.camera2.params { 
    method public int getSurfaceGroupId();

    method @NonNull public java.util.List<android.view.Surface> getSurfaces();

    method public int getTimestampBase();

    method public boolean isReadoutTimestampUsed();

    method public boolean isReadoutTimestampEnabled();

    method public void removeSensorPixelModeUsed(int);

    method public void removeSurface(@NonNull android.view.Surface);

    method public void setDynamicRangeProfile(long);

    method public void setMirrorMode(int);

    method public void setPhysicalCameraId(@Nullable String);

    method public void setReadoutTimestampEnabled(boolean);

    method public void setStreamUseCase(long);

    method public void setTimestampBase(int);

    method public void useReadoutTimestamp(boolean);

    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.hardware.camera2.params.OutputConfiguration> CREATOR;

    field public static final int MIRROR_MODE_AUTO = 0; // 0x0

core/java/android/hardware/camera2/CameraCaptureSession.java

+1 −1
Original line number Diff line number Diff line
@@ -1246,7 +1246,7 @@ public abstract class CameraCaptureSession implements AutoCloseable { 
         * between frames.</p>

         *

         * <p>The timestamps match the timestamps of the output surfaces with readout timestamp

         * enabled (via {@link OutputConfiguration#useReadoutTimestamp}) if:</p>

         * enabled (via {@link OutputConfiguration#setReadoutTimestampEnabled}) if:</p>

         * <ul>

         * <li> Timestamp base is {@link OutputConfiguration#TIMESTAMP_BASE_DEFAULT} and the

         * output

core/java/android/hardware/camera2/CameraCharacteristics.java

+2 −1
Original line number Diff line number Diff line
@@ -4600,7 +4600,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * {@link CameraCaptureSession.CaptureCallback#onCaptureStarted }.</p>

     * <p>In addition, the application can switch an output surface's timestamp from start of

     * exposure to start of readout by calling

     * {@link android.hardware.camera2.params.OutputConfiguration#useReadoutTimestamp }.</p>

     * {@link android.hardware.camera2.params.OutputConfiguration#setReadoutTimestampEnabled }.</p>

     * <p>The readout timestamp is beneficial for video recording, because the encoder favors

     * uniform timestamps, and the readout timestamps better reflect the cadence camera sensors

     * output data.</p>
@@ -5688,4 +5688,5 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 








}

core/java/android/hardware/camera2/CaptureRequest.java

+1 −0
Original line number Diff line number Diff line
@@ -4198,4 +4198,5 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 








}

core/java/android/hardware/camera2/CaptureResult.java

+1 −0
Original line number Diff line number Diff line
@@ -5699,4 +5699,5 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 








}