commit b8bb78f54b48868465a9d69d65fda08524ab5ae1
author Chih-Chung Chang <chihchung@google.com> Thu Jun 10 13:32:16 2010 +0800
committer Chih-Chung Chang <chihchung@google.com> Fri Jun 11 16:47:33 2010 +0800
tree fadbdd8dd989ce2b3b29cd780fabc91d7f98dd09
parent 2fd73a452268d2acb6e72a1d23a422085ed3c510

Change camera interface to support multiple cameras.

Change-Id: Ie88fe706d2278acf762eca87780de349434778a4

camera/libcameraservice/CameraService.h

diff --git a/camera/libcameraservice/CameraService.h b/camera/libcameraservice/CameraService.h
index 86986ca..8193e77 100644
--- a/camera/libcameraservice/CameraService.h
+++ b/camera/libcameraservice/CameraService.h
@@ -40,6 +40,8 @@
     virtual             ~CameraService();
 
     virtual int32_t     getNumberOfCameras();
+    virtual status_t    getCameraInfo(int cameraId,
+                                      struct CameraInfo* cameraInfo);
     virtual sp<ICamera> connect(const sp<ICameraClient>& cameraClient, int cameraId);
     virtual void        removeClient(const sp<ICameraClient>& cameraClient);
     virtual sp<Client>  getClientById(int cameraId);
@@ -61,6 +63,7 @@
 private:
     Mutex               mServiceLock;
     wp<Client>          mClient[MAX_CAMERAS];  // protected by mServiceLock
+    int                 mNumberOfCameras;
 
     // atomics to record whether the hardware is allocated to some client.
     volatile int32_t    mBusy[MAX_CAMERAS];