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

fixed TestRemap_Remap

Browse Source
This commit is contained in:
Ilya Lavrenov 2012-10-01 17:29:56 +04:00
parent 57d9699058
commit 45593030ab
1 changed files with 71 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
modules/imgproc/perf/perf_remap.cpp
View File

@ -1,68 +1,71 @@
#include "perf_precomp.hpp" #include "perf_precomp.hpp"
using namespace std; using namespace std;
using namespace cv; using namespace cv;
using namespace perf; using namespace perf;
using namespace testing; using namespace testing;
using std::tr1::make_tuple; using std::tr1::make_tuple;
using std::tr1::get; using std::tr1::get;
CV_ENUM(MatrixType, CV_16UC1, CV_16SC1, CV_32FC1) CV_ENUM(MatrixType, CV_16UC1, CV_16SC1, CV_32FC1)
CV_ENUM(MapType, CV_16SC2, CV_32FC1, CV_32FC2) CV_ENUM(MapType, CV_16SC2, CV_32FC1, CV_32FC2)
CV_ENUM(InterType, INTER_LINEAR, INTER_CUBIC, INTER_LANCZOS4, INTER_NEAREST) CV_ENUM(InterType, INTER_NEAREST, INTER_LINEAR, INTER_CUBIC, INTER_LANCZOS4)
typedef TestBaseWithParam< tr1::tuple<Size, MatrixType, MapType, InterType> > TestRemap; typedef TestBaseWithParam< tr1::tuple<Size, MatrixType, MapType, InterType> > TestRemap;
PERF_TEST_P( TestRemap, Remap, PERF_TEST_P( TestRemap, Remap,
Combine( Combine(
Values( szVGA, sz1080p ), Values( szVGA, sz1080p ),
ValuesIn( MatrixType::all() ), ValuesIn( MatrixType::all() ),
ValuesIn( MapType::all() ), ValuesIn( MapType::all() ),
ValuesIn( InterType::all() ) ValuesIn( InterType::all() )
) )
) )
{ {
Size sz; Size sz;
int src_type, map1_type, inter_type; int src_type, map1_type, inter_type;
sz = get<0>(GetParam()); sz = get<0>(GetParam());
src_type = get<1>(GetParam()); src_type = get<1>(GetParam());
map1_type = get<2>(GetParam()); map1_type = get<2>(GetParam());
inter_type = get<3>(GetParam()); inter_type = get<3>(GetParam());
Mat src(sz, src_type); Mat src(sz, src_type), dst(sz, src_type), map1(sz, map1_type), map2;
Mat map1(sz, map1_type); if (map1_type == CV_32FC1)
Mat dst(sz, src_type); map2.create(sz, CV_32FC1);
else if (inter_type != INTER_NEAREST && map1_type == CV_16SC2)
Mat map2(map1_type == CV_32FC1 ? sz : Size(), CV_32FC1); {
map2.create(sz, CV_16UC1);
RNG rng; map2 = Scalar::all(0);
rng.fill(src, RNG::UNIFORM, 0, 256); }
for (int j = 0; j < map1.rows; ++j) RNG rng;
for (int i = 0; i < map1.cols; ++i) rng.fill(src, RNG::UNIFORM, 0, 256);
switch (map1_type)
{ for (int j = 0; j < map1.rows; ++j)
case CV_32FC1: for (int i = 0; i < map1.cols; ++i)
map1.at<float>(j, i) = static_cast<float>(src.cols - i - 1); switch (map1_type)
map2.at<float>(j, i) = static_cast<float>(j); {
break; case CV_32FC1:
case CV_32FC2: map1.at<float>(j, i) = static_cast<float>(src.cols - i - 1);
map1.at<Vec2f>(j, i)[0] = static_cast<float>(src.cols - i - 1); map2.at<float>(j, i) = static_cast<float>(j);
map1.at<Vec2f>(j, i)[1] = static_cast<float>(j); break;
break; case CV_32FC2:
case CV_16SC2: map1.at<Vec2f>(j, i)[0] = static_cast<float>(src.cols - i - 1);
map1.at<Vec2s>(j, i)[0] = static_cast<short>(src.cols - i - 1); map1.at<Vec2f>(j, i)[1] = static_cast<float>(j);
map1.at<Vec2s>(j, i)[1] = static_cast<short>(j); break;
break; case CV_16SC2:
default: map1.at<Vec2s>(j, i)[0] = static_cast<short>(src.cols - i - 1);
CV_Assert(0); map1.at<Vec2s>(j, i)[1] = static_cast<short>(j);
} break;
default:
CV_Assert(0);
declare.in(src, WARMUP_RNG).out(dst).time(20); }
TEST_CYCLE() remap(src, dst, map1, map2, inter_type);
declare.in(src, WARMUP_RNG).out(dst).time(20);
SANITY_CHECK(dst);
} TEST_CYCLE() remap(src, dst, map1, map2, inter_type);
SANITY_CHECK(dst);
}