From 48f3952ffc9bd6f4c610933d757a76020643aa52 Mon Sep 17 00:00:00 2001 From: Jayant Chowdhary Date: Tue, 12 Feb 2019 10:02:42 -0800 Subject: [PATCH] Documentation updates to camera HAL interfaces. Bug: 124248114 Test: mm -j64 Change-Id: If1cf0e2d464ac62e5897b8faaf4835d06c12edd8 Merged-In: Ibc2415531a16e42ae81e33c3bdb28aca08e6a5fe Signed-off-by: Jayant Chowdhary --- camera/device/3.2/ICameraDevice.hal | 4 +++- camera/device/3.2/ICameraDeviceSession.hal | 5 ++--- camera/device/3.4/ICameraDeviceSession.hal | 2 +- camera/metadata/3.2/types.hal | 3 ++- camera/metadata/3.3/types.hal | 8 ++++---- current.txt | 6 +++++- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/camera/device/3.2/ICameraDevice.hal b/camera/device/3.2/ICameraDevice.hal index 1f523e420d..5236bb1cd8 100644 --- a/camera/device/3.2/ICameraDevice.hal +++ b/camera/device/3.2/ICameraDevice.hal @@ -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. diff --git a/camera/device/3.2/ICameraDeviceSession.hal b/camera/device/3.2/ICameraDeviceSession.hal index e62dc072cd..278be5d091 100644 --- a/camera/device/3.2/ICameraDeviceSession.hal +++ b/camera/device/3.2/ICameraDeviceSession.hal @@ -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 diff --git a/camera/device/3.4/ICameraDeviceSession.hal b/camera/device/3.4/ICameraDeviceSession.hal index c41d90e27a..e1663e6669 100644 --- a/camera/device/3.4/ICameraDeviceSession.hal +++ b/camera/device/3.4/ICameraDeviceSession.hal @@ -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 diff --git a/camera/metadata/3.2/types.hal b/camera/metadata/3.2/types.hal index 67b4e447d5..cef0397931 100644 --- a/camera/metadata/3.2/types.hal +++ b/camera/metadata/3.2/types.hal @@ -1396,7 +1396,8 @@ enum CameraMetadataTag : uint32_t { * *

The arrangement of color filters on sensor; * represents the colors in the top-left 2x2 section of - * the sensor, in reading order.

+ * the sensor, in reading order, for a Bayer camera, or the + * light spectrum it captures for MONOCHROME camera.

*/ ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT, diff --git a/camera/metadata/3.3/types.hal b/camera/metadata/3.3/types.hal index 04edfe9fb4..27d82b991a 100644 --- a/camera/metadata/3.3/types.hal +++ b/camera/metadata/3.3/types.hal @@ -100,7 +100,7 @@ enum CameraMetadataTag : @3.2::CameraMetadataTag { /** android.request.availablePhysicalCameraRequestKeys [static, int32[], hidden] * - *

A subset of the available request keys that can be overriden for + *

A subset of the available request keys that can be overridden for * physical devices backing a logical multi-camera.

*/ ANDROID_REQUEST_AVAILABLE_PHYSICAL_CAMERA_REQUEST_KEYS, @@ -109,8 +109,8 @@ enum CameraMetadataTag : @3.2::CameraMetadataTag { /** android.statistics.oisDataMode [dynamic, enum, public] * - *

A control for selecting whether OIS position information is included in output - * result metadata.

+ *

A control for selecting whether optical stabilization (OIS) position + * information is included in output result metadata.

*/ 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] * *

String containing the ids of the underlying physical cameras.

*/ diff --git a/current.txt b/current.txt index 1f327f6967..06145e4dd6 100644 --- a/current.txt +++ b/current.txt @@ -385,8 +385,12 @@ cd4330c3196bda1d642a32abfe23a7d64ebfbda721940643af6867af3b3f0aa9 android.hardwar 10ff2fae516346b86121368ce5790d5accdfcb73983246b813f3d488b66db45a android.hardware.wifi.supplicant@1.1::ISupplicantStaNetwork # ABI preserving changes to HALs during Android Q -f72d23278af99a2f6a9c1d40352b67dbf1f582282f799f88f7235dc7c13892b5 android.hardware.camera.device@3.2::ICameraDeviceSession +2a55e224aa9bc62c0387cd85ad3c97e33f0c33a4e1489cbae86b2523e6f9df35 android.hardware.camera.device@3.2::ICameraDevice +8caf9104dc6885852c0b117d853dd93f6d4b61a0a365138295eb8bcd41b36423 android.hardware.camera.device@3.2::ICameraDeviceSession +684702a60deef03a1e8093961dc0a18c555c857ad5a77ba7340b0635ae01eb70 android.hardware.camera.device@3.4::ICameraDeviceSession f8a19622cb0cc890913b1ef3e32b675ffb26089a09e02fef4056ebad324d2b5d android.hardware.camera.device@3.4::types +291638a1b6d4e63283e9e722ab5049d9351717ffa2b66162124f84d1aa7c2835 android.hardware.camera.metadata@3.2::types +8a075cf3a17fe99c6d23415a3e9a65612f1fee73ee052a3a8a0ca5b8877395a4 android.hardware.camera.metadata@3.3::types da33234403ff5d60f3473711917b9948e6484a4260b5247acdafb111193a9de2 android.hardware.configstore@1.0::ISurfaceFlingerConfigs 21165b8e30c4b2d52980e4728f661420adc16e38bbe73476c06b2085be908f4c android.hardware.gnss@1.0::IGnssCallback d702fb01dc2a0733aa820b7eb65435ee3334f75632ef880bafd2fb8803a20a58 android.hardware.gnss@1.0::IGnssMeasurementCallback