mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-03 00:10:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13164 from alalek:ocl_morph

Browse Source
This commit is contained in:
Alexander Alekhin 2018-11-14 19:32:32 +00:00
commit 02d2cc58d7
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/imgproc/src/morph.cpp
View File

@ -45,6 +45,7 @@
#include "opencl_kernels_imgproc.hpp" #include "opencl_kernels_imgproc.hpp"
#include <iostream> #include <iostream>
#include "hal_replacement.hpp" #include "hal_replacement.hpp"
#include <opencv2/core/utils/configuration.private.hpp>
/****************************************************************************************\ /****************************************************************************************\
Basic Morphological Operations: Erosion & Dilation Basic Morphological Operations: Erosion & Dilation
@ -1405,7 +1406,6 @@ void morph(int op, int src_type, int dst_type,
#define ROUNDUP(sz, n) ((sz) + (n) - 1 - (((sz) + (n) - 1) % (n))) #define ROUNDUP(sz, n) ((sz) + (n) - 1 - (((sz) + (n) - 1) % (n)))
#ifndef __APPLE__
static bool ocl_morph3x3_8UC1( InputArray _src, OutputArray _dst, InputArray _kernel, Point anchor, static bool ocl_morph3x3_8UC1( InputArray _src, OutputArray _dst, InputArray _kernel, Point anchor,
int op, int actual_op = -1, InputArray _extraMat = noArray()) int op, int actual_op = -1, InputArray _extraMat = noArray())
{ {
@ -1632,7 +1632,6 @@ static bool ocl_morphSmall( InputArray _src, OutputArray _dst, InputArray _kerne
return kernel.run(2, globalsize, NULL, false); return kernel.run(2, globalsize, NULL, false);
} }
#endif
static bool ocl_morphOp(InputArray _src, OutputArray _dst, InputArray _kernel, static bool ocl_morphOp(InputArray _src, OutputArray _dst, InputArray _kernel,
Point anchor, int iterations, int op, int borderType, Point anchor, int iterations, int op, int borderType,
@ -1652,24 +1651,33 @@ static bool ocl_morphOp(InputArray _src, OutputArray _dst, InputArray _kernel,
if (kernel.empty()) if (kernel.empty())
{ {
kernel = getStructuringElement(MORPH_RECT, Size(1+iterations*2,1+iterations*2)); ksize = Size(1+iterations*2,1+iterations*2);
kernel = getStructuringElement(MORPH_RECT, ksize);
anchor = Point(iterations, iterations); anchor = Point(iterations, iterations);
iterations = 1; iterations = 1;
CV_DbgAssert(ksize == kernel.size());
} }
else if( iterations > 1 && countNonZero(kernel) == kernel.rows*kernel.cols ) else if( iterations > 1 && countNonZero(kernel) == kernel.rows*kernel.cols )
{ {
ksize = Size(ksize.width + (iterations-1)*(ksize.width-1),
ksize.height + (iterations-1)*(ksize.height-1));
anchor = Point(anchor.x*iterations, anchor.y*iterations); anchor = Point(anchor.x*iterations, anchor.y*iterations);
kernel = getStructuringElement(MORPH_RECT, kernel = getStructuringElement(MORPH_RECT, ksize, anchor);
Size(ksize.width + (iterations-1)*(ksize.width-1),
ksize.height + (iterations-1)*(ksize.height-1)),
anchor);
iterations = 1; iterations = 1;
CV_DbgAssert(ksize == kernel.size());
} }
static bool param_use_morph_special_kernels = utils::getConfigurationParameterBool("OPENCV_OPENCL_IMGPROC_MORPH_SPECIAL_KERNEL",
#ifndef __APPLE__ #ifndef __APPLE__
true
#else
false
#endif
);
int esz = CV_ELEM_SIZE(type); int esz = CV_ELEM_SIZE(type);
// try to use OpenCL kernel adopted for small morph kernel // try to use OpenCL kernel adopted for small morph kernel
if (dev.isIntel() && if (param_use_morph_special_kernels && dev.isIntel() &&
((ksize.width < 5 && ksize.height < 5 && esz <= 4) || ((ksize.width < 5 && ksize.height < 5 && esz <= 4) ||
(ksize.width == 5 && ksize.height == 5 && cn == 1)) && (ksize.width == 5 && ksize.height == 5 && cn == 1)) &&
(iterations == 1) (iterations == 1)
@ -1681,7 +1689,6 @@ static bool ocl_morphOp(InputArray _src, OutputArray _dst, InputArray _kernel,
if (ocl_morphSmall(_src, _dst, kernel, anchor, borderType, op, actual_op, _extraMat)) if (ocl_morphSmall(_src, _dst, kernel, anchor, borderType, op, actual_op, _extraMat))
return true; return true;
} }
#endif
if (iterations == 0 || kernel.rows*kernel.cols == 1) if (iterations == 0 || kernel.rows*kernel.cols == 1)
{ {

12
modules/imgproc/test/ocl/test_filters.cpp
View File

@ -442,7 +442,7 @@ OCL_TEST_P(Erode, Mat)
for (int j = 0; j < test_loop_times; j++) for (int j = 0; j < test_loop_times; j++)
{ {
random_roi(); random_roi();
Mat kernel = ksize==0 ? Mat() : randomMat(kernelSize, CV_8UC1, 0, 3); Mat kernel = ksize==0 ? Mat() : randomMat(kernelSize, CV_8UC1, 0, 2);
OCL_OFF(cv::erode(src_roi, dst_roi, kernel, Point(-1, -1), iterations) ); OCL_OFF(cv::erode(src_roi, dst_roi, kernel, Point(-1, -1), iterations) );
OCL_ON(cv::erode(usrc_roi, udst_roi, kernel, Point(-1, -1), iterations) ); OCL_ON(cv::erode(usrc_roi, udst_roi, kernel, Point(-1, -1), iterations) );
@ -464,7 +464,7 @@ OCL_TEST_P(Dilate, Mat)
for (int j = 0; j < test_loop_times; j++) for (int j = 0; j < test_loop_times; j++)
{ {
random_roi(); random_roi();
Mat kernel = ksize==0 ? Mat() : randomMat(kernelSize, CV_8UC1, 0, 3); Mat kernel = ksize==0 ? Mat() : randomMat(kernelSize, CV_8UC1, 0, 2);
OCL_OFF(cv::dilate(src_roi, dst_roi, kernel, Point(-1, -1), iterations) ); OCL_OFF(cv::dilate(src_roi, dst_roi, kernel, Point(-1, -1), iterations) );
OCL_ON(cv::dilate(usrc_roi, udst_roi, kernel, Point(-1, -1), iterations) ); OCL_ON(cv::dilate(usrc_roi, udst_roi, kernel, Point(-1, -1), iterations) );
@ -728,19 +728,19 @@ OCL_INSTANTIATE_TEST_CASE_P(Filter, GaussianBlur_multicols, Combine(
OCL_INSTANTIATE_TEST_CASE_P(Filter, Erode, Combine( OCL_INSTANTIATE_TEST_CASE_P(Filter, Erode, Combine(
Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_32FC1, CV_32FC3, CV_32FC4, CV_64FC1, CV_64FC4), Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_32FC1, CV_32FC3, CV_32FC4, CV_64FC1, CV_64FC4),
Values(0, 3, 5, 7), // kernel size, 0 means kernel = Mat() Values(0, 5, 7, 9), // kernel size, 0 means kernel = Mat()
Values(Size(0, 0)), //not used Values(Size(0, 0)), //not used
Values((BorderType)BORDER_CONSTANT), Values((BorderType)BORDER_CONSTANT),
Values(1.0, 2.0, 3.0), Values(1.0, 2.0, 3.0, 4.0),
Bool(), Bool(),
Values(1))); // not used Values(1))); // not used
OCL_INSTANTIATE_TEST_CASE_P(Filter, Dilate, Combine( OCL_INSTANTIATE_TEST_CASE_P(Filter, Dilate, Combine(
Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_32FC1, CV_32FC3, CV_32FC4, CV_64FC1, CV_64FC4), Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_32FC1, CV_32FC3, CV_32FC4, CV_64FC1, CV_64FC4),
Values(0, 3, 5, 7), // kernel size, 0 means kernel = Mat() Values(0, 3, 5, 7, 9), // kernel size, 0 means kernel = Mat()
Values(Size(0, 0)), // not used Values(Size(0, 0)), // not used
Values((BorderType)BORDER_CONSTANT), Values((BorderType)BORDER_CONSTANT),
Values(1.0, 2.0, 3.0), Values(1.0, 2.0, 3.0, 4.0),
Bool(), Bool(),
Values(1))); // not used Values(1))); // not used