diff options
| author | Shuzhen Wang <shuzhenwang@google.com> | 2018-01-22 20:30:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-22 20:30:15 +0000 |
| commit | 4f3be2e3e9486b90f9e26f0b149b7331194d657f (patch) | |
| tree | 255055372e09e64e3e3332c7781a98f23c3d28eb /camera/metadata | |
| parent | 97d3c3b991d0b03f6572c97c823cb759d5fcfaf0 (diff) | |
| parent | 82e36b3f8cf13aef95d4746fbf8d6803b1174482 (diff) | |
| download | android_hardware_interfaces-4f3be2e3e9486b90f9e26f0b149b7331194d657f.tar.gz android_hardware_interfaces-4f3be2e3e9486b90f9e26f0b149b7331194d657f.tar.bz2 android_hardware_interfaces-4f3be2e3e9486b90f9e26f0b149b7331194d657f.zip | |
Merge "camera: Add support for logical camera"
Diffstat (limited to 'camera/metadata')
| -rw-r--r-- | camera/metadata/3.3/Android.bp | 3 | ||||
| -rw-r--r-- | camera/metadata/3.3/types.hal | 48 |
2 files changed, 50 insertions, 1 deletions
diff --git a/camera/metadata/3.3/Android.bp b/camera/metadata/3.3/Android.bp index 3f1dabca2..23c10360e 100644 --- a/camera/metadata/3.3/Android.bp +++ b/camera/metadata/3.3/Android.bp @@ -17,6 +17,9 @@ hidl_interface { "CameraMetadataEnumAndroidControlCaptureIntent", "CameraMetadataEnumAndroidLensPoseReference", "CameraMetadataEnumAndroidRequestAvailableCapabilities", + "CameraMetadataEnumAndroidLogicalMultiCameraSensorSyncType", + "CameraMetadataSection", + "CameraMetadataSectionStart", "CameraMetadataTag", ], gen_java: true, diff --git a/camera/metadata/3.3/types.hal b/camera/metadata/3.3/types.hal index 903c43a20..0894073c3 100644 --- a/camera/metadata/3.3/types.hal +++ b/camera/metadata/3.3/types.hal @@ -25,7 +25,30 @@ package android.hardware.camera.metadata@3.3; /* Include definitions from all prior minor HAL metadata revisions */ import android.hardware.camera.metadata@3.2; -// No new metadata sections added in this revision +/** + * Top level hierarchy definitions for camera metadata. *_INFO sections are for + * the static metadata that can be retrived without opening the camera device. + */ +enum CameraMetadataSection : @3.2::CameraMetadataSection { + ANDROID_LOGICAL_MULTI_CAMERA = + android.hardware.camera.metadata@3.2::CameraMetadataSection:ANDROID_SECTION_COUNT, + + ANDROID_SECTION_COUNT_3_3, + + VENDOR_SECTION_3_3 = 0x8000, + +}; + +/** + * Hierarchy positions in enum space. All vendor extension sections must be + * defined with tag >= VENDOR_SECTION_START + */ +enum CameraMetadataSectionStart : android.hardware.camera.metadata@3.2::CameraMetadataSectionStart { + ANDROID_LOGICAL_MULTI_CAMERA_START = CameraMetadataSection:ANDROID_LOGICAL_MULTI_CAMERA << 16, + + VENDOR_SECTION_START_3_3 = CameraMetadataSection:VENDOR_SECTION_3_3 << 16, + +}; /** * Main enumeration for defining camera metadata tags added in this revision @@ -71,6 +94,20 @@ enum CameraMetadataTag : @3.2::CameraMetadataTag { ANDROID_INFO_END_3_3, + /** android.logicalMultiCamera.physicalIds [static, byte[], hidden] + * + * <p>String containing the ids of the underlying physical cameras.</p> + */ + ANDROID_LOGICAL_MULTI_CAMERA_PHYSICAL_IDS = CameraMetadataSectionStart:ANDROID_LOGICAL_MULTI_CAMERA_START, + + /** android.logicalMultiCamera.sensorSyncType [static, enum, public] + * + * <p>The accuracy of frame timestamp synchronization between physical cameras</p> + */ + ANDROID_LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE, + + ANDROID_LOGICAL_MULTI_CAMERA_END_3_3, + }; /* @@ -115,6 +152,15 @@ enum CameraMetadataEnumAndroidLensPoseReference : uint32_t { enum CameraMetadataEnumAndroidRequestAvailableCapabilities : @3.2::CameraMetadataEnumAndroidRequestAvailableCapabilities { ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MOTION_TRACKING, + ANDROID_REQUEST_AVAILABLE_CAPABILITIES_LOGICAL_MULTI_CAMERA, +}; + +/** android.logicalMultiCamera.sensorSyncType enumeration values + * @see ANDROID_LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE + */ +enum CameraMetadataEnumAndroidLogicalMultiCameraSensorSyncType : uint32_t { + ANDROID_LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE_APPROXIMATE, + ANDROID_LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE_CALIBRATED, }; /** android.info.supportedHardwareLevel enumeration values added since v3.2 |