added perf tests for new gpu::cvtColor functions

diff --git a/modules/gpu/perf/perf_imgproc.cpp b/modules/gpu/perf/perf_imgproc.cpp
index ab7fb42..c1e348f 100644 (file)
--- a/modules/gpu/perf/perf_imgproc.cpp
+++ b/modules/gpu/perf/perf_imgproc.cpp
@@ -1172,7 +1172,20 @@ INSTANTIATE_TEST_CASE_P(ImgProc, CvtColor, testing::Combine(
                     CvtColorInfo(3, 3, cv::COLOR_BGR2HSV),\r
                     CvtColorInfo(3, 3, cv::COLOR_HSV2BGR),\r
                     CvtColorInfo(3, 3, cv::COLOR_BGR2HLS),\r
-                    CvtColorInfo(3, 3, cv::COLOR_HLS2BGR))));\r
+                    CvtColorInfo(3, 3, cv::COLOR_HLS2BGR),\r
+                    CvtColorInfo(3, 3, cv::COLOR_BGR2Lab),\r
+                    CvtColorInfo(3, 3, cv::COLOR_RGB2Lab),\r
+                    CvtColorInfo(3, 3, cv::COLOR_BGR2Luv),\r
+                    CvtColorInfo(3, 3, cv::COLOR_RGB2Luv),\r
+                    CvtColorInfo(3, 3, cv::COLOR_Lab2BGR),\r
+                    CvtColorInfo(3, 3, cv::COLOR_Lab2RGB),\r
+                    CvtColorInfo(3, 3, cv::COLOR_Luv2BGR),\r
+                    CvtColorInfo(3, 3, cv::COLOR_Luv2RGB),\r
+                    CvtColorInfo(1, 3, cv::COLOR_BayerBG2BGR),\r
+                    CvtColorInfo(1, 3, cv::COLOR_BayerGB2BGR),\r
+                    CvtColorInfo(1, 3, cv::COLOR_BayerRG2BGR),\r
+                    CvtColorInfo(1, 3, cv::COLOR_BayerGR2BGR),\r
+                    CvtColorInfo(4, 4, cv::COLOR_RGBA2mRGBA))));\r
 \r
 //////////////////////////////////////////////////////////////////////\r
 // SwapChannels\r

diff --git a/modules/gpu/perf/perf_utility.cpp b/modules/gpu/perf/perf_utility.cpp
index c54d2ac..bf6bdfe 100644 (file)
--- a/modules/gpu/perf/perf_utility.cpp
+++ b/modules/gpu/perf/perf_utility.cpp
@@ -65,19 +65,19 @@ void PrintTo(const CvtColorInfo& info, ostream* os)
         "BGR2HSV",\r
         "RGB2HSV",\r
 \r
-        0,\r
-        0,\r
+        "",\r
+        "",\r
 \r
-        0,\r
-        0,\r
+        "BGR2Lab",\r
+        "RGB2Lab",\r
 \r
-        0,\r
-        0,\r
-        0,\r
-        0,\r
+        "BayerBG2BGR",\r
+        "BayerGB2BGR",\r
+        "BayerRG2BGR",\r
+        "BayerGR2BGR",\r
 \r
-        0,\r
-        0,\r
+        "BGR2Luv",\r
+        "RGB2Luv",\r
 \r
         "BGR2HLS",\r
         "RGB2HLS",\r
@@ -85,18 +85,18 @@ void PrintTo(const CvtColorInfo& info, ostream* os)
         "HSV2BGR",\r
         "HSV2RGB",\r
 \r
-        0,\r
-        0,\r
-        0,\r
-        0,\r
+        "Lab2BGR",\r
+        "Lab2RGB",\r
+        "Luv2BGR",\r
+        "Luv2RGB",\r
 \r
         "HLS2BGR",\r
         "HLS2RGB",\r
 \r
-        0,\r
-        0,\r
-        0,\r
-        0,\r
+        "BayerBG2BGR_VNG",\r
+        "BayerGB2BGR_VNG",\r
+        "BayerRG2BGR_VNG",\r
+        "BayerGR2BGR_VNG",\r
 \r
         "BGR2HSV_FULL",\r
         "RGB2HSV_FULL",\r
@@ -108,30 +108,78 @@ void PrintTo(const CvtColorInfo& info, ostream* os)
         "HLS2BGR_FULL",\r
         "HLS2RGB_FULL",\r
 \r
-        0,\r
-        0,\r
-        0,\r
-        0,\r
+        "LBGR2Lab",\r
+        "LRGB2Lab",\r
+        "LBGR2Luv",\r
+        "LRGB2Luv",\r
 \r
-        0,\r
-        0,\r
-        0,\r
-        0,\r
+        "Lab2LBGR",\r
+        "Lab2LRGB",\r
+        "Luv2LBGR",\r
+        "Luv2LRGB",\r
 \r
         "BGR2YUV",\r
         "RGB2YUV",\r
         "YUV2BGR",\r
         "YUV2RGB",\r
 \r
