generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix some bug about haar and match_template.

Browse Source
This commit is contained in:
perping 2013-11-12 13:56:47 +08:00
parent 73b34e3f85
commit 8af626d295
3 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ocl/perf/perf_match_template.cpp
View File

@ -108,13 +108,13 @@ PERF_TEST_P(CV_TM_CCORR_NORMEDFixture, matchTemplate, OCL_TYPICAL_MAT_SIZES)
oclDst.download(dst);
SANITY_CHECK(dst, 2e-2);
SANITY_CHECK(dst, 3e-2);
}
else if (RUN_PLAIN_IMPL)
{
TEST_CYCLE() cv::matchTemplate(src, templ, dst, CV_TM_CCORR_NORMED);
SANITY_CHECK(dst, 2e-2);
SANITY_CHECK(dst, 3e-2);
}
else
OCL_PERF_ELSE

34
modules/ocl/src/haar.cpp
View File

@ -754,6 +754,15 @@ CvSeq *cv::ocl::OclCascadeClassifier::oclHaarDetectObjects( oclMat &gimg, CvMemS
cv::Rect roi, roi2;
cv::Mat imgroi, imgroisq;
cv::ocl::oclMat resizeroi, gimgroi, gimgroisq;
int sdepth = 0;
if(gsqsum.clCxt->supportsFeature(ocl::FEATURE_CL_DOUBLE))
sdepth = CV_64FC1;
else
sdepth = CV_32FC1;
sdepth = CV_MAT_DEPTH(sdepth);
int type = CV_MAKE_TYPE(sdepth, 1);
cv::ocl::oclMat gsqsum_t(gsqsum.size(), type);
int grp_per_CU = 12;
size_t blocksize = 8;
@ -773,7 +782,7 @@ CvSeq *cv::ocl::OclCascadeClassifier::oclHaarDetectObjects( oclMat &gimg, CvMemS
roi2 = Rect(0, 0, sz.width - 1, sz.height - 1);
resizeroi = gimg1(roi2);
gimgroi = gsum(roi);
gimgroisq = gsqsum(roi);
gimgroisq = gsqsum_t(roi);
int width = gimgroi.cols - 1 - cascade->orig_window_size.width;
int height = gimgroi.rows - 1 - cascade->orig_window_size.height;
scaleinfo[i].width_height = (width << 16) | height;
@ -787,8 +796,10 @@ CvSeq *cv::ocl::OclCascadeClassifier::oclHaarDetectObjects( oclMat &gimg, CvMemS
scaleinfo[i].factor = factor;
cv::ocl::resize(gimg, resizeroi, Size(sz.width - 1, sz.height - 1), 0, 0, INTER_LINEAR);
cv::ocl::integral(resizeroi, gimgroi, gimgroisq);
indexy += sz.height;
}
gsqsum_t.convertTo(gsqsum, CV_32FC1);
gcascade = (GpuHidHaarClassifierCascade *)cascade->hid_cascade;
stage = (GpuHidHaarStageClassifier *)(gcascade + 1);
@ -996,7 +1007,9 @@ CvSeq *cv::ocl::OclCascadeClassifier::oclHaarDetectObjects( oclMat &gimg, CvMemS
int n_factors = 0;
oclMat gsum;
oclMat gsqsum;
cv::ocl::integral(gimg, gsum, gsqsum);
cv::ocl::oclMat gsqsum_t;
cv::ocl::integral(gimg, gsum, gsqsum_t);
gsqsum_t.convertTo(gsqsum, CV_32FC1);
CvSize sz;
vector<CvSize> sizev;
vector<float> scalev;
@ -1259,10 +1272,19 @@ void cv::ocl::OclCascadeClassifierBuf::detectMultiScale(oclMat &gimg, CV_OUT std
if( (flags & CV_HAAR_SCALE_IMAGE) )
{
int indexy = 0;
int sdepth = 0;
CvSize sz;
cv::Rect roi, roi2;
cv::ocl::oclMat resizeroi, gimgroi, gimgroisq;
if(gsqsum.clCxt->supportsFeature(ocl::FEATURE_CL_DOUBLE))
sdepth = CV_64FC1;
else
sdepth = CV_32FC1;
sdepth = CV_MAT_DEPTH(sdepth);
int type = CV_MAKE_TYPE(sdepth, 1);
cv::ocl::oclMat gsqsum_t(gsqsum.size(), type);
for( int i = 0; i < m_loopcount; i++ )
{
@ -1271,13 +1293,13 @@ void cv::ocl::OclCascadeClassifierBuf::detectMultiScale(oclMat &gimg, CV_OUT std
roi2 = Rect(0, 0, sz.width - 1, sz.height - 1);
resizeroi = gimg1(roi2);
gimgroi = gsum(roi);
gimgroisq = gsqsum(roi);
gimgroisq = gsqsum_t(roi);
cv::ocl::resize(gimg, resizeroi, Size(sz.width - 1, sz.height - 1), 0, 0, INTER_LINEAR);
cv::ocl::integral(resizeroi, gimgroi, gimgroisq);
indexy += sz.height;
}
gsqsum_t.convertTo(gsqsum, CV_32FC1);
gcascade = (GpuHidHaarClassifierCascade *)(cascade->hid_cascade);
stage = (GpuHidHaarStageClassifier *)(gcascade + 1);
@ -1338,7 +1360,9 @@ void cv::ocl::OclCascadeClassifierBuf::detectMultiScale(oclMat &gimg, CV_OUT std
}
else
{
cv::ocl::integral(gimg, gsum, gsqsum);
cv::ocl::oclMat gsqsum_t;
cv::ocl::integral(gimg, gsum, gsqsum_t);
gsqsum_t.convertTo(gsqsum, CV_32FC1);
gcascade = (GpuHidHaarClassifierCascade *)cascade->hid_cascade;

6
modules/ocl/src/match_template.cpp
View File

@ -245,12 +245,12 @@ namespace cv
void matchTemplate_CCORR_NORMED(
const oclMat &image, const oclMat &templ, oclMat &result, MatchTemplateBuf &buf)
{
cv::ocl::oclMat temp;
matchTemplate_CCORR(image, templ, result, buf);
buf.image_sums.resize(1);
buf.image_sqsums.resize(1);
integral(image.reshape(1), buf.image_sums[0], buf.image_sqsums[0]);
integral(image.reshape(1), buf.image_sums[0], temp);
temp.convertTo(buf.image_sqsums[0], CV_32FC1);
unsigned long long templ_sqsum = (unsigned long long)sqrSum(templ.reshape(1))[0];
Context *clCxt = image.clCxt;