diff options
| author | Shuzhen Wang <shuzhenwang@google.com> | 2020-01-08 13:06:26 -0800 |
|---|---|---|
| committer | Shuzhen Wang <shuzhenwang@google.com> | 2020-01-15 11:09:26 -0800 |
| commit | c5ae069c79d492362cf06b9bc3ceb0c240025422 (patch) | |
| tree | f878a726bb6b5d074f254105e9f4c67f257d63ba | |
| parent | eea8c32428805604f61b4738cb13edddae0cf709 (diff) | |
| download | platform_hardware_interfaces-c5ae069c79d492362cf06b9bc3ceb0c240025422.tar.gz platform_hardware_interfaces-c5ae069c79d492362cf06b9bc3ceb0c240025422.tar.bz2 platform_hardware_interfaces-c5ae069c79d492362cf06b9bc3ceb0c240025422.zip | |
Camera: Add new pose reference value UNDEFINED
If a camera device's location/orientation changes due to user action
(such as phone fold/unfold), its pose reference can be set to UNDEFINED.
Bug: 119325027
Test: VtsHalCameraProviderV2_4TargetTest
Change-Id: I227be31db64db049a8fad57e6765e1b6e025529a
| -rw-r--r-- | camera/metadata/3.3/types.hal | 4 | ||||
| -rw-r--r-- | camera/metadata/3.5/types.hal | 8 | ||||
| -rw-r--r-- | camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp | 8 | ||||
| -rw-r--r-- | current.txt | 1 |
4 files changed, 20 insertions, 1 deletions
diff --git a/camera/metadata/3.3/types.hal b/camera/metadata/3.3/types.hal index ca0c9d619b..0d896818bc 100644 --- a/camera/metadata/3.3/types.hal +++ b/camera/metadata/3.3/types.hal @@ -71,8 +71,10 @@ enum CameraMetadataTag : @3.2::CameraMetadataTag { /** android.lens.poseReference [static, enum, public] * - * <p>The origin for ANDROID_LENS_POSE_TRANSLATION.</p> + * <p>The origin for ANDROID_LENS_POSE_TRANSLATION, and the accuracy of + * ANDROID_LENS_POSE_TRANSLATION and ANDROID_LENS_POSE_ROTATION.</p> * + * @see ANDROID_LENS_POSE_ROTATION * @see ANDROID_LENS_POSE_TRANSLATION */ ANDROID_LENS_POSE_REFERENCE = android.hardware.camera.metadata@3.2::CameraMetadataTag:ANDROID_LENS_END, diff --git a/camera/metadata/3.5/types.hal b/camera/metadata/3.5/types.hal index 62899ec0c5..4c063dde75 100644 --- a/camera/metadata/3.5/types.hal +++ b/camera/metadata/3.5/types.hal @@ -87,6 +87,14 @@ enum CameraMetadataEnumAndroidControlBokehMode : uint32_t { ANDROID_CONTROL_BOKEH_MODE_CONTINUOUS, }; +/** android.lens.poseReference enumeration values added since v3.3 + * @see ANDROID_LENS_POSE_REFERENCE + */ +enum CameraMetadataEnumAndroidLensPoseReference : + @3.3::CameraMetadataEnumAndroidLensPoseReference { + ANDROID_LENS_POSE_REFERENCE_UNDEFINED, +}; + /** android.request.availableCapabilities enumeration values added since v3.4 * @see ANDROID_REQUEST_AVAILABLE_CAPABILITIES */ diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index 650ec8b81d..c9f9bf6856 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp @@ -5851,6 +5851,14 @@ void CameraHidlTest::verifyCameraCharacteristics(Status status, const CameraMeta } } + retcode = find_camera_metadata_ro_entry(metadata, + ANDROID_LENS_POSE_REFERENCE, &entry); + if (0 == retcode && entry.count > 0) { + uint8_t poseReference = entry.data.u8[0]; + ASSERT_TRUE(poseReference <= ANDROID_LENS_POSE_REFERENCE_UNDEFINED && + poseReference >= ANDROID_LENS_POSE_REFERENCE_PRIMARY_CAMERA); + } + verifyBokehCharacteristics(metadata); verifyZoomCharacteristics(metadata); } diff --git a/current.txt b/current.txt index 0fec2906ec..3f6c022737 100644 --- a/current.txt +++ b/current.txt @@ -586,6 +586,7 @@ f5bc6aa840db933cb9fd36668b06d3e2021cf5384bb70e459f22e2f2f921fba5 android.hardwar d3a344b7bd4c0d2658ae7209f55a979b8f53f361fd00f4fca29d5baa56d11fd2 android.hardware.automotive.evs@1.0::types 2410dd02d67786a732d36e80b0f8ccf55086604ef37f9838e2013ff2c571e404 android.hardware.camera.device@3.5::types cd06a7911b9acd4a653bbf7133888878fbcb3f84be177c7a3f1becaae3d8618f android.hardware.camera.metadata@3.2::types +a05277065c28ebecd58118bd240fb8c55757361e8648c01f7c4dacdb7f2a95dc android.hardware.camera.metadata@3.3::types b69a7615c508acf5c5201efd1bfa3262167874fc3594e2db5a3ff93addd8ac75 android.hardware.keymaster@4.0::IKeymasterDevice eb2fa0c883c2185d514be0b84c179b283753ef0c1b77b45b4f359bd23bba8b75 android.hardware.neuralnetworks@1.0::IPreparedModel 8eac60e1f724d141c71c69f06d4544acb720a55dfbbcd97fa01bb3d25ee4e2f5 android.hardware.neuralnetworks@1.0::types |