ocl::cvtColor support YUV and YCbCr formats

modules/ocl/src/color.cpp

@@ -16,6 +16,7 @@
 //
 // @Authors
 //    Wang Weiyan, wangweiyanster@gmail.com
+//    Peng Xiao, pengxiao@multicorewareinc.com
 //
 // Redistribution and use in source and binary forms, with or without modification,
 // are permitted provided that the following conditions are met:
@@ -70,21 +71,21 @@ void cv::ocl::cvtColor(const oclMat &, oclMat &, int, int, const Stream &)
 
 namespace cv
 {
-    namespace ocl
-    {
-        extern const char *cvt_color;
-    }
+namespace ocl
+{
+extern const char *cvt_color;
+}
 }
 
 namespace
 {
-    void RGB2Gray_caller(const oclMat &src, oclMat &dst, int bidx)
-    {
+void RGB2Gray_caller(const oclMat &src, oclMat &dst, int bidx)
+{
     vector<pair<size_t , const void *> > args;
     int channels = src.oclchannels();
     char build_options[50];
-        //printf("depth:%d,channels:%d,bidx:%d\n",src.depth(),src.oclchannels(),bidx);
     sprintf(build_options, "-D DEPTH_%d", src.depth());
+    //printf("depth:%d,channels:%d,bidx:%d\n",src.depth(),src.oclchannels(),bidx);
     args.push_back( make_pair( sizeof(cl_int) , (void *)&src.cols));
     args.push_back( make_pair( sizeof(cl_int) , (void *)&src.rows));
     args.push_back( make_pair( sizeof(cl_int) , (void *)&src.step));
@@ -95,13 +96,100 @@ namespace
     args.push_back( make_pair( sizeof(cl_mem) , (void *)&dst.data));
     size_t gt[3] = {src.cols, src.rows, 1}, lt[3] = {16, 16, 1};
     openCLExecuteKernel(src.clCxt, &cvt_color, "RGB2Gray", gt, lt, args, -1, -1, build_options);
-    }
-    void cvtColor_caller(const oclMat &src, oclMat &dst, int code, int /*dcn*/)
-    {
+}
+void Gray2RGB_caller(const oclMat &src, oclMat &dst)
+{
+    vector<pair<size_t , const void *> > args;
+    char build_options[50];
+    sprintf(build_options, "-D DEPTH_%d", src.depth());
+    //printf("depth:%d,channels:%d,bidx:%d\n",src.depth(),src.oclchannels(),bidx);
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&src.cols));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&src.rows));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&src.step));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&dst.step));
+    args.push_back( make_pair( sizeof(cl_mem) , (void *)&src.data));
+    args.push_back( make_pair( sizeof(cl_mem) , (void *)&dst.data));
+    size_t gt[3] = {src.cols, src.rows, 1}, lt[3] = {16, 16, 1};
+    openCLExecuteKernel(src.clCxt, &cvt_color, "Gray2RGB", gt, lt, args, -1, -1, build_options);
+}
+void RGB2YUV_caller(const oclMat &src, oclMat &dst, int bidx)
+{
+    vector<pair<size_t , const void *> > args;
+    int channels = src.oclchannels();
+    char build_options[50];
+    sprintf(build_options, "-D DEPTH_%d", src.depth());
+    //printf("depth:%d,channels:%d,bidx:%d\n",src.depth(),src.oclchannels(),bidx);
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&src.cols));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&src.rows));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&src.step));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&dst.step));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&channels));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&bidx));
+    args.push_back( make_pair( sizeof(cl_mem) , (void *)&src.data));
+    args.push_back( make_pair( sizeof(cl_mem) , (void *)&dst.data));
+    size_t gt[3] = {src.cols, src.rows, 1}, lt[3] = {16, 16, 1};
+    openCLExecuteKernel(src.clCxt, &cvt_color, "RGB2YUV", gt, lt, args, -1, -1, build_options);
+}
+void YUV2RGB_caller(const oclMat &src, oclMat &dst, int bidx)
+{
+    vector<pair<size_t , const void *> > args;
+    int channels = src.oclchannels();
+    char build_options[50];
+    sprintf(build_options, "-D DEPTH_%d", src.depth());
+    //printf("depth:%d,channels:%d,bidx:%d\n",src.depth(),src.oclchannels(),bidx);
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&src.cols));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&src.rows));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&src.step));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&dst.step));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&channels));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&bidx));
+    args.push_back( make_pair( sizeof(cl_mem) , (void *)&src.data));
+    args.push_back( make_pair( sizeof(cl_mem) , (void *)&dst.data));
+    size_t gt[3] = {src.cols, src.rows, 1}, lt[3] = {16, 16, 1};
+    openCLExecuteKernel(src.clCxt, &cvt_color, "YUV2RGB", gt, lt, args, -1, -1, build_options);
+}
+void YUV2RGB_NV12_caller(const oclMat &src, oclMat &dst, int bidx)
+{
+    vector<pair<size_t , const void *> > args;
+    char build_options[50];
+    sprintf(build_options, "-D DEPTH_%d", src.depth());
+    //printf("depth:%d,channels:%d,bidx:%d\n",src.depth(),src.oclchannels(),bidx);
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&src.cols));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&src.rows));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&src.step));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&dst.step));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&bidx));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&dst.cols));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&dst.rows));
+    args.push_back( make_pair( sizeof(cl_mem) , (void *)&src.data));
+    args.push_back( make_pair( sizeof(cl_mem) , (void *)&dst.data));
+    size_t gt[3] = {dst.cols / 2, dst.rows / 2, 1}, lt[3] = {16, 16, 1};
+    openCLExecuteKernel(src.clCxt, &cvt_color, "YUV2RGBA_NV12", gt, lt, args, -1, -1, build_options);
+}
+void RGB2YCrCb_caller(const oclMat &src, oclMat &dst, int bidx)
+{
+    vector<pair<size_t , const void *> > args;
+    int channels = src.oclchannels();
+    char build_options[50];
+    sprintf(build_options, "-D DEPTH_%d", src.depth());
+    //printf("depth:%d,channels:%d,bidx:%d\n",src.depth(),src.oclchannels(),bidx);
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&src.cols));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&src.rows));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&src.step));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&dst.step));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&channels));
+    args.push_back( make_pair( sizeof(cl_int) , (void *)&bidx));
+    args.push_back( make_pair( sizeof(cl_mem) , (void *)&src.data));
+    args.push_back( make_pair( sizeof(cl_mem) , (void *)&dst.data));
+    size_t gt[3] = {src.cols, src.rows, 1}, lt[3] = {16, 16, 1};
+    openCLExecuteKernel(src.clCxt, &cvt_color, "RGB2YCrCb", gt, lt, args, -1, -1, build_options);
+}
+void cvtColor_caller(const oclMat &src, oclMat &dst, int code, int dcn)
+{
     Size sz = src.size();
     int scn = src.oclchannels(), depth = src.depth(), bidx;
 
-        CV_Assert(depth == CV_8U || depth == CV_16U);
+    CV_Assert(depth == CV_8U || depth == CV_16U || depth == CV_32F);
 
     switch (code)
     {
@@ -124,14 +212,66 @@ namespace
         RGB2Gray_caller(src, dst, bidx);
         break;
     }
+    case CV_GRAY2BGR:
+    case CV_GRAY2BGRA:
+    {
+        CV_Assert(scn == 1);
+        dcn  = code == CV_GRAY2BGRA ? 4 : 3;
+        dst.create(sz, CV_MAKETYPE(depth, dcn));
+        Gray2RGB_caller(src, dst);
+        break;
+    }
+    case CV_BGR2YUV:
+    case CV_RGB2YUV:
+    {
+        CV_Assert(scn == 3 || scn == 4);
+        bidx = code == CV_BGR2YUV ? 0 : 2;
+        dst.create(sz, CV_MAKETYPE(depth, 3));
+        RGB2YUV_caller(src, dst, bidx);
+        break;
+    }
+    case CV_YUV2BGR:
+    case CV_YUV2RGB:
+    {
+        CV_Assert(scn == 3 || scn == 4);
+        bidx = code == CV_YUV2BGR ? 0 : 2;
+        dst.create(sz, CV_MAKETYPE(depth, 3));
+        YUV2RGB_caller(src, dst, bidx);
+        break;
+    }
+    case CV_YUV2RGB_NV12:
+    case CV_YUV2BGR_NV12:
+    case CV_YUV2RGBA_NV12:
+    case CV_YUV2BGRA_NV12:
+    {
+        CV_Assert(scn == 1);
+        CV_Assert( sz.width % 2 == 0 && sz.height % 3 == 0 && depth == CV_8U );
+        dcn  = code == CV_YUV2BGRA_NV12 || code == CV_YUV2RGBA_NV12 ? 4 : 3;
+        bidx = code == CV_YUV2BGRA_NV12 || code == CV_YUV2BGR_NV12 ? 0 : 2;
+
+        Size dstSz(sz.width, sz.height * 2 / 3);
+        dst.create(dstSz, CV_MAKETYPE(depth, dcn));
+        YUV2RGB_NV12_caller(src, dst, bidx);
+        break;
+    }
+    case CV_BGR2YCrCb:
+    case CV_RGB2YCrCb:
+    {
+        CV_Assert(scn == 3 || scn == 4);
+        bidx = code == CV_BGR2YCrCb ? 0 : 2;
+        dst.create(sz, CV_MAKETYPE(depth, 3));
+        RGB2YCrCb_caller(src, dst, bidx);
+        break;
+    }
+    case CV_YCrCb2BGR:
+    case CV_YCrCb2RGB:
+    {
+        break;
+    }
     /*
     case CV_BGR5652GRAY: case CV_BGR5552GRAY:
-        case CV_GRAY2BGR: case CV_GRAY2BGRA:
     case CV_GRAY2BGR565: case CV_GRAY2BGR555:
     case CV_BGR2YCrCb: case CV_RGB2YCrCb:
-        case CV_BGR2YUV: case CV_RGB2YUV:
-        case CV_YCrCb2BGR: case CV_YCrCb2RGB:
-        case CV_YUV2BGR: case CV_YUV2RGB:
     case CV_BGR2XYZ: case CV_RGB2XYZ:
     case CV_XYZ2BGR: case CV_XYZ2RGB:
     case CV_BGR2HSV: case CV_RGB2HSV: case CV_BGR2HSV_FULL: case CV_RGB2HSV_FULL:
@@ -142,7 +282,7 @@ namespace
     default:
         CV_Error( CV_StsBadFlag, "Unknown/unsupported color conversion code" );
     }
-    }
+}
 }
 
 void cv::ocl::cvtColor(const oclMat &src, oclMat &dst, int code, int dcn)

modules/ocl/test/test_color.cpp

+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                           License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2010-2012, Multicoreware, Inc., all rights reserved.
+// Copyright (C) 2010-2012, Advanced Micro Devices, Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// @Authors
+//    Peng Xiao, pengxiao@multicorewareinc.com
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other oclMaterials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors as is and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#include "precomp.hpp"
+#ifdef HAVE_OPENCL
+
+//#define MAT_DEBUG
+#ifdef MAT_DEBUG
+#define MAT_DIFF(mat, mat2)\
+{\
+    for(int i = 0; i < mat.rows; i ++)\
+    {\
+        for(int j = 0; j < mat.cols; j ++)\
+        {\
+            cv::Vec4b s = mat.at<cv::Vec4b>(i, j);\
+            cv::Vec4b s2 = mat2.at<cv::Vec4b>(i, j);\
+            if(s != s2) printf("*");\
+            else printf(".");\
+        }\
+        puts("\n");\
+    }\
+}
+#else
+#define MAT_DIFF(mat, mat2)
+#endif
+
+
+namespace
+{
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////
+// cvtColor
+PARAM_TEST_CASE(CvtColor, cv::Size, MatDepth)
+{
+    cv::Size size;
+    int depth;
+    bool useRoi;
+
+    cv::Mat img;
+
+    virtual void SetUp()
+    {
+        size = GET_PARAM(0);
+        depth = GET_PARAM(1);
+
+        img = randomMat(size, CV_MAKE_TYPE(depth, 3), 0.0, depth == CV_32F ? 1.0 : 255.0);
+    }
+};
+
+#define CVTCODE(name) cv::COLOR_ ## name
+#define TEST_P_CVTCOLOR(name) TEST_P(CvtColor, name)\
+{\
+    cv::Mat src = img;\
+    cv::ocl::oclMat ocl_img, dst;\
+    ocl_img.upload(img);\
+    cv::ocl::cvtColor(ocl_img, dst, CVTCODE(name));\
+    cv::Mat dst_gold;\
+    cv::cvtColor(src, dst_gold, CVTCODE(name));\
+    cv::Mat dst_mat;\
+    dst.download(dst_mat);\
+    EXPECT_MAT_NEAR(dst_gold, dst_mat, 1e-5, "");\
+}
+
+//add new ones here using macro
+TEST_P_CVTCOLOR(RGB2GRAY)
+TEST_P_CVTCOLOR(BGR2GRAY)
+TEST_P_CVTCOLOR(RGBA2GRAY)
+TEST_P_CVTCOLOR(BGRA2GRAY)
+
+TEST_P_CVTCOLOR(RGB2YUV)
+TEST_P_CVTCOLOR(BGR2YUV)
+TEST_P_CVTCOLOR(YUV2RGB)
+TEST_P_CVTCOLOR(YUV2BGR)
+TEST_P_CVTCOLOR(RGB2YCrCb)
+TEST_P_CVTCOLOR(BGR2YCrCb)
+
+PARAM_TEST_CASE(CvtColor_Gray2RGB, cv::Size, MatDepth, int)
+{
+    cv::Size size;
+    int code;
+    int depth;
+    cv::Mat img;
+
+    virtual void SetUp()
+    {
+        size  = GET_PARAM(0);
+        depth = GET_PARAM(1);
+        code  = GET_PARAM(2);
+        img   = randomMat(size, CV_MAKETYPE(depth, 1), 0.0, depth == CV_32F ? 1.0 : 255.0);
+    }
+};
+TEST_P(CvtColor_Gray2RGB, Accuracy)
+{
+    cv::Mat src = img;
+    cv::ocl::oclMat ocl_img, dst;
+    ocl_img.upload(src);
+    cv::ocl::cvtColor(ocl_img, dst, code);
+    cv::Mat dst_gold;
+    cv::cvtColor(src, dst_gold, code);
+    cv::Mat dst_mat;
+    dst.download(dst_mat);
+    EXPECT_MAT_NEAR(dst_gold, dst_mat, 1e-5, "");
+}
+
+
+PARAM_TEST_CASE(CvtColor_YUV420, cv::Size, int)
+{
+    cv::Size size;
+    int code;
+
+    cv::Mat img;
+
+    virtual void SetUp()
+    {
+        size = GET_PARAM(0);
+        code = GET_PARAM(1);
+        img  = randomMat(size, CV_8UC1, 0.0, 255.0);
+    }
+};
+
+TEST_P(CvtColor_YUV420, Accuracy)
+{
+    cv::Mat src = img;
+    cv::ocl::oclMat ocl_img, dst;
+    ocl_img.upload(src);
+    cv::ocl::cvtColor(ocl_img, dst, code);
+    cv::Mat dst_gold;
+    cv::cvtColor(src, dst_gold, code);
+    cv::Mat dst_mat;
+    dst.download(dst_mat);
+    MAT_DIFF(dst_mat, dst_gold);
+    EXPECT_MAT_NEAR(dst_gold, dst_mat, 1e-5, "");
+}
+
+INSTANTIATE_TEST_CASE_P(OCL_ImgProc, CvtColor, testing::Combine(
+                            DIFFERENT_SIZES,
+                            testing::Values(MatDepth(CV_8U), MatDepth(CV_16U), MatDepth(CV_32F))
+                        ));
+
+INSTANTIATE_TEST_CASE_P(OCL_ImgProc, CvtColor_YUV420, testing::Combine(
+                            testing::Values(cv::Size(128, 45), cv::Size(46, 132), cv::Size(1024, 1023)),
+                            testing::Values(CV_YUV2RGBA_NV12, CV_YUV2BGRA_NV12, CV_YUV2RGB_NV12, CV_YUV2BGR_NV12)
+                        ));
+
+INSTANTIATE_TEST_CASE_P(OCL_ImgProc, CvtColor_Gray2RGB, testing::Combine(
+                            DIFFERENT_SIZES,
+                            testing::Values(MatDepth(CV_8U), MatDepth(CV_16U), MatDepth(CV_32F)),
+                            testing::Values(CV_GRAY2BGR, CV_GRAY2BGRA, CV_GRAY2RGB, CV_GRAY2RGBA)
+                        ));
+}
+#endif