Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Camera: Fix MONO and NIR enumeration version"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-11-29 06:38:47 +00:00
committed by Android (Google) Code Review
parent 868c0694bb a5504b86ec
commit 0396331a72
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
camera/metadata/3.4/types.hal
View File

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

1
camera/provider/2.4/vts/functional/Android.bp
View File

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

8
camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
View File

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