Commit b8588f84 authored by Vladislav Sovrasov's avatar Vladislav Sovrasov

tracking: disable OCL in TLD (kernels are slow and broken)

parent ccfd55dc
...@@ -149,14 +149,14 @@ bool TrackerTLDImpl::updateImpl(const Mat& image, Rect2d& boundingBox) ...@@ -149,14 +149,14 @@ bool TrackerTLDImpl::updateImpl(const Mat& image, Rect2d& boundingBox)
if (i == 1) if (i == 1)
{ {
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
if (ocl::useOpenCL()) if (false)//ocl::useOpenCL())
{ {
DETECT_FLG = tldModel->detector->ocl_detect(imageForDetector, image_blurred, tmpCandid, detectorResults, tldModel->getMinSize()); DETECT_FLG = tldModel->detector->ocl_detect(imageForDetector, image_blurred, tmpCandid, detectorResults, tldModel->getMinSize());
} }
else else
#endif #endif
DETECT_FLG = tldModel->detector->detect(imageForDetector, image_blurred, tmpCandid, detectorResults, tldModel->getMinSize()); DETECT_FLG = tldModel->detector->detect(imageForDetector, image_blurred, tmpCandid, detectorResults, tldModel->getMinSize());
} }
if( ( (i == 0) && !data->failedLastTime && trackerProxy->update(image, tmpCandid) ) || ( DETECT_FLG)) if( ( (i == 0) && !data->failedLastTime && trackerProxy->update(image, tmpCandid) ) || ( DETECT_FLG))
{ {
candidates.push_back(tmpCandid); candidates.push_back(tmpCandid);
...@@ -223,7 +223,7 @@ bool TrackerTLDImpl::updateImpl(const Mat& image, Rect2d& boundingBox) ...@@ -223,7 +223,7 @@ bool TrackerTLDImpl::updateImpl(const Mat& image, Rect2d& boundingBox)
tldModel->integrateRelabeled(imageForDetector, image_blurred, detectorResults); tldModel->integrateRelabeled(imageForDetector, image_blurred, detectorResults);
pExpert.additionalExamples(examplesForModel, examplesForEnsemble); pExpert.additionalExamples(examplesForModel, examplesForEnsemble);
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
if (ocl::useOpenCL()) if (false)//ocl::useOpenCL())
tldModel->ocl_integrateAdditional(examplesForModel, examplesForEnsemble, true); tldModel->ocl_integrateAdditional(examplesForModel, examplesForEnsemble, true);
else else
#endif #endif
...@@ -232,7 +232,7 @@ bool TrackerTLDImpl::updateImpl(const Mat& image, Rect2d& boundingBox) ...@@ -232,7 +232,7 @@ bool TrackerTLDImpl::updateImpl(const Mat& image, Rect2d& boundingBox)
nExpert.additionalExamples(examplesForModel, examplesForEnsemble); nExpert.additionalExamples(examplesForModel, examplesForEnsemble);
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
if (ocl::useOpenCL()) if (false)//ocl::useOpenCL())
tldModel->ocl_integrateAdditional(examplesForModel, examplesForEnsemble, false); tldModel->ocl_integrateAdditional(examplesForModel, examplesForEnsemble, false);
else else
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment