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

added CV_16UC(1, 3, 4), CV_16SC(1, 3, 4) data types support in ocl::pyrUp and ocl::pyrDown

Browse Source
This commit is contained in:
Ilya Lavrenov
2013-09-10 11:53:34 +04:00
parent 747f7178ca
commit 6b9c451938
5 changed files with 791 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
modules/ocl/test/test_pyramids.cpp
View File

@@ -57,60 +57,63 @@ using namespace std;
PARAM_TEST_CASE(PyrBase, MatType, int)
{
int type;
int depth;
int channels;
Mat dst_cpu;
oclMat gdst;
virtual void SetUp()
{
type = GET_PARAM(0);
depth = GET_PARAM(0);
channels = GET_PARAM(1);
}
};
/////////////////////// PyrDown //////////////////////////
struct PyrDown : PyrBase {};
typedef PyrBase PyrDown;
TEST_P(PyrDown, Mat)
{
for(int j = 0; j < LOOP_TIMES; j++)
for (int j = 0; j < LOOP_TIMES; j++)
{
Size size(MWIDTH, MHEIGHT);
Mat src = randomMat(size, CV_MAKETYPE(type, channels));
Mat src = randomMat(size, CV_MAKETYPE(depth, channels));
oclMat gsrc(src);
pyrDown(src, dst_cpu);
pyrDown(gsrc, gdst);
EXPECT_MAT_NEAR(dst_cpu, Mat(gdst), type == CV_32F ? 1e-4f : 1.0f);
EXPECT_MAT_NEAR(dst_cpu, Mat(gdst), depth == CV_32F ? 1e-4f : 1.0f);
}
}
INSTANTIATE_TEST_CASE_P(OCL_ImgProc, PyrDown, Combine(
Values(CV_8U, CV_32F), Values(1, 3, 4)));
Values(CV_8U, CV_16U, CV_16S, CV_32F),
Values(1, 3, 4)));
/////////////////////// PyrUp //////////////////////////
struct PyrUp : PyrBase {};
typedef PyrBase PyrUp;
TEST_P(PyrUp, Accuracy)
{
for(int j = 0; j < LOOP_TIMES; j++)
for (int j = 0; j < LOOP_TIMES; j++)
{
Size size(MWIDTH, MHEIGHT);
Mat src = randomMat(size, CV_MAKETYPE(type, channels));
Mat src = randomMat(size, CV_MAKETYPE(depth, channels));
oclMat gsrc(src);
pyrUp(src, dst_cpu);
pyrUp(gsrc, gdst);
EXPECT_MAT_NEAR(dst_cpu, Mat(gdst), (type == CV_32F ? 1e-4f : 1.0));
EXPECT_MAT_NEAR(dst_cpu, Mat(gdst), (depth == CV_32F ? 1e-4f : 1.0));
}
}
INSTANTIATE_TEST_CASE_P(OCL_ImgProc, PyrUp, testing::Combine(
Values(CV_8U, CV_32F), Values(1, 3, 4)));
INSTANTIATE_TEST_CASE_P(OCL_ImgProc, PyrUp, Combine(
Values(CV_8U, CV_16U, CV_16S, CV_32F),
Values(1, 3, 4)));
#endif // HAVE_OPENCL