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

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

Merge "camera2: Fix links in SENSOR_PIXEL_MODE docs" into udc-dev

parents 7b492dd0 6b521376

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

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

     * They can be queried through

     * {@link android.hardware.camera2.CameraCharacteristics#get } with

     * {@link CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP_MAXIMUM_RESOLUTION) }.

     * {@link CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP_MAXIMUM_RESOLUTION }.

     * Unless reported by both

     * {@link android.hardware.camera2.params.StreamConfigurationMap }s, the outputs from

     * <code>{@link CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP_MAXIMUM_RESOLUTION android.scaler.streamConfigurationMapMaximumResolution}</code> and
@@ -3550,13 +3550,12 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * <ul>

     * <li>

     * <p>The mandatory stream combinations listed in

     *   {@link android.hardware.camera2.CameraCharacteristics.mandatoryMaximumResolutionStreamCombinations }

     *   would not apply.</p>

     *   {@link CameraCharacteristics#SCALER_MANDATORY_MAXIMUM_RESOLUTION_STREAM_COMBINATIONS android.scaler.mandatoryMaximumResolutionStreamCombinations}  would not apply.</p>

     * </li>

     * <li>

     * <p>The bayer pattern of {@code RAW} streams when

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

     *   is selected will be the one listed in {@link android.sensor.info.binningFactor }.</p>

     *   is selected will be the one listed in {@link CameraCharacteristics#SENSOR_INFO_BINNING_FACTOR android.sensor.info.binningFactor}.</p>

     * </li>

     * <li>

     * <p>The following keys will always be present:</p>
@@ -3576,9 +3575,11 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     *

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

     *

     * @see CameraCharacteristics#SCALER_MANDATORY_MAXIMUM_RESOLUTION_STREAM_COMBINATIONS

     * @see CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP

     * @see CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP_MAXIMUM_RESOLUTION

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION

     * @see CameraCharacteristics#SENSOR_INFO_BINNING_FACTOR

     * @see CameraCharacteristics#SENSOR_INFO_PIXEL_ARRAY_SIZE_MAXIMUM_RESOLUTION

     * @see CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION

     * @see #SENSOR_PIXEL_MODE_DEFAULT

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

+5 −4
Original line number Diff line number Diff line
@@ -4460,7 +4460,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * {@link android.hardware.camera2.CameraMetadata#SENSOR_PIXEL_MODE_DEFAULT } mode.

     * They can be queried through

     * {@link android.hardware.camera2.CameraCharacteristics#get } with

     * {@link CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP_MAXIMUM_RESOLUTION) }.

     * {@link CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP_MAXIMUM_RESOLUTION }.

     * Unless reported by both

     * {@link android.hardware.camera2.params.StreamConfigurationMap }s, the outputs from

     * <code>{@link CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP_MAXIMUM_RESOLUTION android.scaler.streamConfigurationMapMaximumResolution}</code> and
@@ -4475,13 +4475,12 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * <ul>

     * <li>

     * <p>The mandatory stream combinations listed in

     *   {@link android.hardware.camera2.CameraCharacteristics.mandatoryMaximumResolutionStreamCombinations }

     *   would not apply.</p>

     *   {@link CameraCharacteristics#SCALER_MANDATORY_MAXIMUM_RESOLUTION_STREAM_COMBINATIONS android.scaler.mandatoryMaximumResolutionStreamCombinations}  would not apply.</p>

     * </li>

     * <li>

     * <p>The bayer pattern of {@code RAW} streams when

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

     *   is selected will be the one listed in {@link android.sensor.info.binningFactor }.</p>

     *   is selected will be the one listed in {@link CameraCharacteristics#SENSOR_INFO_BINNING_FACTOR android.sensor.info.binningFactor}.</p>

     * </li>

     * <li>

     * <p>The following keys will always be present:</p>
@@ -4501,9 +4500,11 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     *

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

     *

     * @see CameraCharacteristics#SCALER_MANDATORY_MAXIMUM_RESOLUTION_STREAM_COMBINATIONS

     * @see CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP

     * @see CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP_MAXIMUM_RESOLUTION

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION

     * @see CameraCharacteristics#SENSOR_INFO_BINNING_FACTOR

     * @see CameraCharacteristics#SENSOR_INFO_PIXEL_ARRAY_SIZE_MAXIMUM_RESOLUTION

     * @see CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION

     * @see #SENSOR_PIXEL_MODE_DEFAULT