fixed ocl::cvtColor for CV_YUV2BGRA and CV_YUV2RGBA

modules/ocl/src/color.cpp

@@ -50,20 +50,8 @@
 using namespace cv;
 using namespace cv::ocl;
 
-#ifndef CV_DESCALE
-#define CV_DESCALE(x, n) (((x) + (1 << ((n)-1))) >> (n))
-#endif
-
-#ifndef FLT_EPSILON
-#define FLT_EPSILON     1.192092896e-07F
-#endif
-
-namespace
-{
-
-void RGB2Gray_caller(const oclMat &src, oclMat &dst, int bidx)
+static void RGB2Gray_caller(const oclMat &src, oclMat &dst, int bidx)
 {
-    int channels = src.oclchannels();
     int src_offset = src.offset / src.elemSize1(), src_step = src.step1();
     int dst_offset = dst.offset / dst.elemSize1(), dst_step = dst.step1();
 
@@ -74,19 +62,19 @@ void RGB2Gray_caller(const oclMat &src, oclMat &dst, int bidx)
     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));
     args.push_back( make_pair( sizeof(cl_int) , (void *)&src_offset ));
     args.push_back( make_pair( sizeof(cl_int) , (void *)&dst_offset ));
 
-    size_t gt[3] = {src.cols, src.rows, 1}, lt[3] = {16, 16, 1};
+    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.c_str());
 }
 
-void Gray2RGB_caller(const oclMat &src, oclMat &dst)
+static void Gray2RGB_caller(const oclMat &src, oclMat &dst)
 {
+    int channels = dst.channels();
     std::string build_options = format("-D DEPTH_%d", src.depth());
     int src_offset = src.offset / src.elemSize1(), src_step = src.step1();
     int dst_offset = dst.offset / dst.elemSize1(), dst_step = dst.step1();
@@ -96,6 +84,7 @@ void Gray2RGB_caller(const oclMat &src, oclMat &dst)
     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_mem) , (void *)&src.data));
     args.push_back( make_pair( sizeof(cl_mem) , (void *)&dst.data));
     args.push_back( make_pair( sizeof(cl_int) , (void *)&src_offset ));
@@ -105,9 +94,8 @@ void Gray2RGB_caller(const oclMat &src, oclMat &dst)
     openCLExecuteKernel(src.clCxt, &cvt_color, "Gray2RGB", gt, lt, args, -1, -1, build_options.c_str());
 }
 
-void RGB2YUV_caller(const oclMat &src, oclMat &dst, int bidx)
+static void RGB2YUV_caller(const oclMat &src, oclMat &dst, int bidx)
 {
-    int channels = src.oclchannels();
     std::string build_options = format("-D DEPTH_%d", src.depth());
     int src_offset = src.offset / src.elemSize1(), src_step = src.step1();
     int dst_offset = dst.offset / dst.elemSize1(), dst_step = dst.step1();
@@ -117,7 +105,6 @@ void RGB2YUV_caller(const oclMat &src, oclMat &dst, int bidx)
     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));
@@ -128,9 +115,9 @@ void RGB2YUV_caller(const oclMat &src, oclMat &dst, int bidx)
     openCLExecuteKernel(src.clCxt, &cvt_color, "RGB2YUV", gt, lt, args, -1, -1, build_options.c_str());
 }
 
-void YUV2RGB_caller(const oclMat &src, oclMat &dst, int bidx)
+static void YUV2RGB_caller(const oclMat &src, oclMat &dst, int bidx)
 {
-    int channels = src.oclchannels();
+    int channels = dst.channels();
     int src_offset = src.offset / src.elemSize1(), src_step = src.step1();
     int dst_offset = dst.offset / dst.elemSize1(), dst_step = dst.step1();
 
@@ -152,7 +139,7 @@ void YUV2RGB_caller(const oclMat &src, oclMat &dst, int bidx)
     openCLExecuteKernel(src.clCxt, &cvt_color, "YUV2RGB", gt, lt, args, -1, -1, buildOptions.c_str());
 }
 
-void YUV2RGB_NV12_caller(const oclMat &src, oclMat &dst, int bidx)
+static void YUV2RGB_NV12_caller(const oclMat &src, oclMat &dst, int bidx)
 {
     std::string build_options = format("-D DEPTH_%d", src.depth());
     int src_offset = src.offset / src.elemSize1(), src_step = src.step1();
@@ -175,9 +162,8 @@ void YUV2RGB_NV12_caller(const oclMat &src, oclMat &dst, int bidx)
     openCLExecuteKernel(src.clCxt, &cvt_color, "YUV2RGBA_NV12", gt, lt, args, -1, -1, build_options.c_str());
 }
 
