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

Added perf test for RGB(A)/BGR(A) to YCrCb conversion

Browse Source
This commit is contained in:
Andrey Kamaev 2012-01-09 16:38:44 +00:00
parent cdac77c2b2
commit dd311b8d3c
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/imgproc/perf/perf_cvt_color.cpp
View File

@ -10,7 +10,8 @@ CV_ENUM(CvtMode, CV_YUV2BGR, CV_YUV2RGB, //YUV
CV_YUV420i2BGR, CV_YUV420i2RGB, CV_YUV420sp2BGR, CV_YUV420sp2RGB, //YUV420 CV_YUV420i2BGR, CV_YUV420i2RGB, CV_YUV420sp2BGR, CV_YUV420sp2RGB, //YUV420
CV_RGB2GRAY, CV_RGBA2GRAY, CV_BGR2GRAY, CV_BGRA2GRAY, //Gray CV_RGB2GRAY, CV_RGBA2GRAY, CV_BGR2GRAY, CV_BGRA2GRAY, //Gray
CV_GRAY2RGB, CV_GRAY2RGBA, /*CV_GRAY2BGR, CV_GRAY2BGRA*/ //Gray2 CV_GRAY2RGB, CV_GRAY2RGBA, /*CV_GRAY2BGR, CV_GRAY2BGRA*/ //Gray2
CV_BGR2HSV, CV_RGB2HSV, CV_BGR2HLS, CV_RGB2HLS //H CV_BGR2HSV, CV_RGB2HSV, CV_BGR2HLS, CV_RGB2HLS, //H
CV_BGR2YCrCb, CV_RGB2YCrCb
) )
typedef std::tr1::tuple<Size, CvtMode> Size_CvtMode_t; typedef std::tr1::tuple<Size, CvtMode> Size_CvtMode_t;
@ -82,7 +83,7 @@ PERF_TEST_P(Size_CvtMode, cvtColorGray,
TEST_CYCLE() cvtColor(src, dst, mode); TEST_CYCLE() cvtColor(src, dst, mode);
SANITY_CHECK(dst); SANITY_CHECK(dst, 1);
} }
@ -126,3 +127,28 @@ PERF_TEST_P(Size_CvtMode, cvtColorH,
SANITY_CHECK(dst, 1); SANITY_CHECK(dst, 1);
} }
typedef std::tr1::tuple<Size, CvtMode, int> Size_CvtMode_Ch_t;
typedef perf::TestBaseWithParam<Size_CvtMode_Ch_t> Size_CvtMode_Ch;
PERF_TEST_P(Size_CvtMode_Ch, cvtColorYCrCb,
testing::Combine(
testing::Values(TYPICAL_MAT_SIZES),
testing::Values((int)CV_BGR2YCrCb, (int)CV_RGB2YCrCb),
testing::Values(3, 4)
)
)
{
Size sz = get<0>(GetParam());
int mode = get<1>(GetParam());
int ch = get<2>(GetParam());
Mat src(sz, CV_8UC(ch));
Mat dst(sz, CV_8UC3);
declare.in(src, WARMUP_RNG).out(dst);
TEST_CYCLE() cvtColor(src, dst, mode);
SANITY_CHECK(dst, 1);
}

6
modules/imgproc/src/color.cpp
View File

@ -2906,7 +2906,13 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
dst = _dst.getMat(); dst = _dst.getMat();
if( depth == CV_8U ) if( depth == CV_8U )
{
#ifdef HAVE_TEGRA_OPTIMIZATION
if((code == CV_RGB2YCrCb || code == CV_BGR2YCrCb) && tegra::RGB2YCrCb(src, dst, bidx))
break;
#endif
CvtColorLoop(src, dst, RGB2YCrCb_i<uchar>(scn, bidx, coeffs_i)); CvtColorLoop(src, dst, RGB2YCrCb_i<uchar>(scn, bidx, coeffs_i));
}
else if( depth == CV_16U ) else if( depth == CV_16U )
CvtColorLoop(src, dst, RGB2YCrCb_i<ushort>(scn, bidx, coeffs_i)); CvtColorLoop(src, dst, RGB2YCrCb_i<ushort>(scn, bidx, coeffs_i));
else else