diff options
author | Alex Ray <aray@google.com> | 2013-07-03 17:54:19 -0700 |
---|---|---|
committer | Alex Ray <aray@google.com> | 2013-10-17 16:50:48 -0700 |
commit | 61f7a0c1c1aa481d798116e5a218df04630886e6 (patch) | |
tree | f402943f42231adf3ed56edb22947ea6a8f08d5f /modules/camera/CameraHAL.cpp | |
parent | f75ccb96b103c70199fe84d2b9ff0a9d027e326e (diff) | |
download | hardware_libhardware-61f7a0c1c1aa481d798116e5a218df04630886e6.zip hardware_libhardware-61f7a0c1c1aa481d798116e5a218df04630886e6.tar.gz hardware_libhardware-61f7a0c1c1aa481d798116e5a218df04630886e6.tar.bz2 |
modules: camera: Abstract device-specific camera
ExampleCamera represents a specific (e.g. front or back) camera device,
and contains all the device and logic for that device/sensor.
Change-Id: Iecc1a1d905501a66edb6e3994ff93d8761b82f8b
Diffstat (limited to 'modules/camera/CameraHAL.cpp')
-rw-r--r-- | modules/camera/CameraHAL.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/modules/camera/CameraHAL.cpp b/modules/camera/CameraHAL.cpp index dfbbe4c..9a13c98 100644 --- a/modules/camera/CameraHAL.cpp +++ b/modules/camera/CameraHAL.cpp @@ -17,7 +17,7 @@ #include <cstdlib> #include <hardware/camera_common.h> #include <hardware/hardware.h> -#include "Camera.h" +#include "ExampleCamera.h" //#define LOG_NDEBUG 0 #define LOG_TAG "DefaultCameraHAL" @@ -43,20 +43,17 @@ CameraHAL::CameraHAL(int num_cameras) : mNumberOfCameras(num_cameras), mCallbacks(NULL) { - int i; - // Allocate camera array and instantiate camera devices mCameras = new Camera*[mNumberOfCameras]; - for (i = 0; i < mNumberOfCameras; i++) { - mCameras[i] = new Camera(i); - } + // Rear camera + mCameras[0] = new ExampleCamera(0); + // Front camera + mCameras[1] = new ExampleCamera(1); } CameraHAL::~CameraHAL() { - int i; - - for (i = 0; i < mNumberOfCameras; i++) { + for (int i = 0; i < mNumberOfCameras; i++) { delete mCameras[i]; } delete [] mCameras; |