-        0,\r
-        0,\r
-        0,\r
-        0,\r
-\r
-        0,\r
-        0,\r
-        0,\r
-        0\r
+        "BayerBG2GRAY",\r
+        "BayerGB2GRAY",\r
+        "BayerRG2GRAY",\r
+        "BayerGR2GRAY",\r
+\r
+        //YUV 4:2:0 formats family\r
+        "YUV2RGB_NV12",\r
+        "YUV2BGR_NV12",\r
+        "YUV2RGB_NV21",\r
+        "YUV2BGR_NV21",\r
+\r
+        "YUV2RGBA_NV12",\r
+        "YUV2BGRA_NV12",\r
+        "YUV2RGBA_NV21",\r
+        "YUV2BGRA_NV21",\r
+\r
+        "YUV2RGB_YV12",\r
+        "YUV2BGR_YV12",\r
+        "YUV2RGB_IYUV",\r
+        "YUV2BGR_IYUV",\r
+\r
+        "YUV2RGBA_YV12",\r
+        "YUV2BGRA_YV12",\r
+        "YUV2RGBA_IYUV",\r
+        "YUV2BGRA_IYUV",\r
+\r
+        "YUV2GRAY_420",\r
+\r
+        //YUV 4:2:2 formats family\r
+        "YUV2RGB_UYVY",\r
+        "YUV2BGR_UYVY",\r
+        "YUV2RGB_VYUY",\r
+        "YUV2BGR_VYUY",\r
+\r
+        "YUV2RGBA_UYVY",\r
+        "YUV2BGRA_UYVY",\r
+        "YUV2RGBA_VYUY",\r
+        "YUV2BGRA_VYUY",\r
+\r
+        "YUV2RGB_YUY2",\r
+        "YUV2BGR_YUY2",\r
+        "YUV2RGB_YVYU",\r
+        "YUV2BGR_YVYU",\r
+\r
+        "YUV2RGBA_YUY2",\r
+        "YUV2BGRA_YUY2",\r
+        "YUV2RGBA_YVYU",\r
+        "YUV2BGRA_YVYU",\r
+\r
+        "YUV2GRAY_UYVY",\r
+        "YUV2GRAY_YUY2",\r
+\r
+        // alpha premultiplication\r
+        "RGBA2mRGBA",\r
+        "mRGBA2RGBA",\r
+\r
+        "COLORCVT_MAX"\r
     };\r
 \r
     *os << str[info.code];\r

diff --git a/modules/gpu/perf_cpu/perf_imgproc.cpp b/modules/gpu/perf_cpu/perf_imgproc.cpp
index 9a1adde..b6686b7 100644 (file)
--- a/modules/gpu/perf_cpu/perf_imgproc.cpp
+++ b/modules/gpu/perf_cpu/perf_imgproc.cpp
@@ -712,6 +712,19 @@ INSTANTIATE_TEST_CASE_P(ImgProc, CvtColor, testing::Combine(
                     CvtColorInfo(3, 3, cv::COLOR_BGR2HSV),\r
                     CvtColorInfo(3, 3, cv::COLOR_HSV2BGR),\r
                     CvtColorInfo(3, 3, cv::COLOR_BGR2HLS),\r
-                    CvtColorInfo(3, 3, cv::COLOR_HLS2BGR))));\r
+                    CvtColorInfo(3, 3, cv::COLOR_HLS2BGR),\r
+                    CvtColorInfo(3, 3, cv::COLOR_BGR2Lab),\r
+                    CvtColorInfo(3, 3, cv::COLOR_RGB2Lab),\r
+                    CvtColorInfo(3, 3, cv::COLOR_BGR2Luv),\r
+                    CvtColorInfo(3, 3, cv::COLOR_RGB2Luv),\r
+                    CvtColorInfo(3, 3, cv::COLOR_Lab2BGR),\r
+                    CvtColorInfo(3, 3, cv::COLOR_Lab2RGB),\r
+                    CvtColorInfo(3, 3, cv::COLOR_Luv2BGR),\r
+                    CvtColorInfo(3, 3, cv::COLOR_Luv2RGB),\r
+                    CvtColorInfo(1, 3, cv::COLOR_BayerBG2BGR),\r
+                    CvtColorInfo(1, 3, cv::COLOR_BayerGB2BGR),\r
+                    CvtColorInfo(1, 3, cv::COLOR_BayerRG2BGR),\r
+                    CvtColorInfo(1, 3, cv::COLOR_BayerGR2BGR),\r
+                    CvtColorInfo(4, 4, cv::COLOR_RGBA2mRGBA))));\r
 \r
 #endif\r

diff --git a/modules/gpu/perf_cpu/perf_utility.cpp b/modules/gpu/perf_cpu/perf_utility.cpp
index 88d5111..541e6fd 100644 (file)
--- a/modules/gpu/perf_cpu/perf_utility.cpp
+++ b/modules/gpu/perf_cpu/perf_utility.cpp
@@ -65,19 +65,19 @@ void PrintTo(const CvtColorInfo& info, ostream* os)
         "BGR2HSV",\r
         "RGB2HSV",\r
 \r
