Created perf tests for cvtColor_toBGR565, cvtColor_C3toC4_and_back, split, merge.

modules/core/perf/perf_merge.cpp

@@ -0,0 +1,36 @@
+#include "perf_precomp.hpp"
+
+using namespace std;
+using namespace cv;
+using namespace perf;
+using std::tr1::make_tuple;
+using std::tr1::get;
+
+typedef std::tr1::tuple<Size, int, int> Size_SrcDepth_DstChannels_t;
+typedef perf::TestBaseWithParam<Size_SrcDepth_DstChannels_t> Size_SrcDepth_DstChannels;
+
+PERF_TEST_P( Size_SrcDepth_DstChannels, merge,
+             testing::Combine
+             (
+                 testing::Values(TYPICAL_MAT_SIZES),
+                 testing::Values(CV_8U, CV_16S, CV_32S, CV_32F, CV_64F),
+                 testing::Values(2, 3, 4)
+             )
+           )
+{
+    Size sz = get<0>(GetParam());
+    int srcDepth = get<1>(GetParam());
+    int dstChannels = get<2>(GetParam());
+
+    vector<Mat> mv;
+    for( int i = 0; i < dstChannels; ++i )
+    {
+        mv.push_back( Mat(sz, CV_MAKETYPE(srcDepth, 1)) );
+        randu(mv[i], 0, 255);
+    }
+    
+    Mat dst;
+    TEST_CYCLE() merge( (vector<Mat> &)mv, dst );
+
+    SANITY_CHECK(dst);
+}

modules/core/perf/perf_split.cpp

@@ -0,0 +1,33 @@
+#include "perf_precomp.hpp"
+
+using namespace std;
+using namespace cv;
+using namespace perf;
+using std::tr1::make_tuple;
+using std::tr1::get;
+
+typedef std::tr1::tuple<Size, int, int> Size_Depth_Channels_t;
+typedef perf::TestBaseWithParam<Size_Depth_Channels_t> Size_Depth_Channels;
+
+PERF_TEST_P( Size_Depth_Channels, split,
+             testing::Combine
+             (
+                 testing::Values(TYPICAL_MAT_SIZES),
+                 testing::Values(CV_8U, CV_16S, CV_32F, CV_64F),
+                 testing::Values(2, 3, 4)
+             )
+           )
+{
+    Size sz = get<0>(GetParam());
+    int depth = get<1>(GetParam());
+    int channels = get<2>(GetParam());
+
+    Mat m(sz, CV_MAKETYPE(depth, channels));    
+    randu(m, 0, 255);
+
+    vector<Mat> mv;
+
+    TEST_CYCLE() split(m, (vector<Mat>&)mv);
+
+    SANITY_CHECK(mv);
+}

modules/imgproc/perf/perf_cvt_color.cpp

@@ -152,3 +152,63 @@ PERF_TEST_P(Size_CvtMode_Ch, cvtColorYCrCb,
     SANITY_CHECK(dst, 1);
 }
 
+CV_ENUM(CvtInBGR565Type, CV_RGB2BGR565, CV_RGBA2BGR565, CV_BGR2BGR565, CV_BGRA2BGR565)
+
+typedef std::tr1::tuple<Size, CvtInBGR565Type> Size_CvtInBGR565Type_t;
+typedef perf::TestBaseWithParam<Size_CvtInBGR565Type_t> Size_CvtInBGR565Type;
+
+PERF_TEST_P( Size_CvtInBGR565Type, cvtColor_toBGR565,
+             testing::Combine
+             (
+                 testing::Values(TYPICAL_MAT_SIZES),
+                 testing::ValuesIn(CvtInBGR565Type::all())
+             )
+           )
+{
+    Size sz = get<0>(GetParam());
+    CvtInBGR565Type code = get<1>(GetParam());
+
+    Mat src;
+    if ( code == CV_RGB2BGR565 || code == CV_BGR2BGR565 )
+        src.create(sz, CV_8UC3);
+    else
+        src.create(sz, CV_8UC4);
+
+    randu(src, 0, 255);
+
+    Mat dst;
+    
+    TEST_CYCLE() cvtColor( src, dst, code );
+
+    SANITY_CHECK(dst);
+}
+
+CV_ENUM(CvtMode2, CV_RGB2BGR, CV_RGB2RGBA, CV_RGB2BGRA, CV_RGBA2RGB, CV_RGBA2BGR, CV_RGBA2BGRA)
+
+typedef std::tr1::tuple<Size, CvtMode2> Size_CvtMode2_t;
+typedef perf::TestBaseWithParam<Size_CvtMode2_t> Size_CvtMode2;
+
+PERF_TEST_P( Size_CvtMode2, cvtColor_C3toC4_and_back,
+             testing::Combine
+             (
+                 testing::Values(TYPICAL_MAT_SIZES),
+                 testing::ValuesIn(CvtMode2::all())
+             )
+           )
+{
+    Size sz = get<0>(GetParam());
+    CvtMode2 code = get<1>(GetParam());
+
+    Mat src;
+    if ( code == CV_RGB2BGR || code == CV_RGB2RGBA || code == CV_RGB2BGRA )
+        src.create(sz, CV_8UC3);
+    else
+        src.create(sz, CV_8UC4);
+
+    randu(src, 0, 255);
+
+    Mat dst;
+    TEST_CYCLE() cvtColor( src, dst, code );
+
+    SANITY_CHECK(dst);
+}