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

Commit 889b21d1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Add MONOCHROME camera capability" into pi-dev

parents 119d10de 51248bf6

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -16156,6 +16156,7 @@ package android.hardware.camera2 { 
    field public static final int REQUEST_AVAILABLE_CAPABILITIES_LOGICAL_MULTI_CAMERA = 11; // 0xb

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING = 2; // 0x2

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR = 1; // 0x1

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_MONOCHROME = 12; // 0xc

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_MOTION_TRACKING = 10; // 0xa

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_PRIVATE_REPROCESSING = 4; // 0x4

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_RAW = 3; // 0x3

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

+2 −0
Original line number Diff line number Diff line
@@ -1708,6 +1708,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     *   <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_CONSTRAINED_HIGH_SPEED_VIDEO CONSTRAINED_HIGH_SPEED_VIDEO}</li>

     *   <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_MOTION_TRACKING MOTION_TRACKING}</li>

     *   <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_LOGICAL_MULTI_CAMERA LOGICAL_MULTI_CAMERA}</li>

     *   <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_MONOCHROME MONOCHROME}</li>

     * </ul></p>

     * <p>This key is available on all devices.</p>

     *
@@ -1724,6 +1725,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * @see #REQUEST_AVAILABLE_CAPABILITIES_CONSTRAINED_HIGH_SPEED_VIDEO

     * @see #REQUEST_AVAILABLE_CAPABILITIES_MOTION_TRACKING

     * @see #REQUEST_AVAILABLE_CAPABILITIES_LOGICAL_MULTI_CAMERA

     * @see #REQUEST_AVAILABLE_CAPABILITIES_MONOCHROME

     */

    @PublicKey

    public static final Key<int[]> REQUEST_AVAILABLE_CAPABILITIES =

core/java/android/hardware/camera2/CameraMetadata.java

+7 −0
Original line number Diff line number Diff line
@@ -862,6 +862,13 @@ public abstract class CameraMetadata<TKey> { 
     */

    public static final int REQUEST_AVAILABLE_CAPABILITIES_LOGICAL_MULTI_CAMERA = 11;



    /**

     * <p>The camera device is a monochrome camera that doesn't contain a color filter array,

     * and the pixel values on U and Y planes are all 128.</p>

     * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES

     */

    public static final int REQUEST_AVAILABLE_CAPABILITIES_MONOCHROME = 12;



    //

    // Enumeration values for CameraCharacteristics#SCALER_CROPPING_TYPE

    //

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

+4 −0
Original line number Diff line number Diff line
@@ -2853,6 +2853,8 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * of points can be less than max (that is, the request doesn't have to

     * always provide a curve with number of points equivalent to

     * {@link CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS android.tonemap.maxCurvePoints}).</p>

     * <p>For devices with MONOCHROME capability, only red channel is used. Green and blue channels

     * are ignored.</p>

     * <p>A few examples, and their corresponding graphical mappings; these

     * only specify the red channel and the precision is limited to 4

     * digits, for conciseness.</p>
@@ -2915,6 +2917,8 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * of points can be less than max (that is, the request doesn't have to

     * always provide a curve with number of points equivalent to

     * {@link CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS android.tonemap.maxCurvePoints}).</p>

     * <p>For devices with MONOCHROME capability, only red channel is used. Green and blue channels

     * are ignored.</p>

     * <p>A few examples, and their corresponding graphical mappings; these

     * only specify the red channel and the precision is limited to 4

     * digits, for conciseness.</p>

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

+4 −0
Original line number Diff line number Diff line
@@ -4096,6 +4096,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * of points can be less than max (that is, the request doesn't have to

     * always provide a curve with number of points equivalent to

     * {@link CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS android.tonemap.maxCurvePoints}).</p>

     * <p>For devices with MONOCHROME capability, only red channel is used. Green and blue channels

     * are ignored.</p>

     * <p>A few examples, and their corresponding graphical mappings; these

     * only specify the red channel and the precision is limited to 4

     * digits, for conciseness.</p>
@@ -4158,6 +4160,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * of points can be less than max (that is, the request doesn't have to

     * always provide a curve with number of points equivalent to

     * {@link CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS android.tonemap.maxCurvePoints}).</p>

     * <p>For devices with MONOCHROME capability, only red channel is used. Green and blue channels

     * are ignored.</p>

     * <p>A few examples, and their corresponding graphical mappings; these

     * only specify the red channel and the precision is limited to 4

     * digits, for conciseness.</p>