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

fixed overflow bugs, updated perf tests

Browse Source
This commit is contained in:
Vladislav Vinogradov
2012-08-14 12:33:47 +04:00
parent 1eefc69927
commit 9201db32eb
4 changed files with 53 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
modules/gpu/perf/perf_imgproc.cpp
View File

@@ -1334,42 +1334,47 @@ INSTANTIATE_TEST_CASE_P(ImgProc, ImagePyramid_getLayer, testing::Combine(
//////////////////////////////////////////////////////////////////////
// HoughLines
GPU_PERF_TEST(HoughLines, cv::gpu::DeviceInfo, std::string)
IMPLEMENT_PARAM_CLASS(DoSort, bool)
GPU_PERF_TEST(HoughLines, cv::gpu::DeviceInfo, cv::Size, DoSort)
{
declare.time(30.0);
const cv::gpu::DeviceInfo devInfo = GET_PARAM(0);
cv::gpu::setDevice(devInfo.deviceID());
const std::string fileName = GET_PARAM(1);
const cv::Size size = GET_PARAM(1);
const bool doSort = GET_PARAM(2);
const float rho = 1.0f;
const float theta = CV_PI / 180.0f;
const int threshold = 300;
cv::Mat img_base = readImage(fileName, cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(img_base.empty());
cv::RNG rng(123456789);
cv::Mat img;
cv::resize(img_base, img, cv::Size(1920, 1080));
cv::Mat src(size, CV_8UC1, cv::Scalar::all(0));
cv::Mat edges;
cv::Canny(img, edges, 50, 200);
const int numLines = rng.uniform(500, 2000);
for (int i = 0; i < numLines; ++i)
{
cv::Point p1(rng.uniform(0, src.cols), rng.uniform(0, src.rows));
cv::Point p2(rng.uniform(0, src.cols), rng.uniform(0, src.rows));
cv::line(src, p1, p2, cv::Scalar::all(255), 2);
}
cv::gpu::GpuMat d_edges(edges);
cv::gpu::GpuMat d_src(src);
cv::gpu::GpuMat d_lines;
cv::gpu::GpuMat d_accum;
cv::gpu::HoughLines(d_edges, d_lines, d_accum, rho, theta, threshold);
cv::gpu::HoughLines(d_src, d_lines, d_accum, rho, theta, threshold, doSort);
TEST_CYCLE()
{
cv::gpu::HoughLines(d_edges, d_lines, d_accum, rho, theta, threshold);
cv::gpu::HoughLines(d_src, d_lines, d_accum, rho, theta, threshold, doSort);
}
}
INSTANTIATE_TEST_CASE_P(ImgProc, HoughLines, testing::Combine(
ALL_DEVICES,
testing::Values(std::string("cv/shared/pic1.png"),
std::string("cv/shared/pic3.png"),
std::string("cv/shared/pic4.png"),
std::string("cv/shared/pic5.png"),
std::string("cv/shared/pic6.png"))));
GPU_TYPICAL_MAT_SIZES,
testing::Values(DoSort(false), DoSort(true))));
#endif