dockerfile/openalpr-base
1
0
Fork 0
mirror of https://github.com/kerberos-io/openalpr-base.git synced 2025-10-06 11:26:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Made OpenCL GPU detector threadsafe

Browse Source
This commit is contained in:
Matt Hill
2015-09-14 20:36:29 -04:00
parent ec24d1d147
commit 5889ec6109
1 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/openalpr/detection/detectorocl.cpp
View File

@@ -18,23 +18,26 @@
*/ */
#include "detectorocl.h" #include "detectorocl.h"
#include <support/tinythread.h>
#if OPENCV_MAJOR_VERSION == 3 #if OPENCV_MAJOR_VERSION == 3
using namespace cv; using namespace cv;
using namespace std; using namespace std;
tthread::mutex ocl_detector_mutex_m;
namespace alpr namespace alpr
{ {
DetectorOCL::DetectorOCL(Config* config) : Detector(config) { DetectorOCL::DetectorOCL(Config* config) : Detector(config) {
tthread::lock_guard<tthread::mutex> guard(ocl_detector_mutex_m);
cv::ocl::setUseOpenCL(true); cv::ocl::setUseOpenCL(true);
if (!ocl::haveOpenCL()) if (!ocl::haveOpenCL())
{ {
this->loaded = false; this->loaded = false;
@@ -91,35 +94,56 @@ namespace alpr
vector<PlateRegion> DetectorOCL::doCascade(Mat orig_frame, int offset_x, int offset_y) vector<PlateRegion> DetectorOCL::doCascade(Mat orig_frame, int offset_x, int offset_y)
{ {
int w = orig_frame.size().width; int w = orig_frame.size().width;
int h = orig_frame.size().height; int h = orig_frame.size().height;
float scale_factor = computeScaleFactor(w, h); float scale_factor = computeScaleFactor(w, h);
UMat openclFrame;
orig_frame.copyTo(openclFrame);
vector<Rect> plates; vector<Rect> plates;
equalizeHist( openclFrame, openclFrame );
if (scale_factor != 1.0)
resize(openclFrame, openclFrame, Size(w * scale_factor, h * scale_factor));
//-- Detect plates //-- Detect plates
timespec startTime; timespec startTime;
getTimeMonotonic(&startTime); getTimeMonotonic(&startTime);
float maxWidth = ((float) w) * (config->maxPlateWidthPercent / 100.0f) * scale_factor; float maxWidth = ((float) w) * (config->maxPlateWidthPercent / 100.0f) * scale_factor;
float maxHeight = ((float) h) * (config->maxPlateHeightPercent / 100.0f) * scale_factor; float maxHeight = ((float) h) * (config->maxPlateHeightPercent / 100.0f) * scale_factor;
Size minSize(config->minPlateSizeWidthPx * scale_factor, config->minPlateSizeHeightPx * scale_factor); Size minSize(config->minPlateSizeWidthPx * scale_factor, config->minPlateSizeHeightPx * scale_factor);
Size maxSize(maxWidth, maxHeight); Size maxSize(maxWidth, maxHeight);
// If we have an OpenCL core available, use it. Otherwise use CPU
if (ocl_detector_mutex_m.try_lock())
{
UMat openclFrame;
orig_frame.copyTo(openclFrame);
equalizeHist( openclFrame, openclFrame );
if (scale_factor != 1.0)
resize(openclFrame, openclFrame, Size(w * scale_factor, h * scale_factor));
plate_cascade.detectMultiScale( openclFrame, plates, config->detection_iteration_increase, config->detectionStrictness, plate_cascade.detectMultiScale( openclFrame, plates, config->detection_iteration_increase, config->detectionStrictness,
0, 0,
//0|CV_HAAR_SCALE_IMAGE,
minSize, maxSize ); minSize, maxSize );
ocl_detector_mutex_m.unlock();
}
else
{
equalizeHist( orig_frame, orig_frame );
if (scale_factor != 1.0)
resize(orig_frame, orig_frame, Size(w * scale_factor, h * scale_factor));
plate_cascade.detectMultiScale( orig_frame, plates, config->detection_iteration_increase, config->detectionStrictness,
0,
minSize, maxSize );
}
if (config->debugTiming) if (config->debugTiming)
{ {