diff --git a/modules/imgproc/perf/perf_warp.cpp b/modules/imgproc/perf/perf_warp.cpp new file mode 100644 index 0000000000..688ddb1abb --- /dev/null +++ b/modules/imgproc/perf/perf_warp.cpp @@ -0,0 +1,73 @@ +#include "perf_precomp.hpp" + +using namespace std; +using namespace cv; +using namespace perf; +using namespace testing; + +CV_ENUM(BorderMode, BORDER_CONSTANT, BORDER_REPLICATE); +CV_ENUM(InterType, INTER_NEAREST, INTER_LINEAR); + +typedef TestBaseWithParam< tr1::tuple > TestWarpAffine; +typedef TestBaseWithParam< tr1::tuple > TestWarpPerspective; + + +PERF_TEST_P( TestWarpAffine, WarpAffine, + Combine( + Values( szVGA, sz720p, sz1080p ), + ValuesIn( InterType::all() ), + ValuesIn( BorderMode::all() ) + ) +) +{ + Size sz; + int borderMode, interType; + tr1::tie(sz, borderMode, interType) = GetParam(); + + + Mat src, img = imread(getDataPath("cv/shared/fruits.jpg")); + cvtColor(img, src, COLOR_BGR2RGBA, 4); + Mat warpMat = getRotationMatrix2D(Point2f(src.cols/2, src.rows/2), 30, 2.2); + Mat dst(sz, CV_8UC4); + + //declare.in(src).out(dst); + + TEST_CYCLE() warpAffine( src, dst, warpMat, sz, interType, borderMode, Scalar::all(150) ); + + SANITY_CHECK(dst); + +} + +PERF_TEST_P( TestWarpPerspective, WarpPerspective, + Combine( + Values( szVGA, sz720p, sz1080p ), + ValuesIn( InterType::all() ), + ValuesIn( BorderMode::all() ) + ) +) +{ + Size sz; + int borderMode, interType; + tr1::tie(sz, borderMode, interType) = GetParam(); + + + Mat src, img = imread(getDataPath("cv/shared/fruits.jpg")); + cvtColor(img, src, COLOR_BGR2RGBA, 4); + Mat rotMat = getRotationMatrix2D(Point2f(src.cols/2, src.rows/2), 30, 2.2); + Mat warpMat(3, 3, CV_64FC1); + for(int r=0; r<2; r++) + for(int c=0; c<3; c++) + warpMat.at(r, c) = rotMat.at(r, c); + warpMat.at(2, 0) = .3/sz.width; + warpMat.at(2, 1) = .3/sz.height; + warpMat.at(2, 2) = 1; + Mat dst(sz, CV_8UC4); + + //declare.in(src).out(dst); + + TEST_CYCLE() warpPerspective( src, dst, warpMat, sz, interType, borderMode, Scalar::all(150) ); + + SANITY_CHECK(dst); + +} + diff --git a/modules/imgproc/src/imgwarp.cpp b/modules/imgproc/src/imgwarp.cpp index 3d51f57cfb..62be35a853 100644 --- a/modules/imgproc/src/imgwarp.cpp +++ b/modules/imgproc/src/imgwarp.cpp @@ -2977,6 +2977,11 @@ void cv::warpPerspective( InputArray _src, OutputArray _dst, InputArray _M0, if( !(flags & WARP_INVERSE_MAP) ) invert(matM, matM); +#ifdef HAVE_TEGRA_OPTIMIZATION + if( tegra::warpPerspective(src, dst, M, interpolation, borderType, borderValue) ) + return; +#endif + int x, y, x1, y1, width = dst.cols, height = dst.rows; int bh0 = std::min(BLOCK_SZ/2, height);