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

Commit 41faba33 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by android-build-merger
Browse files

Documentation updates to camera HAL interfaces. am: 48f3952f

am: cf1fd4de

Change-Id: I851b8dc19b70048389823d7b8c74035844f07c45
parents 6cc07cf9 cf1fd4de
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -148,7 +148,9 @@ interface ICameraDevice {
     * session handle for active operations.
     *
     * @param callback Interface to invoke by the HAL for device asynchronous
     *     events.
     *     events. For HALs newer than version 3.2, HAL must use castFrom
     *     method to check the exact version of callback sent by camera service.
     *
     * @return status Status code for the operation, one of:
     *     OK:
     *         On a successful open of the camera device.
+2 −3
Original line number Diff line number Diff line
@@ -149,9 +149,8 @@ interface ICameraDeviceSession {
     *           - Including too many output streams of a certain format.
     *           - Unsupported rotation configuration
     *           - Stream sizes/formats don't satisfy the
     *             camera3_stream_configuration_t->operation_mode requirements
     *             for non-NORMAL mode, or the requested operation_mode is not
     *             supported by the HAL.
     *             StreamConfigurationMode requirements for non-NORMAL mode, or
     *             the requested operation_mode is not supported by the HAL.
     *           - Unsupported usage flag
     *         The camera service cannot filter out all possible illegal stream
     *         configurations, since some devices may support more simultaneous
+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ interface ICameraDeviceSession extends @3.3::ICameraDeviceSession {
     *           - Including too many output streams of a certain format.
     *           - Unsupported rotation configuration
     *           - Stream sizes/formats don't satisfy the
     *             camera3_stream_configuration_t->operation_mode requirements
     *             StreamConfigurationMode requirements
     *             for non-NORMAL mode, or the requested operation_mode is not
     *             supported by the HAL.
     *           - Unsupported usage flag
+2 −1
Original line number Diff line number Diff line
@@ -1396,7 +1396,8 @@ enum CameraMetadataTag : uint32_t {
     *
     * <p>The arrangement of color filters on sensor;
     * represents the colors in the top-left 2x2 section of
     * the sensor, in reading order.</p>
     * the sensor, in reading order, for a Bayer camera, or the
     * light spectrum it captures for MONOCHROME camera.</p>
     */
    ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT,

+4 −4
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ enum CameraMetadataTag : @3.2::CameraMetadataTag {

    /** android.request.availablePhysicalCameraRequestKeys [static, int32[], hidden]
     *
     * <p>A subset of the available request keys that can be overriden for
     * <p>A subset of the available request keys that can be overridden for
     * physical devices backing a logical multi-camera.</p>
     */
    ANDROID_REQUEST_AVAILABLE_PHYSICAL_CAMERA_REQUEST_KEYS,
@@ -109,8 +109,8 @@ enum CameraMetadataTag : @3.2::CameraMetadataTag {

    /** android.statistics.oisDataMode [dynamic, enum, public]
     *
     * <p>A control for selecting whether OIS position information is included in output
     * result metadata.</p>
     * <p>A control for selecting whether optical stabilization (OIS) position
     * information is included in output result metadata.</p>
     */
    ANDROID_STATISTICS_OIS_DATA_MODE = android.hardware.camera.metadata@3.2::CameraMetadataTag:ANDROID_STATISTICS_END,

@@ -154,7 +154,7 @@ enum CameraMetadataTag : @3.2::CameraMetadataTag {

    ANDROID_INFO_END_3_3,

    /** android.logicalMultiCamera.physicalIds [static, byte[], hidden]
    /** android.logicalMultiCamera.physicalIds [static, byte[], ndk_public]
     *
     * <p>String containing the ids of the underlying physical cameras.</p>
     */
Loading