diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-09-25 23:52:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-25 23:52:07 +0000 |
| commit | 6914de6dd1d74fcf74e3247c89f9293fbf7bafe5 (patch) | |
| tree | a112a276227b9c897fe2bd25a8ad70b51b7155e5 /include | |
| parent | 1802399c7c4d8557922688f246df292703f417f1 (diff) | |
| parent | 2b59be89dc245b6e2475d9e8b0c5f2392370e71e (diff) | |
| download | frameworks_av-6914de6dd1d74fcf74e3247c89f9293fbf7bafe5.zip frameworks_av-6914de6dd1d74fcf74e3247c89f9293fbf7bafe5.tar.gz frameworks_av-6914de6dd1d74fcf74e3247c89f9293fbf7bafe5.tar.bz2 | |
Merge "Camera: Implement getCameraCharacteristics" into klp-dev
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) |