diff options
| -rwxr-xr-x | camera/Android.mk | 9 | ||||
| -rwxr-xr-x | camera/OMXCameraAdapter/OMXCameraAdapter.cpp | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index a11c728..95f19f8 100755 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -109,8 +109,7 @@ TI_CAMERAHAL_OMX_SRC := \ OMXCameraAdapter/OMXFocus.cpp \ OMXCameraAdapter/OMXMetadata.cpp \ OMXCameraAdapter/OMXZoom.cpp \ - OMXCameraAdapter/OMXDccDataSave.cpp \ - OMXCameraAdapter/OMXDCC.cpp + OMXCameraAdapter/OMXDccDataSave.cpp TI_CAMERAHAL_USB_SRC := \ V4LCameraAdapter/V4LCameraAdapter.cpp \ @@ -265,6 +264,12 @@ LOCAL_STATIC_LIBRARIES := $(TI_CAMERAHAL_COMMON_STATIC_LIBRARIES) LOCAL_CFLAGS := -fno-short-enums -DCOPY_IMAGE_BUFFER $(CAMERAHAL_CFLAGS) +ifdef TI_CAMERAHAL_USES_LEGACY_DOMX_DCC +LOCAL_CFLAGS += -DUSES_LEGACY_DOMX_DCC +else +LOCAL_SRC_FILES += OMXCameraAdapter/OMXDCC.cpp +endif + LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw LOCAL_MODULE:= camera.$(TARGET_BOARD_PLATFORM) LOCAL_MODULE_TAGS:= optional diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp index afe5e80..ce0c117 100755 --- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp +++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp @@ -23,7 +23,9 @@ #include "CameraHal.h" #include "OMXCameraAdapter.h" +#ifndef USES_LEGACY_DOMX_DCC #include "OMXDCC.h" +#endif #include "ErrorUtils.h" #include "TICameraParameters.h" #include <signal.h> @@ -4458,8 +4460,10 @@ extern "C" status_t OMXCameraAdapter_Capabilities( goto EXIT; } +#ifndef USES_LEGACY_DOMX_DCC DCCHandler dcc_handler; dcc_handler.loadDCC(handler.componentRef()); +#endif // Continue selecting sensor and then querying OMX Camera for it's capabilities // When sensor select returns an error, we know to break and stop |