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

modified SURF's performance test to test OpenCL version as well

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-03-05 17:10:51 +04:00
parent da70b04262
commit 60ce2b2e9f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/nonfree/perf/perf_surf.cpp
View File

@ -12,6 +12,12 @@ typedef perf::TestBaseWithParam<std::string> surf;
"cv/detectors_descriptors_evaluation/images_datasets/leuven/img1.png",\ "cv/detectors_descriptors_evaluation/images_datasets/leuven/img1.png",\
"stitching/a3.png" "stitching/a3.png"
#ifdef HAVE_OPENCV_OCL
typedef ocl::SURF_OCL surf_class;
#else
typdef SURF surf_class;
#endif
PERF_TEST_P(surf, detect, testing::Values(SURF_IMAGES)) PERF_TEST_P(surf, detect, testing::Values(SURF_IMAGES))
{ {
String filename = getDataPath(GetParam()); String filename = getDataPath(GetParam());
@ -22,7 +28,7 @@ PERF_TEST_P(surf, detect, testing::Values(SURF_IMAGES))
Mat mask; Mat mask;
declare.in(frame).time(90); declare.in(frame).time(90);
SURF detector; surf_class detector;
vector<KeyPoint> points; vector<KeyPoint> points;
TEST_CYCLE() detector(frame, mask, points); TEST_CYCLE() detector(frame, mask, points);
@ -41,7 +47,7 @@ PERF_TEST_P(surf, extract, testing::Values(SURF_IMAGES))
Mat mask; Mat mask;
declare.in(frame).time(90); declare.in(frame).time(90);
SURF detector; surf_class detector;
vector<KeyPoint> points; vector<KeyPoint> points;
vector<float> descriptors; vector<float> descriptors;
detector(frame, mask, points); detector(frame, mask, points);
@ -61,7 +67,7 @@ PERF_TEST_P(surf, full, testing::Values(SURF_IMAGES))
Mat mask; Mat mask;
declare.in(frame).time(90); declare.in(frame).time(90);
SURF detector; surf_class detector;
vector<KeyPoint> points; vector<KeyPoint> points;
vector<float> descriptors; vector<float> descriptors;