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

Commit f98a3c02 authored by Zhijun He's avatar Zhijun He Committed by Android (Google) Code Review
Browse files

Merge "Camera2: Hide input stream related key and enum" into lmp-preview-dev

parents 42942026 6593acd9

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -12146,7 +12146,6 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CameraCharacteristics.Key LENS_INFO_MINIMUM_FOCUS_DISTANCE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_AVAILABLE_CAPABILITIES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_MAX_NUM_INPUT_STREAMS;

    field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_MAX_NUM_OUTPUT_PROC;

    field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_MAX_NUM_OUTPUT_PROC_STALLING;

    field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_MAX_NUM_OUTPUT_RAW;
@@ -12371,7 +12370,6 @@ package android.hardware.camera2 { 
    field public static final int REQUEST_AVAILABLE_CAPABILITIES_DNG = 5; // 0x5

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

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

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

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

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

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

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

+2 −3
Original line number Diff line number Diff line
@@ -751,6 +751,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <p>For example, for Zero Shutter Lag (ZSL) still capture use case, the input

     * stream image format will be RAW_OPAQUE, the associated output stream image format

     * should be JPEG.</p>

     * @hide

     */

    public static final Key<Integer> REQUEST_MAX_NUM_INPUT_STREAMS =

            new Key<Integer>("android.request.maxNumInputStreams", int.class);
@@ -974,7 +975,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <p>The mapping of image formats that are supported by this

     * camera device for input streams, to their corresponding output formats.</p>

     * <p>All camera devices with at least 1

     * {@link CameraCharacteristics#REQUEST_MAX_NUM_INPUT_STREAMS android.request.maxNumInputStreams} will have at least one

     * android.request.maxNumInputStreams will have at least one

     * available input format.</p>

     * <p>The camera device will support the following map of formats,

     * if its dependent capability is supported:</p>
@@ -1021,8 +1022,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <p>Attempting to configure an input stream with output streams not

     * listed as available in this map is not valid.</p>

     * <p>TODO: typedef to ReprocessFormatMap</p>

     *

     * @see CameraCharacteristics#REQUEST_MAX_NUM_INPUT_STREAMS

     * @hide

     */

    public static final Key<int[]> SCALER_AVAILABLE_INPUT_OUTPUT_FORMATS_MAP =

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

+1 −0
Original line number Diff line number Diff line
@@ -340,6 +340,7 @@ public abstract class CameraMetadata<TKey> { 
     * (both input/output) will match the maximum available

     * resolution of JPEG streams.</li>

     * </ul>

     * <p>@hide this, TODO: remove it when input related APIs are ready.</p>

     * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES

     */

    public static final int REQUEST_AVAILABLE_CAPABILITIES_ZSL = 4;