diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-09-25 17:01:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-25 17:01:19 -0700 |
| commit | 3c928c3a7a9684501664a59082a2583347e47664 (patch) | |
| tree | 530aa9fd4b8e26b747adf7d6ebdc503534767379 /include | |
| parent | 62dbe93f7743061e97fc3299386a2f887ca748cf (diff) | |
| parent | 369af71eb7e402ee68b66b0f0ede5d4d40c857d1 (diff) | |
| download | frameworks_av-3c928c3a7a9684501664a59082a2583347e47664.zip frameworks_av-3c928c3a7a9684501664a59082a2583347e47664.tar.gz frameworks_av-3c928c3a7a9684501664a59082a2583347e47664.tar.bz2 | |
am 369af71e: am 6914de6d: Merge "Camera: Implement getCameraCharacteristics" into klp-dev
* commit '369af71eb7e402ee68b66b0f0ede5d4d40c857d1':
Camera: Implement getCameraCharacteristics
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera/ICameraService.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/camera/ICameraService.h b/include/camera/ICameraService.h index 0e10699..f342122 100644 --- a/include/camera/ICameraService.h +++ b/include/camera/ICameraService.h @@ -30,6 +30,7 @@ class IProCameraCallbacks; class ICameraServiceListener; class ICameraDeviceUser; class ICameraDeviceCallbacks; +class CameraMetadata; class ICameraService : public IInterface { @@ -45,6 +46,7 @@ public: CONNECT_DEVICE, ADD_LISTENER, REMOVE_LISTENER, + GET_CAMERA_CHARACTERISTICS, }; enum { @@ -58,6 +60,9 @@ public: virtual status_t getCameraInfo(int cameraId, struct CameraInfo* cameraInfo) = 0; + virtual status_t getCameraCharacteristics(int cameraId, + CameraMetadata* cameraInfo) = 0; + // Returns 'OK' if operation succeeded // - Errors: ALREADY_EXISTS if the listener was already added virtual status_t addListener(const sp<ICameraServiceListener>& listener) |