Merge "Camera: Add new pose reference value UNDEFINED"

This commit is contained in:
TreeHugger Robot
2020-01-16 21:49:19 +00:00
committed by Android (Google) Code Review
4 changed files with 20 additions and 1 deletions

View File

@@ -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,

View File

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

View File

@@ -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);
}

View File

@@ -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