From 9dc7ec1f54288ed824e07c004f960bcfd493f582 Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Fri, 10 Nov 2017 15:23:00 -0800 Subject: [PATCH] Camera2: Update generated docs to latest version - Move camera reference doc images to /reference/images - Minor formatting changes due to merging SDK/NDK metadata definitions - Minor wording changes for the same Bug: 69175492 Bug: 29102963 Bug: 33262893 Test: Build and manual inspection of generated docs diff Change-Id: Ieaf0c1943eba378cc94a22d184734602c40e25e7 --- .../camera2/CameraCharacteristics.java | 34 ++---- .../hardware/camera2/CameraMetadata.java | 112 ++++++++---------- .../hardware/camera2/CaptureRequest.java | 77 ++++++------ .../hardware/camera2/CaptureResult.java | 102 +++++++--------- .../processing_pipeline.png | Bin 0 -> 25603 bytes .../blue_shading.png | Bin 0 -> 12983 bytes .../green_e_shading.png | Bin 0 -> 15443 bytes .../green_o_shading.png | Bin 0 -> 15839 bytes .../inv_shading.png | Bin 0 -> 72941 bytes .../red_shading.png | Bin 0 -> 12787 bytes .../gamma_tonemap.png | Bin 0 -> 31494 bytes .../inverse_tonemap.png | Bin 0 -> 22690 bytes .../linear_tonemap.png | Bin 0 -> 21822 bytes .../rec709_tonemap.png | Bin 0 -> 32384 bytes .../android.tonemap.curveRed/srgb_tonemap.png | Bin 0 -> 32315 bytes 15 files changed, 141 insertions(+), 184 deletions(-) create mode 100644 docs/html/reference/images/camera2/metadata/android.colorCorrection.mode/processing_pipeline.png create mode 100644 docs/html/reference/images/camera2/metadata/android.statistics.lensShadingMap/blue_shading.png create mode 100644 docs/html/reference/images/camera2/metadata/android.statistics.lensShadingMap/green_e_shading.png create mode 100644 docs/html/reference/images/camera2/metadata/android.statistics.lensShadingMap/green_o_shading.png create mode 100644 docs/html/reference/images/camera2/metadata/android.statistics.lensShadingMap/inv_shading.png create mode 100644 docs/html/reference/images/camera2/metadata/android.statistics.lensShadingMap/red_shading.png create mode 100644 docs/html/reference/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png create mode 100644 docs/html/reference/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png create mode 100644 docs/html/reference/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png create mode 100644 docs/html/reference/images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png create mode 100644 docs/html/reference/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 46ad3f0eccc90..3a3048ef1de2d 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -1280,11 +1280,11 @@ public final class CameraCharacteristics extends CameraMetadata *
  • Processed (but stalling): any non-RAW format with a stallDurations > 0. * Typically {@link android.graphics.ImageFormat#JPEG JPEG format}.
    • - *
  • Raw formats: {@link android.graphics.ImageFormat#RAW_SENSOR RAW_SENSOR}, {@link android.graphics.ImageFormat#RAW10 RAW10}, or {@link android.graphics.ImageFormat#RAW12 RAW12}.
    • - *
  • Processed (but not-stalling): any non-RAW format without a stall duration. - * Typically {@link android.graphics.ImageFormat#YUV_420_888 YUV_420_888}, - * {@link android.graphics.ImageFormat#NV21 NV21}, or - * {@link android.graphics.ImageFormat#YV12 YV12}.
    • + *
  • Raw formats: {@link android.graphics.ImageFormat#RAW_SENSOR RAW_SENSOR}, {@link android.graphics.ImageFormat#RAW10 RAW10}, or + * {@link android.graphics.ImageFormat#RAW12 RAW12}.
    • + *
  • Processed (but not-stalling): any non-RAW format without a stall duration. Typically + * {@link android.graphics.ImageFormat#YUV_420_888 YUV_420_888}, + * {@link android.graphics.ImageFormat#NV21 NV21}, or {@link android.graphics.ImageFormat#YV12 YV12}.
    • * *

    Range of valid values:

    *

    For processed (and stalling) format streams, >= 1.

    @@ -1376,8 +1376,7 @@ public final class CameraCharacteristics extends CameraMetadataRAW and supported format provided by {@link CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP android.scaler.streamConfigurationMap}.

    *

    A processed and stalling format is defined as any non-RAW format with a stallDurations - * > 0. Typically only the {@link android.graphics.ImageFormat#JPEG JPEG format} is a - * stalling format.

    + * > 0. Typically only the {@link android.graphics.ImageFormat#JPEG JPEG format} is a stalling format.

    *

    For full guarantees, query {@link android.hardware.camera2.params.StreamConfigurationMap#getOutputStallDuration } with a * processed format -- it will return a non-0 value for a stalling stream.

    *

    LEGACY devices will support up to 1 processing/stalling stream.

    @@ -1535,8 +1534,7 @@ public final class CameraCharacteristics extends CameraMetadata("android.request.availableRequestKeys", int[].class); /** - *

    A list of all keys that the camera device has available - * to use with {@link android.hardware.camera2.CaptureResult }.

    + *

    A list of all keys that the camera device has available to use with {@link android.hardware.camera2.CaptureResult }.

    *

    Attempting to get a key from a CaptureResult that is not * listed here will always return a null value. Getting a key from * a CaptureResult that is listed here will generally never return a null @@ -1561,8 +1559,7 @@ public final class CameraCharacteristics extends CameraMetadata("android.request.availableResultKeys", int[].class); /** - *

    A list of all keys that the camera device has available - * to use with {@link android.hardware.camera2.CameraCharacteristics }.

    + *

    A list of all keys that the camera device has available to use with {@link android.hardware.camera2.CameraCharacteristics }.

    *

    This entry follows the same rules as * android.request.availableResultKeys (except that it applies for * CameraCharacteristics instead of CaptureResult). See above for more @@ -1843,8 +1840,6 @@ public final class CameraCharacteristics extends CameraMetadataSee {@link CaptureRequest#SENSOR_FRAME_DURATION android.sensor.frameDuration} and * android.scaler.availableStallDurations for more details about * calculating the max frame rate.

    - *

    (Keep in sync with - * {@link android.hardware.camera2.params.StreamConfigurationMap#getOutputMinFrameDuration })

    *

    Units: (format, width, height, ns) x n

    *

    This key is available on all devices.

    * @@ -1905,14 +1900,13 @@ public final class CameraCharacteristics extends CameraMetadata *
  • {@link android.graphics.ImageFormat#YUV_420_888 }
    • *
  • {@link android.graphics.ImageFormat#RAW10 }
    • + *
  • {@link android.graphics.ImageFormat#RAW12 }
    • * *

    All other formats may or may not have an allowed stall duration on * a per-capability basis; refer to {@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} * for more details.

    *

    See {@link CaptureRequest#SENSOR_FRAME_DURATION android.sensor.frameDuration} for more information about * calculating the max frame rate (absent stalls).

    - *

    (Keep up to date with - * {@link android.hardware.camera2.params.StreamConfigurationMap#getOutputStallDuration } )

    *

    Units: (format, width, height, ns) x n

    *

    This key is available on all devices.

    * @@ -2195,9 +2189,9 @@ public final class CameraCharacteristics extends CameraMetadata *

    If a camera device supports raw sensor formats, either this or * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize} is the maximum dimensions for the raw - * output formats listed in {@link CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP android.scaler.streamConfigurationMap} (this depends on - * whether or not the image sensor returns buffers containing pixels that are not - * part of the active array region for blacklevel calibration or other purposes).

    + * output formats listed in {@link android.hardware.camera2.params.StreamConfigurationMap } + * (this depends on whether or not the image sensor returns buffers containing pixels that + * are not part of the active array region for blacklevel calibration or other purposes).

    *

    Some parts of the full pixel array may not receive light from the scene, * or be otherwise inactive. The {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize} key * defines the rectangle of active pixels that will be included in processed image @@ -2205,7 +2199,6 @@ public final class CameraCharacteristics extends CameraMetadataUnits: Pixels

    *

    This key is available on all devices.

    * - * @see CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP * @see CameraCharacteristics#SENSOR_INFO_PHYSICAL_SIZE * @see CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE */ @@ -2838,7 +2831,7 @@ public final class CameraCharacteristics extends CameraMetadataSee the individual level enums for full descriptions of the supported capabilities. The * {@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} entry describes the device's capabilities at a * finer-grain level, if needed. In addition, many controls have their available settings or - * ranges defined in individual {@link android.hardware.camera2.CameraCharacteristics } entries.

    + * ranges defined in individual entries from {@link android.hardware.camera2.CameraCharacteristics }.

    *

    Some features are not part of any particular hardware level or capability and must be * queried separately. These include:

    *