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

Commit d6bc8a3c authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Android (Google) Code Review
Browse files

Merge "camera: Clarify hot pixel map coordinate system when sensor pixel mode... 

Merge "camera: Clarify hot pixel map coordinate system when sensor pixel mode is MAXIMUM_RESOLUTION" into main
parents 81f73a9b c8f89e74

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

+4 −4
Original line number Diff line number Diff line
@@ -4247,7 +4247,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * This key will only be present for devices which advertise the

     * {@link android.hardware.camera2.CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR }

     * capability or devices where {@link CameraCharacteristics#getAvailableCaptureRequestKeys }

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode}}</p>

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode}.</p>

     * <p><b>Units</b>: Pixel coordinates on the image sensor</p>

     * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>

     *
@@ -4273,7 +4273,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * This key will only be present for devices which advertise the

     * {@link android.hardware.camera2.CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR }

     * capability or devices where {@link CameraCharacteristics#getAvailableCaptureRequestKeys }

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode}}</p>

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode}.</p>

     * <p><b>Units</b>: Pixels</p>

     * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>

     *
@@ -4298,7 +4298,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * This key will only be present for devices which advertise the

     * {@link android.hardware.camera2.CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR }

     * capability or devices where {@link CameraCharacteristics#getAvailableCaptureRequestKeys }

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode}}</p>

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode}.</p>

     * <p><b>Units</b>: Pixel coordinates on the image sensor</p>

     * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>

     *
@@ -4332,7 +4332,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <ul>

     * <li>This key will be present if

     *   {@link CameraCharacteristics#getAvailableCaptureRequestKeys }

     *   lists {@link CaptureRequest#SENSOR_PIXEL_MODE {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode}}, since RAW

     *   lists {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode}, since RAW

     *   images may not necessarily have a regular bayer pattern when

     *   {@link CaptureRequest#SENSOR_PIXEL_MODE {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode}} is set to

     *   {@link android.hardware.camera2.CameraMetadata#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION }.</li>

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

+5 −5
Original line number Diff line number Diff line
@@ -1465,7 +1465,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * {@link android.hardware.camera2.CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR }

     * capability or devices where

     * {@link CameraCharacteristics#getAvailableCaptureRequestKeys }

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode}}

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode},

     * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.activeArraySizeMaximumResolution} /

     * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.preCorrectionActiveArraySizeMaximumResolution} must be used as the

     * coordinate system for requests where {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode} is set to
@@ -1715,7 +1715,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * {@link android.hardware.camera2.CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR }

     * capability or devices where

     * {@link CameraCharacteristics#getAvailableCaptureRequestKeys }

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode}},

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode},

     * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.activeArraySizeMaximumResolution} /

     * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.preCorrectionActiveArraySizeMaximumResolution} must be used as the

     * coordinate system for requests where {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode} is set to
@@ -1940,7 +1940,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * {@link android.hardware.camera2.CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR }

     * capability or devices where

     * {@link CameraCharacteristics#getAvailableCaptureRequestKeys }

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode}},

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode},

     * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.activeArraySizeMaximumResolution} /

     * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.preCorrectionActiveArraySizeMaximumResolution} must be used as the

     * coordinate system for requests where {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode} is set to
@@ -3285,8 +3285,8 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * <p>For camera devices with the

     * {@link android.hardware.camera2.CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR }

     * capability or devices where {@link CameraCharacteristics#getAvailableCaptureRequestKeys }

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode}}</p>

     * <p>{@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.activeArraySizeMaximumResolution} /

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode},

     * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.activeArraySizeMaximumResolution} /

     * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.preCorrectionActiveArraySizeMaximumResolution} must be used as the

     * coordinate system for requests where {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode} is set to

     * {@link android.hardware.camera2.CameraMetadata#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION }.</p>

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

+17 −7
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * {@link android.hardware.camera2.CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR }

     * capability or devices where

     * {@link CameraCharacteristics#getAvailableCaptureRequestKeys }

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode}}

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode},

     * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.activeArraySizeMaximumResolution} /

     * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.preCorrectionActiveArraySizeMaximumResolution} must be used as the

     * coordinate system for requests where {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode} is set to
@@ -1366,7 +1366,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * {@link android.hardware.camera2.CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR }

     * capability or devices where

     * {@link CameraCharacteristics#getAvailableCaptureRequestKeys }

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode}},

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode},

     * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.activeArraySizeMaximumResolution} /

     * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.preCorrectionActiveArraySizeMaximumResolution} must be used as the

     * coordinate system for requests where {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode} is set to
@@ -2002,7 +2002,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * {@link android.hardware.camera2.CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR }

     * capability or devices where

     * {@link CameraCharacteristics#getAvailableCaptureRequestKeys }

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode}},

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode},

     * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.activeArraySizeMaximumResolution} /

     * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.preCorrectionActiveArraySizeMaximumResolution} must be used as the

     * coordinate system for requests where {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode} is set to
@@ -3953,8 +3953,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * <p>For camera devices with the

     * {@link android.hardware.camera2.CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR }

     * capability or devices where {@link CameraCharacteristics#getAvailableCaptureRequestKeys }

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode}}</p>

     * <p>{@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.activeArraySizeMaximumResolution} /

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode},

     * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.activeArraySizeMaximumResolution} /

     * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.preCorrectionActiveArraySizeMaximumResolution} must be used as the

     * coordinate system for requests where {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode} is set to

     * {@link android.hardware.camera2.CameraMetadata#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION }.</p>
@@ -5137,6 +5137,14 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * height dimensions are given in {@link CameraCharacteristics#SENSOR_INFO_PIXEL_ARRAY_SIZE android.sensor.info.pixelArraySize}.

     * This may include hot pixels that lie outside of the active array

     * bounds given by {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.</p>

     * <p>For camera devices with the

     * {@link android.hardware.camera2.CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR }

     * capability or devices where

     * {@link CameraCharacteristics#getAvailableCaptureRequestKeys }

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode},

     * {@link CameraCharacteristics#SENSOR_INFO_PIXEL_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.pixelArraySizeMaximumResolution} will be used as the

     * pixel array size if the corresponding request sets {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode} to

     * {@link android.hardware.camera2.CameraMetadata#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION }.</p>

     * <p><b>Range of valid values:</b><br></p>

     * <p>n &lt;= number of pixels on the sensor.

     * The <code>(x, y)</code> coordinates must be bounded by
@@ -5145,6 +5153,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     *

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE

     * @see CameraCharacteristics#SENSOR_INFO_PIXEL_ARRAY_SIZE

     * @see CameraCharacteristics#SENSOR_INFO_PIXEL_ARRAY_SIZE_MAXIMUM_RESOLUTION

     * @see CaptureRequest#SENSOR_PIXEL_MODE

     */

    @PublicKey

    @NonNull
@@ -5798,8 +5808,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * <p>For camera devices with the

     * {@link android.hardware.camera2.CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR }

     * capability or devices where {@link CameraCharacteristics#getAvailableCaptureRequestKeys }

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode}}

     * , the current active physical device

     * lists {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode},

     * the current active physical device

     * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.activeArraySizeMaximumResolution} /

     * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION android.sensor.info.preCorrectionActiveArraySizeMaximumResolution} must be used as the

     * coordinate system for requests where {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode} is set to