summaryrefslogtreecommitdiffstats
path: root/camera/OMXCameraAdapter
diff options
context:
space:
mode:
authorHashcode <hashcode0f@gmail.com>2015-02-03 13:56:50 -0800
committerHashcode <hashcode0f@gmail.com>2015-02-03 13:56:50 -0800
commit90007397e53d5b94763946ce2c90004d98aa7ed6 (patch)
treef3de7e4b95b3268931e42205bdce7d528adf7f55 /camera/OMXCameraAdapter
parente62d3a9f34e9527c5ecc014c78ee44d2833f3d47 (diff)
downloadhardware_ti_omap4-90007397e53d5b94763946ce2c90004d98aa7ed6.tar.gz
hardware_ti_omap4-90007397e53d5b94763946ce2c90004d98aa7ed6.tar.bz2
hardware_ti_omap4-90007397e53d5b94763946ce2c90004d98aa7ed6.zip
camera: add TI_CAMERAHAL_USES_LEGACY_DOMX_DCC board flag to enable legacy DCC
Diffstat (limited to 'camera/OMXCameraAdapter')
-rwxr-xr-xcamera/OMXCameraAdapter/OMXCameraAdapter.cpp4
1 files changed, 4 insertions, 0 deletions
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