mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 22:40:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #26116 from savuor:rv/warp_affine_perf_types

Browse Source 
Added more data types for warpAffine() perf tests
This commit is contained in:
Alexander Smorkalov 2024-09-09 07:45:55 +03:00 committed by GitHub
commit e5790c0241
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modules/imgproc/perf/perf_warp.cpp
View File

@ -12,7 +12,7 @@ CV_ENUM(InterType, INTER_NEAREST, INTER_LINEAR)
CV_ENUM(InterTypeExtended, INTER_NEAREST, INTER_LINEAR, WARP_RELATIVE_MAP) CV_ENUM(InterTypeExtended, INTER_NEAREST, INTER_LINEAR, WARP_RELATIVE_MAP)
CV_ENUM(RemapMode, HALF_SIZE, UPSIDE_DOWN, REFLECTION_X, REFLECTION_BOTH) CV_ENUM(RemapMode, HALF_SIZE, UPSIDE_DOWN, REFLECTION_X, REFLECTION_BOTH)
typedef TestBaseWithParam< tuple<Size, InterType, BorderMode> > TestWarpAffine; typedef TestBaseWithParam< tuple<MatType, Size, InterType, BorderMode> > TestWarpAffine;
typedef TestBaseWithParam< tuple<Size, InterType, BorderMode, int> > TestWarpPerspective; typedef TestBaseWithParam< tuple<Size, InterType, BorderMode, int> > TestWarpPerspective;
typedef TestBaseWithParam< tuple<Size, InterType, BorderMode, MatType> > TestWarpPerspectiveNear_t; typedef TestBaseWithParam< tuple<Size, InterType, BorderMode, MatType> > TestWarpPerspectiveNear_t;
typedef TestBaseWithParam< tuple<MatType, Size, InterTypeExtended, BorderMode, RemapMode> > TestRemap; typedef TestBaseWithParam< tuple<MatType, Size, InterTypeExtended, BorderMode, RemapMode> > TestRemap;
@ -21,6 +21,7 @@ void update_map(const Mat& src, Mat& map_x, Mat& map_y, const int remapMode, boo
PERF_TEST_P( TestWarpAffine, WarpAffine, PERF_TEST_P( TestWarpAffine, WarpAffine,
Combine( Combine(
Values(CV_8UC1, CV_8UC4),
Values( szVGA, sz720p, sz1080p ), Values( szVGA, sz720p, sz1080p ),
InterType::all(), InterType::all(),
BorderMode::all() BorderMode::all()
@ -28,13 +29,14 @@ PERF_TEST_P( TestWarpAffine, WarpAffine,
) )
{ {
Size sz, szSrc(512, 512); Size sz, szSrc(512, 512);
int borderMode, interType; int borderMode, interType, dataType;
sz = get<0>(GetParam()); dataType = get<0>(GetParam());
interType = get<1>(GetParam()); sz = get<1>(GetParam());
borderMode = get<2>(GetParam()); interType = get<2>(GetParam());
borderMode = get<3>(GetParam());
Scalar borderColor = Scalar::all(150); Scalar borderColor = Scalar::all(150);
Mat src(szSrc,CV_8UC4), dst(sz, CV_8UC4); Mat src(szSrc, dataType), dst(sz, dataType);
cvtest::fillGradient(src); cvtest::fillGradient(src);
if(borderMode == BORDER_CONSTANT) cvtest::smoothBorder(src, borderColor, 1); if(borderMode == BORDER_CONSTANT) cvtest::smoothBorder(src, borderColor, 1);
Mat warpMat = getRotationMatrix2D(Point2f(src.cols/2.f, src.rows/2.f), 30., 2.2); Mat warpMat = getRotationMatrix2D(Point2f(src.cols/2.f, src.rows/2.f), 30., 2.2);
@ -47,6 +49,7 @@ PERF_TEST_P( TestWarpAffine, WarpAffine,
PERF_TEST_P(TestWarpAffine, DISABLED_WarpAffine_ovx, PERF_TEST_P(TestWarpAffine, DISABLED_WarpAffine_ovx,
Combine( Combine(
Values(CV_8UC1, CV_8UC4),
Values(szVGA, sz720p, sz1080p), Values(szVGA, sz720p, sz1080p),
InterType::all(), InterType::all(),
BorderMode::all() BorderMode::all()
@ -54,13 +57,16 @@ PERF_TEST_P(TestWarpAffine, DISABLED_WarpAffine_ovx,
) )
{ {
Size sz, szSrc(512, 512); Size sz, szSrc(512, 512);
int borderMode, interType; int borderMode, interType, dataType;
sz = get<0>(GetParam());
interType = get<1>(GetParam()); dataType = get<0>(GetParam());
borderMode = get<2>(GetParam()); sz = get<1>(GetParam());
interType = get<2>(GetParam());
borderMode = get<3>(GetParam());
Scalar borderColor = Scalar::all(150); Scalar borderColor = Scalar::all(150);
Mat src(szSrc, CV_8UC1), dst(sz, CV_8UC1); Mat src(szSrc, dataType), dst(sz, dataType);
cvtest::fillGradient(src); cvtest::fillGradient(src);
if (borderMode == BORDER_CONSTANT) cvtest::smoothBorder(src, borderColor, 1); if (borderMode == BORDER_CONSTANT) cvtest::smoothBorder(src, borderColor, 1);
Mat warpMat = getRotationMatrix2D(Point2f(src.cols / 2.f, src.rows / 2.f), 30., 2.2); Mat warpMat = getRotationMatrix2D(Point2f(src.cols / 2.f, src.rows / 2.f), 30., 2.2);