diff options
author | Alex Ray <aray@google.com> | 2012-12-19 12:21:38 -0800 |
---|---|---|
committer | Alex Ray <aray@google.com> | 2013-01-03 21:06:17 -0800 |
commit | a48dd3fb34ac5b83bd397f53833f6dcc3469df76 (patch) | |
tree | a06e844a4d102fa6ba9bd7036afb45833de485c3 /modules/camera | |
parent | 2fb1aab2566bcdeb6489dd517713302c6fb1999b (diff) | |
download | hardware_libhardware-a48dd3fb34ac5b83bd397f53833f6dcc3469df76.zip hardware_libhardware-a48dd3fb34ac5b83bd397f53833f6dcc3469df76.tar.gz hardware_libhardware-a48dd3fb34ac5b83bd397f53833f6dcc3469df76.tar.bz2 |
modules: camera: Defer documenting API
Avoid duplicating the api docs in the example HAL, instead point to
canonical source for them.
Change-Id: If3f5acb7a73260248bd00ce01cb1c80f230f7188
Diffstat (limited to 'modules/camera')
-rw-r--r-- | modules/camera/Camera.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/modules/camera/Camera.h b/modules/camera/Camera.h index 72cbde2..ca66406 100644 --- a/modules/camera/Camera.h +++ b/modules/camera/Camera.h @@ -18,6 +18,7 @@ #define CAMERA_H_ #include <pthread.h> +#include <hardware/camera_common.h> #include <hardware/camera2.h> namespace default_camera_hal { @@ -37,15 +38,13 @@ class Camera { // module is a handle to the HAL module, used when the device is opened. Camera(int id, const hw_module_t* module); ~Camera(); - // Open this camera, preparing it for use. Returns nonzero on failure. + + // Common Camera Device Operations (see <hardware/camera_common.h>) + camera2_device_t mDevice; int open(); - // Close this camera. Returns nonzero on failure. int close(); - // Query for camera metadata, filling info struct. Returns nonzero if - // allocation or initialization failed. int getCameraInfo(struct camera_info* info); - // Handle to this device passed to framework in response to open(). - camera2_device_t mDevice; + private: // One-time initialization of camera metadata. void init(); |