summaryrefslogtreecommitdiffstats
path: root/modules/camera/CameraHAL.h
diff options
context:
space:
mode:
authorAlex Ray <aray@google.com>2013-02-25 15:02:16 -0800
committerAlex Ray <aray@google.com>2013-02-27 00:02:37 -0800
commita0ed4bead4d7a9b9031f7cefe0ef49a951443461 (patch)
treeb02ec06826a5358c28b86010902ea684a7ff7fe4 /modules/camera/CameraHAL.h
parent819cfd87bad560fbd89747371088ad35aaef8d43 (diff)
downloadhardware_libhardware-a0ed4bead4d7a9b9031f7cefe0ef49a951443461.zip
hardware_libhardware-a0ed4bead4d7a9b9031f7cefe0ef49a951443461.tar.gz
hardware_libhardware-a0ed4bead4d7a9b9031f7cefe0ef49a951443461.tar.bz2
modules: camera: Camera v3 Devices
Default camera HAL statically allocates camera devices. Update camera device to API v3. Change-Id: Ic53ffcf3b746b9b4011b932e26dbb0f533cba554
Diffstat (limited to 'modules/camera/CameraHAL.h')
-rw-r--r--modules/camera/CameraHAL.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/camera/CameraHAL.h b/modules/camera/CameraHAL.h
index b53ab31..ba0db4e 100644
--- a/modules/camera/CameraHAL.h
+++ b/modules/camera/CameraHAL.h
@@ -17,8 +17,10 @@
#ifndef CAMERA_HAL_H_
#define CAMERA_HAL_H_
+#include <cutils/bitops.h>
#include <hardware/hardware.h>
#include <hardware/camera_common.h>
+#include "Camera.h"
namespace default_camera_hal {
// CameraHAL contains all module state that isn't specific to an individual
@@ -41,6 +43,8 @@ class CameraHAL {
const int mNumberOfCameras;
// Callback handle
const camera_module_callbacks_t *mCallbacks;
+ // Array of camera devices, contains mNumberOfCameras device pointers
+ Camera **mCameras;
};
} // namespace default_camera_hal