summaryrefslogtreecommitdiff
path: root/camera/common/1.0/default/include/CameraModule.h
diff options
context:
space:
mode:
authorShuzhen Wang <shuzhenwang@google.com>2018-08-17 13:52:40 -0700
committerShuzhen Wang <shuzhenwang@google.com>2018-09-13 09:25:34 -0700
commitd3feb3d62c139f08879bbb7f7a0513d593dafcc0 (patch)
tree1edbaace64624647eb5d76763ccb27caeed78745 /camera/common/1.0/default/include/CameraModule.h
parent51a04b2fe26a5b3941af56cf836def3c2f37477f (diff)
Camera: Add support for physical camera characteristics query
- Add version 3.5 for ICameraDevice for physical camera characteristics query. - Add version 3.5 for ICameraDeviceSession to work around HIDL versioning bug. Test: Camera CTS Bug: 79523700 Change-Id: I8df6cdd4ee6ac5755758510c0dc1ea1cec31aa73
Diffstat (limited to 'camera/common/1.0/default/include/CameraModule.h')
-rw-r--r--camera/common/1.0/default/include/CameraModule.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/camera/common/1.0/default/include/CameraModule.h b/camera/common/1.0/default/include/CameraModule.h
index deebd09480..ed853bf85f 100644
--- a/camera/common/1.0/default/include/CameraModule.h
+++ b/camera/common/1.0/default/include/CameraModule.h
@@ -65,6 +65,7 @@ public:
void *getDso();
// Only used by CameraProvider
void removeCamera(int cameraId);
+ int getPhysicalCameraInfo(int physicalCameraId, camera_metadata_t **physicalInfo);
private:
// Derive camera characteristics keys defined after HAL device version
@@ -76,6 +77,7 @@ private:
camera_module_t *mModule;
KeyedVector<int, camera_info> mCameraInfoMap;
KeyedVector<int, int> mDeviceVersionMap;
+ KeyedVector<int, camera_metadata_t*> mPhysicalCameraInfoMap;
Mutex mCameraInfoLock;
};