diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-11-29 06:38:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-11-29 06:38:47 +0000 |
| commit | 0396331a720a0776eaeb2f6bbb9f8a608ea41ced (patch) | |
| tree | dd9e39110bb7bb28784b7a90b7a7174679d4627a | |
| parent | 868c0694bbe7861322748ec851db50540970af0e (diff) | |
| parent | a5504b86ec5118d27da76a19245f4283c7565165 (diff) | |
Merge "Camera: Fix MONO and NIR enumeration version"
| -rw-r--r-- | camera/metadata/3.4/types.hal | 9 | ||||
| -rw-r--r-- | camera/provider/2.4/vts/functional/Android.bp | 1 | ||||
| -rw-r--r-- | camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp | 8 |
3 files changed, 16 insertions, 2 deletions
diff --git a/camera/metadata/3.4/types.hal b/camera/metadata/3.4/types.hal index 4eb692917e..61a399eb1a 100644 --- a/camera/metadata/3.4/types.hal +++ b/camera/metadata/3.4/types.hal @@ -113,6 +113,15 @@ enum CameraMetadataEnumAndroidScalerAvailableRecommendedStreamConfigurations : u = 0x18, }; +/** android.sensor.info.colorFilterArrangement enumeration values added since v3.2 + * @see ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT + */ +enum CameraMetadataEnumAndroidSensorInfoColorFilterArrangement : + @3.2::CameraMetadataEnumAndroidSensorInfoColorFilterArrangement { + ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_MONO, + ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_NIR, +}; + /** android.info.supportedBufferManagementVersion enumeration values * @see ANDROID_INFO_SUPPORTED_BUFFER_MANAGEMENT_VERSION */ diff --git a/camera/provider/2.4/vts/functional/Android.bp b/camera/provider/2.4/vts/functional/Android.bp index 2db1584c41..f8f058e26b 100644 --- a/camera/provider/2.4/vts/functional/Android.bp +++ b/camera/provider/2.4/vts/functional/Android.bp @@ -38,6 +38,7 @@ cc_test { "android.hardware.camera.device@3.3", "android.hardware.camera.device@3.4", "android.hardware.camera.device@3.5", + "android.hardware.camera.metadata@3.4", "android.hardware.camera.provider@2.4", "android.hardware.graphics.allocator@2.0", "android.hardware.graphics.common@1.0", diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index c324d59e6e..3f4d17ae50 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp @@ -33,6 +33,7 @@ #include <android/hardware/camera/device/3.4/ICameraDeviceSession.h> #include <android/hardware/camera/device/3.4/ICameraDeviceCallback.h> #include <android/hardware/camera/provider/2.4/ICameraProvider.h> +#include <android/hardware/camera/metadata/3.4/types.h> #include <android/hidl/manager/1.0/IServiceManager.h> #include <binder/MemoryHeapBase.h> #include <CameraMetadata.h> @@ -110,6 +111,7 @@ using ::android::hardware::camera::device::V1_0::CameraFrameMetadata; using ::android::hardware::camera::device::V1_0::ICameraDevicePreviewCallback; using ::android::hardware::camera::device::V1_0::FrameCallbackFlag; using ::android::hardware::camera::device::V1_0::HandleTimestampMessage; +using ::android::hardware::camera::metadata::V3_4::CameraMetadataEnumAndroidSensorInfoColorFilterArrangement; using ::android::hardware::MessageQueue; using ::android::hardware::kSynchronizedReadWrite; using ::android::hidl::allocator::V1_0::IAllocator; @@ -4891,8 +4893,10 @@ void CameraHidlTest::verifyMonochromeCharacteristics(const CameraMetadata& chars retcode = find_camera_metadata_ro_entry(metadata, ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT, &entry); if ((0 == retcode) && (entry.count == 1)) { - ASSERT_TRUE(entry.data.i32[0] == ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_MONO - || entry.data.i32[0] == ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_NIR); + ASSERT_TRUE(entry.data.i32[0] == static_cast<int32_t>( + CameraMetadataEnumAndroidSensorInfoColorFilterArrangement::ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_MONO) + || entry.data.i32[0] == static_cast<int32_t>( + CameraMetadataEnumAndroidSensorInfoColorFilterArrangement::ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_NIR)); } // Check availableRequestKeys |