diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-02-06 17:20:07 -0800 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2013-02-27 12:47:21 -0800 |
| commit | 7fa43f376ebd63fda24d85c9ebf97e0ddf534083 (patch) | |
| tree | 46c73e2599e85fe59accef0c7efd4780b47f26a3 /services/camera/libcameraservice/Camera2Client.h | |
| parent | f5daac4225905184b8d7cdd2fd87247d73e27ea7 (diff) | |
| download | frameworks_av-7fa43f376ebd63fda24d85c9ebf97e0ddf534083.zip frameworks_av-7fa43f376ebd63fda24d85c9ebf97e0ddf534083.tar.gz frameworks_av-7fa43f376ebd63fda24d85c9ebf97e0ddf534083.tar.bz2 | |
Camera: Start of support for version 3.0 of camera device HAL
- Refactor common CameraDevice interface out of Camera2Device
- Initial skeleton only for Camera3Device
Change-Id: I097cc76e2ad102a51712ac114235163245f5482c
Diffstat (limited to 'services/camera/libcameraservice/Camera2Client.h')
| -rw-r--r-- | services/camera/libcameraservice/Camera2Client.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/services/camera/libcameraservice/Camera2Client.h b/services/camera/libcameraservice/Camera2Client.h index 173b65e..80b88f4 100644 --- a/services/camera/libcameraservice/Camera2Client.h +++ b/services/camera/libcameraservice/Camera2Client.h @@ -17,7 +17,7 @@ #ifndef ANDROID_SERVERS_CAMERA_CAMERA2CLIENT_H #define ANDROID_SERVERS_CAMERA_CAMERA2CLIENT_H -#include "Camera2Device.h" +#include "CameraDeviceBase.h" #include "CameraService.h" #include "camera2/Parameters.h" #include "camera2/FrameProcessor.h" @@ -31,12 +31,12 @@ namespace android { class IMemory; /** - * Implements the android.hardware.camera API on top of - * camera device HAL version 2. + * Interface between android.hardware.Camera API and Camera HAL device for versions + * CAMERA_DEVICE_API_VERSION_2_0 and 3_0. */ class Camera2Client : public CameraService::Client, - public Camera2Device::NotificationListener + public CameraDeviceBase::NotificationListener { public: /** @@ -77,7 +77,9 @@ public: int cameraFacing, int clientPid, uid_t clientUid, - int servicePid); + int servicePid, + int deviceVersion); + virtual ~Camera2Client(); status_t initialize(camera_module_t *module); @@ -85,7 +87,7 @@ public: virtual status_t dump(int fd, const Vector<String16>& args); /** - * Interface used by Camera2Device + * Interface used by CameraDeviceBase */ virtual void notifyError(int errorCode, int arg1, int arg2); @@ -99,7 +101,7 @@ public: */ int getCameraId() const; - const sp<Camera2Device>& getCameraDevice(); + const sp<CameraDeviceBase>& getCameraDevice(); const sp<CameraService>& getCameraService(); camera2::SharedParameters& getParameters(); @@ -211,9 +213,9 @@ private: bool mAfInMotion; - /** Camera2Device instance wrapping HAL2 entry */ + /** CameraDevice instance, wraps HAL camera device */ - sp<Camera2Device> mDevice; + sp<CameraDeviceBase> mDevice; /** Utility members */ |