-        0,\r
-        0,\r
+        "",\r
+        "",\r
 \r
-        0,\r
-        0,\r
+        "BGR2Lab",\r
+        "RGB2Lab",\r
 \r
-        0,\r
-        0,\r
-        0,\r
-        0,\r
+        "BayerBG2BGR",\r
+        "BayerGB2BGR",\r
+        "BayerRG2BGR",\r
+        "BayerGR2BGR",\r
 \r
-        0,\r
-        0,\r
+        "BGR2Luv",\r
+        "RGB2Luv",\r
 \r
         "BGR2HLS",\r
         "RGB2HLS",\r
@@ -85,18 +85,18 @@ void PrintTo(const CvtColorInfo& info, ostream* os)
         "HSV2BGR",\r
         "HSV2RGB",\r
 \r
-        0,\r
-        0,\r
-        0,\r
-        0,\r
+        "Lab2BGR",\r
+        "Lab2RGB",\r
+        "Luv2BGR",\r
+        "Luv2RGB",\r
 \r
         "HLS2BGR",\r
         "HLS2RGB",\r
 \r
-        0,\r
-        0,\r
-        0,\r
-        0,\r
+        "BayerBG2BGR_VNG",\r
+        "BayerGB2BGR_VNG",\r
+        "BayerRG2BGR_VNG",\r
+        "BayerGR2BGR_VNG",\r
 \r
         "BGR2HSV_FULL",\r
         "RGB2HSV_FULL",\r
@@ -108,30 +108,78 @@ void PrintTo(const CvtColorInfo& info, ostream* os)
         "HLS2BGR_FULL",\r
         "HLS2RGB_FULL",\r
 \r
-        0,\r
-        0,\r
-        0,\r
-        0,\r
+        "LBGR2Lab",\r
+        "LRGB2Lab",\r
+        "LBGR2Luv",\r
+        "LRGB2Luv",\r
 \r
-        0,\r
-        0,\r
-        0,\r
-        0,\r
+        "Lab2LBGR",\r
+        "Lab2LRGB",\r
+        "Luv2LBGR",\r
+        "Luv2LRGB",\r
 \r
         "BGR2YUV",\r
         "RGB2YUV",\r
         "YUV2BGR",\r
         "YUV2RGB",\r
 \r
-        0,\r
-        0,\r
-        0,\r
-        0,\r
-\r
-        0,\r
-        0,\r
-        0,\r
-        0\r
+        "BayerBG2GRAY",\r
+        "BayerGB2GRAY",\r
+        "BayerRG2GRAY",\r
+        "BayerGR2GRAY",\r
+\r
+        //YUV 4:2:0 formats family\r
+        "YUV2RGB_NV12",\r
+        "YUV2BGR_NV12",\r
+        "YUV2RGB_NV21",\r
+        "YUV2BGR_NV21",\r
+\r
+        "YUV2RGBA_NV12",\r
+        "YUV2BGRA_NV12",\r
+        "YUV2RGBA_NV21",\r
+        "YUV2BGRA_NV21",\r
+\r
+        "YUV2RGB_YV12",\r
+        "YUV2BGR_YV12",\r
+        "YUV2RGB_IYUV",\r
+        "YUV2BGR_IYUV",\r
+\r
+        "YUV2RGBA_YV12",\r
+        "YUV2BGRA_YV12",\r
+        "YUV2RGBA_IYUV",\r
+        "YUV2BGRA_IYUV",\r
+\r
+        "YUV2GRAY_420",\r
+\r
+        //YUV 4:2:2 formats family\r
+        "YUV2RGB_UYVY",\r
+        "YUV2BGR_UYVY",\r
+        "YUV2RGB_VYUY",\r
+        "YUV2BGR_VYUY",\r
+\r
+        "YUV2RGBA_UYVY",\r
+        "YUV2BGRA_UYVY",\r
+        "YUV2RGBA_VYUY",\r
+        "YUV2BGRA_VYUY",\r
+\r
+        "YUV2RGB_YUY2",\r
+        "YUV2BGR_YUY2",\r
+        "YUV2RGB_YVYU",\r
+        "YUV2BGR_YVYU",\r
+\r
+        "YUV2RGBA_YUY2",\r
+        "YUV2BGRA_YUY2",\r
+        "YUV2RGBA_YVYU",\r
+        "YUV2BGRA_YVYU",\r
+\r
+        "YUV2GRAY_UYVY",\r
+        "YUV2GRAY_YUY2",\r
+\r
+        // alpha premultiplication\r
+        "RGBA2mRGBA",\r
+        "mRGBA2RGBA",\r
+\r
+        "COLORCVT_MAX"\r
     };\r
 \r
     *os << str[info.code];\r