diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2010-05-06 16:36:58 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2010-05-10 11:21:14 +0800 |
| commit | 35a055b8bfc6f3cbea409b2897caf936654519cb (patch) | |
| tree | f2167d55486fd370d24e68aabe1ae37879cde8ec /include/camera | |
| parent | d8a30349da270715156d3f658b165481ce10cf71 (diff) | |
| download | frameworks_av-35a055b8bfc6f3cbea409b2897caf936654519cb.zip frameworks_av-35a055b8bfc6f3cbea409b2897caf936654519cb.tar.gz frameworks_av-35a055b8bfc6f3cbea409b2897caf936654519cb.tar.bz2 | |
Support multiple cameras in framework.
Change-Id: I081f0fbdca4b633715ea7c3b3d42f8662d27598a
Diffstat (limited to 'include/camera')
| -rw-r--r-- | include/camera/Camera.h | 3 | ||||
| -rw-r--r-- | include/camera/ICameraService.h | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/camera/Camera.h b/include/camera/Camera.h index ee2b30c..1beac27 100644 --- a/include/camera/Camera.h +++ b/include/camera/Camera.h @@ -113,7 +113,8 @@ class Camera : public BnCameraClient, public IBinder::DeathRecipient public: // construct a camera client from an existing remote static sp<Camera> create(const sp<ICamera>& camera); - static sp<Camera> connect(); + static int32_t getNumberOfCameras(); + static sp<Camera> connect(int cameraId); ~Camera(); void init(); diff --git a/include/camera/ICameraService.h b/include/camera/ICameraService.h index 82b1283..dcd434f 100644 --- a/include/camera/ICameraService.h +++ b/include/camera/ICameraService.h @@ -30,13 +30,16 @@ class ICameraService : public IInterface { public: enum { - CONNECT = IBinder::FIRST_CALL_TRANSACTION, + GET_NUMBER_OF_CAMERAS = IBinder::FIRST_CALL_TRANSACTION, + CONNECT }; public: DECLARE_META_INTERFACE(CameraService); - virtual sp<ICamera> connect(const sp<ICameraClient>& cameraClient) = 0; + virtual int32_t getNumberOfCameras() = 0; + virtual sp<ICamera> connect(const sp<ICameraClient>& cameraClient, + int cameraId) = 0; }; // ---------------------------------------------------------------------------- |