camera: bugfixes for updated camera HAL

- Add MAX_CAMERAS board config to limit scanning of omx cameras
(Jem has 2 extra configs which don't exist)
- Add TREAT_FRONT_AS_BACK board config to pass the front camera
off to the framework as a back camera to fix Panorama modes
- ifdef VT slices code which is only used in CPCAM mode

Change-Id: I273ec01403e216c544722e681c96ae7e1220b8d7

4 files changed, 16 insertions, 0 deletions

diff --git a/camera/Android.mk b/camera/Android.mk
index 9735481..1978dc8 100755
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -36,6 +36,14 @@ ifdef TI_CAMERAHAL_PROFILING
     CAMERAHAL_CFLAGS += -DCAMERAHAL_OMX_PROFILING
 endif
 
+ifdef TI_CAMERAHAL_MAX_CAMERAS_SUPPORTED
+    CAMERAHAL_CFLAGS += -DMAX_CAMERAS_SUPPORTED=$(TI_CAMERAHAL_MAX_CAMERAS_SUPPORTED)
+endif
+
+ifdef TI_CAMERAHAL_TREAT_FRONT_AS_BACK
+    CAMERAHAL_CFLAGS += -DTREAT_FRONT_AS_BACK
+endif
+
 ifeq ($(findstring omap5, $(TARGET_BOARD_PLATFORM)),omap5)
     CAMERAHAL_CFLAGS += -DCAMERAHAL_OMAP5_CAPTURE_MODES
 endif
diff --git a/camera/CameraHal_Module.cpp b/camera/CameraHal_Module.cpp
index a9277a2..21dcc1a 100644
--- a/camera/CameraHal_Module.cpp
+++ b/camera/CameraHal_Module.cpp
@@ -808,7 +808,11 @@ int camera_get_camera_info(int camera_id, struct camera_info *info)
         {
             if (strcmp(valstr, TICameraParameters::FACING_FRONT) == 0)
             {
+#ifndef TREAT_FRONT_AS_BACK
                 face_value = CAMERA_FACING_FRONT;
+#else
+                face_value = CAMERA_FACING_BACK;
+#endif
             }
             else if (strcmp(valstr, TICameraParameters::FACING_BACK) == 0)
             {
diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
index a6448c8..afe5e80 100755
--- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
+++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
@@ -2201,7 +2201,9 @@ status_t OMXCameraAdapter::startPreview()
     // Enable all preview mode extra data.
     if ( OMX_ErrorNone == eError) {
         ret |= setExtraData(true, mCameraAdapterParameters.mPrevPortIndex, OMX_AncillaryData);
+#ifdef OMAP_ENHANCEMENT_CPCAM
         ret |= setExtraData(true, OMX_ALL, OMX_TI_VectShotInfo);
+#endif
 #ifdef CAMERAHAL_OMX_PROFILING
         if ( UNLIKELY( mDebugProfile ) ) {
             ret |= setExtraData(true, OMX_ALL, OMX_TI_ProfilerData);
diff --git a/camera/inc/CameraProperties.h b/camera/inc/CameraProperties.h
index 6d92341..0c003c3 100644
--- a/camera/inc/CameraProperties.h
+++ b/camera/inc/CameraProperties.h
@@ -35,7 +35,9 @@
 namespace Ti {
 namespace Camera {
 
+#ifndef MAX_CAMERAS_SUPPORTED
 #define MAX_CAMERAS_SUPPORTED 3
+#endif
 #define MAX_SIMUL_CAMERAS_SUPPORTED 1
 #define MAX_PROP_NAME_LENGTH 50
 #define MAX_PROP_VALUE_LENGTH 2048