-void RGB2YCrCb_caller(const oclMat &src, oclMat &dst, int bidx)
+static void RGB2YCrCb_caller(const oclMat &src, oclMat &dst, int bidx)
 {
-    int channels = src.oclchannels();
     std::string build_options = format("-D DEPTH_%d", src.depth());
     int src_offset = src.offset / src.elemSize1(), src_step = src.step1();
     int dst_offset = dst.offset / dst.elemSize1(), dst_step = dst.step1();
@@ -187,7 +173,6 @@ void RGB2YCrCb_caller(const oclMat &src, oclMat &dst, int bidx)
     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));
@@ -198,10 +183,10 @@ void RGB2YCrCb_caller(const oclMat &src, oclMat &dst, int bidx)
     openCLExecuteKernel(src.clCxt, &cvt_color, "RGB2YCrCb", gt, lt, args, -1, -1, build_options.c_str());
 }
 
-void cvtColor_caller(const oclMat &src, oclMat &dst, int code, int dcn)
+static void cvtColor_caller(const oclMat &src, oclMat &dst, int code, int dcn)
 {
     Size sz = src.size();
-    int scn = src.oclchannels(), depth = src.depth(), bidx;
+    int scn = src.channels(), depth = src.depth(), bidx;
 
     CV_Assert(depth == CV_8U || depth == CV_16U || depth == CV_32F);
 
@@ -239,7 +224,7 @@ void cvtColor_caller(const oclMat &src, oclMat &dst, int code, int dcn)
     case CV_RGB2YUV:
     {
         CV_Assert(scn == 3 || scn == 4);
-        bidx = code == CV_RGB2YUV ? 0 : 2;
+        bidx = code == CV_BGR2YUV ? 0 : 2;
         dst.create(sz, CV_MAKETYPE(depth, 3));
         RGB2YUV_caller(src, dst, bidx);
         break;
@@ -247,9 +232,11 @@ void cvtColor_caller(const oclMat &src, oclMat &dst, int code, int dcn)
     case CV_YUV2BGR:
     case CV_YUV2RGB:
     {
-        CV_Assert(scn == 3 || scn == 4);
-        bidx = code == CV_YUV2RGB ? 0 : 2;
-        dst.create(sz, CV_MAKETYPE(depth, 3));
+        if( dcn <= 0 )
+            dcn = 3;
+        CV_Assert(scn == 3 && (dcn == 3 || dcn == 4));
+        bidx = code == CV_YUV2BGR ? 0 : 2;
+        dst.create(sz, CV_MAKETYPE(depth, dcn));
         YUV2RGB_caller(src, dst, bidx);
         break;
     }
@@ -280,6 +267,12 @@ void cvtColor_caller(const oclMat &src, oclMat &dst, int code, int dcn)
     case CV_YCrCb2BGR:
     case CV_YCrCb2RGB:
     {
+        if( dcn <= 0 )
+            dcn = 3;
+        CV_Assert(scn == 3 && (dcn == 3 || dcn == 4));
+        bidx = code == CV_YCrCb2RGB ? 0 : 2;
+        dst.create(sz, CV_MAKETYPE(depth, dcn));
+//        YUV2RGB_caller(src, dst, bidx);
         break;
     }
     /*
@@ -297,7 +290,6 @@ void cvtColor_caller(const oclMat &src, oclMat &dst, int code, int dcn)
         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

@@ -46,8 +46,6 @@
 #include "test_precomp.hpp"
 #ifdef HAVE_OPENCL
 
-namespace
-{
 using namespace testing;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -108,8 +106,8 @@ PARAM_TEST_CASE(CvtColor, MatDepth, bool)
         {
             random_roi(channelsIn, channelsOut);
 
-            cv::cvtColor(src1_roi, dst1_roi, code);
-            cv::ocl::cvtColor(gsrc1_roi, gdst1_roi, code);
+            cv::cvtColor(src1_roi, dst1_roi, code, channelsOut);
+            cv::ocl::cvtColor(gsrc1_roi, gdst1_roi, code, channelsOut);
 
             Near();
         }
@@ -125,7 +123,7 @@ OCL_TEST_P(CvtColor, RGB2GRAY)
 OCL_TEST_P(CvtColor, GRAY2RGB)
 {
     doTest(1, 3, CVTCODE(GRAY2RGB));
-};
+}
 
 OCL_TEST_P(CvtColor, BGR2GRAY)
 {
@@ -134,25 +132,26 @@ OCL_TEST_P(CvtColor, BGR2GRAY)
 OCL_TEST_P(CvtColor, GRAY2BGR)
 {
     doTest(1, 3, CVTCODE(GRAY2BGR));
-};
+}
 
 OCL_TEST_P(CvtColor, RGBA2GRAY)
 {
-    doTest(3, 1, CVTCODE(RGBA2GRAY));
+    doTest(4, 1, CVTCODE(RGBA2GRAY));
 }
 OCL_TEST_P(CvtColor, GRAY2RGBA)
 {
-    doTest(1, 3, CVTCODE(GRAY2RGBA));
-};
+    doTest(1, 4, CVTCODE(GRAY2RGBA));
+}
 
 OCL_TEST_P(CvtColor, BGRA2GRAY)
 {
-    doTest(3, 1, CVTCODE(BGRA2GRAY));
+    doTest(4, 1, CVTCODE(BGRA2GRAY));
 }
 OCL_TEST_P(CvtColor, GRAY2BGRA)
 {
-    doTest(1, 3, CVTCODE(GRAY2BGRA));
-};
+    doTest(1, 4, CVTCODE(GRAY2BGRA));
+}
+
 
 OCL_TEST_P(CvtColor, RGB2YUV)
 {
@@ -162,6 +161,14 @@ OCL_TEST_P(CvtColor, BGR2YUV)
 {
     doTest(3, 3, CVTCODE(BGR2YUV));
 }
+OCL_TEST_P(CvtColor, RGBA2YUV)
+{
+    doTest(4, 3, CVTCODE(RGB2YUV));
+}
+OCL_TEST_P(CvtColor, BGRA2YUV)
+{
+    doTest(4, 3, CVTCODE(BGR2YUV));
+}
 OCL_TEST_P(CvtColor, YUV2RGB)
 {
     doTest(3, 3, CVTCODE(YUV2RGB));
@@ -170,6 +177,16 @@ OCL_TEST_P(CvtColor, YUV2BGR)
 {
     doTest(3, 3, CVTCODE(YUV2BGR));
 }
+OCL_TEST_P(CvtColor, YUV2RGBA)
+{
+    doTest(3, 4, CVTCODE(YUV2RGB));
+}
+OCL_TEST_P(CvtColor, YUV2BGRA)
+{
+    doTest(3, 4, CVTCODE(YUV2BGR));
+}
+
+
 OCL_TEST_P(CvtColor, RGB2YCrCb)
 {
     doTest(3, 3, CVTCODE(RGB2YCrCb));
@@ -178,8 +195,33 @@ OCL_TEST_P(CvtColor, BGR2YCrCb)
 {
     doTest(3, 3, CVTCODE(BGR2YCrCb));
 }
-
-struct CvtColor_YUV420 : CvtColor
+OCL_TEST_P(CvtColor, RGBA2YCrCb)
+{
+    doTest(4, 3, CVTCODE(RGB2YCrCb));
+}
+OCL_TEST_P(CvtColor, BGRA2YCrCb)
+{
+    doTest(4, 3, CVTCODE(BGR2YCrCb));
+}
+//OCL_TEST_P(CvtColor, YCrCb2RGB)
+//{
+//    doTest(3, 3, CVTCODE(YCrCb2RGB));
+//}
+//OCL_TEST_P(CvtColor, YCrCb2BGR)
+//{
+//    doTest(3, 3, CVTCODE(YCrCb2BGR));
+//}
+//OCL_TEST_P(CvtColor, YCrCb2RGBA)
+//{
+//    doTest(3, 4, CVTCODE(YCrCb2RGB));
+//}
+//OCL_TEST_P(CvtColor, YCrCb2BGRA)
+//{
+//    doTest(3, 4, CVTCODE(YCrCb2BGR));
+//}
+
+struct CvtColor_YUV420 :
+        public CvtColor
 {
     void random_roi(int channelsIn, int channelsOut)
     {
@@ -203,37 +245,32 @@ struct CvtColor_YUV420 : CvtColor
 OCL_TEST_P(CvtColor_YUV420, YUV2RGBA_NV12)
 {
     doTest(1, 4, CV_YUV2RGBA_NV12);
-};
+}
 
 OCL_TEST_P(CvtColor_YUV420, YUV2BGRA_NV12)
 {
     doTest(1, 4, CV_YUV2BGRA_NV12);
-};
+}
 
 OCL_TEST_P(CvtColor_YUV420, YUV2RGB_NV12)
 {
     doTest(1, 3, CV_YUV2RGB_NV12);
-};
+}
 
 OCL_TEST_P(CvtColor_YUV420, YUV2BGR_NV12)
 {
     doTest(1, 3, CV_YUV2BGR_NV12);
-};
+}
 
 
 INSTANTIATE_TEST_CASE_P(OCL_ImgProc, CvtColor,
                             testing::Combine(
                                 testing::Values(MatDepth(CV_8U), MatDepth(CV_16U), MatDepth(CV_32F)),
-                                Bool()
-                            )
-                        );
+                                Bool()));
 
 INSTANTIATE_TEST_CASE_P(OCL_ImgProc, CvtColor_YUV420,
                             testing::Combine(
                                 testing::Values(MatDepth(CV_8U)),
-                                Bool()
-                            )
-                        );
+                                Bool()));
 
-}
 #endif