From c768731e8974ce2d3c1d32e345faed22b68ba3bc Mon Sep 17 00:00:00 2001 From: Sergei Nosov Date: Mon, 4 Feb 2013 12:57:03 +0400 Subject: [PATCH 1/3] enable Tegra optimizations --- modules/imgproc/src/templmatch.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/imgproc/src/templmatch.cpp b/modules/imgproc/src/templmatch.cpp index 0a3b95d7c..ec7a92a22 100644 --- a/modules/imgproc/src/templmatch.cpp +++ b/modules/imgproc/src/templmatch.cpp @@ -252,6 +252,11 @@ void cv::matchTemplate( InputArray _img, InputArray _templ, OutputArray _result, _result.create(corrSize, CV_32F); Mat result = _result.getMat(); +#ifdef HAVE_TEGRA_OPTIMIZATION + if (tegra::matchTemplate(img, templ, result, method)) + return; +#endif + int cn = img.channels(); crossCorr( img, templ, result, result.size(), result.type(), Point(0,0), 0, 0); From 15d04844851de56c59b1e751b1c1e253300b88b7 Mon Sep 17 00:00:00 2001 From: Sergei Nosov Date: Mon, 4 Feb 2013 12:57:22 +0400 Subject: [PATCH 2/3] matchTemplate perf tests added --- modules/imgproc/perf/perf_matchTemplate.cpp | 67 +++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 modules/imgproc/perf/perf_matchTemplate.cpp diff --git a/modules/imgproc/perf/perf_matchTemplate.cpp b/modules/imgproc/perf/perf_matchTemplate.cpp new file mode 100644 index 000000000..254657a5a --- /dev/null +++ b/modules/imgproc/perf/perf_matchTemplate.cpp @@ -0,0 +1,67 @@ +#include "perf_precomp.hpp" + +using namespace std; +using namespace cv; +using namespace perf; +using std::tr1::make_tuple; +using std::tr1::get; + +CV_ENUM(MethodType, CV_TM_SQDIFF, CV_TM_SQDIFF_NORMED, CV_TM_CCORR, CV_TM_CCORR_NORMED, CV_TM_CCOEFF, CV_TM_CCOEFF_NORMED) + +typedef std::tr1::tuple ImgSize_TmplSize_Method_t; +typedef perf::TestBaseWithParam ImgSize_TmplSize_Method; + +PERF_TEST_P(ImgSize_TmplSize_Method, matchTemplateSmall, + testing::Combine( + testing::Values(szSmall128, cv::Size(320, 240), + cv::Size(640, 480), cv::Size(800, 600), + cv::Size(1024, 768), cv::Size(1280, 1024)), + testing::Values(cv::Size(12, 12), cv::Size(28, 9), + cv::Size(8, 30), cv::Size(16, 16)), + testing::ValuesIn(MethodType::all()) + ) + ) +{ + Size imgSz = get<0>(GetParam()); + Size tmplSz = get<1>(GetParam()); + int method = get<2>(GetParam()); + + Mat img(imgSz, CV_8UC1); + Mat tmpl(tmplSz, CV_8UC1); + Mat result(imgSz - tmplSz + Size(1,1), CV_32F); + + declare + .in(img, WARMUP_RNG) + .in(tmpl, WARMUP_RNG) + .out(result); + + TEST_CYCLE() matchTemplate(img, tmpl, result, method); + + SANITY_CHECK(result, 65536 * tmpl.total() * 1e-7); +} + +PERF_TEST_P(ImgSize_TmplSize_Method, matchTemplateBig, + testing::Combine( + testing::Values(cv::Size(1280, 1024)), + testing::Values(cv::Size(1260, 1000), cv::Size(1261, 1013)), + testing::ValuesIn(MethodType::all()) + ) + ) +{ + Size imgSz = get<0>(GetParam()); + Size tmplSz = get<1>(GetParam()); + int method = get<2>(GetParam()); + + Mat img(imgSz, CV_8UC1); + Mat tmpl(tmplSz, CV_8UC1); + Mat result(imgSz - tmplSz + Size(1,1), CV_32F); + + declare + .in(img, WARMUP_RNG) + .in(tmpl, WARMUP_RNG) + .out(result); + + TEST_CYCLE() matchTemplate(img, tmpl, result, method); + + SANITY_CHECK(result, 65536 * tmpl.total() * 1e-7); +} From c0e3d48ebcc55971c525ca55d2efdba645aa3ee8 Mon Sep 17 00:00:00 2001 From: Sergei Nosov Date: Mon, 4 Feb 2013 13:29:52 +0400 Subject: [PATCH 3/3] stricter eps for normed methods --- modules/imgproc/perf/perf_matchTemplate.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/imgproc/perf/perf_matchTemplate.cpp b/modules/imgproc/perf/perf_matchTemplate.cpp index 254657a5a..0c727d5a4 100644 --- a/modules/imgproc/perf/perf_matchTemplate.cpp +++ b/modules/imgproc/perf/perf_matchTemplate.cpp @@ -37,7 +37,14 @@ PERF_TEST_P(ImgSize_TmplSize_Method, matchTemplateSmall, TEST_CYCLE() matchTemplate(img, tmpl, result, method); - SANITY_CHECK(result, 65536 * tmpl.total() * 1e-7); + bool isNormed = + method == CV_TM_CCORR_NORMED || + method == CV_TM_SQDIFF_NORMED || + method == CV_TM_CCOEFF_NORMED; + double eps = isNormed ? 1e-6 + : 255 * 255 * tmpl.total() * 1e-6; + + SANITY_CHECK(result, eps); } PERF_TEST_P(ImgSize_TmplSize_Method, matchTemplateBig, @@ -63,5 +70,12 @@ PERF_TEST_P(ImgSize_TmplSize_Method, matchTemplateBig, TEST_CYCLE() matchTemplate(img, tmpl, result, method); - SANITY_CHECK(result, 65536 * tmpl.total() * 1e-7); + bool isNormed = + method == CV_TM_CCORR_NORMED || + method == CV_TM_SQDIFF_NORMED || + method == CV_TM_CCOEFF_NORMED; + double eps = isNormed ? 1e-6 + : 255 * 255 * tmpl.total() * 1e-6; + + SANITY_CHECK(result, eps); }