Added ocl::pyrDown to T-API

modules/imgproc/src/pyramids.cpp

@@ -41,6 +41,7 @@
 //M*/
 
 #include "precomp.hpp"
+#include "opencl_kernels.hpp"
 
 namespace cv
 {
@@ -402,8 +403,51 @@ typedef void (*PyrFunc)(const Mat&, Mat&, int);
 
 }
 
+namespace cv
+{
+
+static bool ocl_pyrDown( InputArray _src, OutputArray _dst, const Size& _dsz, int borderType)
+{
+    int type = _src.type(), depth = CV_MAT_DEPTH(type), channels = CV_MAT_CN(type);
+
+    if (depth != CV_8U && depth != CV_16U && depth != CV_16S && depth != CV_32F)
+        return false;
+    if (channels != 1 && channels != 3 && channels != 4)
+        return false;
+    double doubleSupport = ocl::Device::getDefault().doubleFPConfig() > 0;
+
+    UMat src = _src.getUMat();
+    Size dsize = cv::Size((src.rows + 1) / 2, (src.cols + 1) / 2);
+    _dst.create( dsize, src.type() );
+    UMat dst = _dst.getUMat();
+
+    const char * const kernelName = "pyrDown";
+    ocl::ProgramSource2 program = ocl::imgproc::pyr_down_oclsrc;
+    ocl::Kernel k;
+
+    char cvt[2][50];
+    k.create(kernelName, program,
+                 format("-D T=%s -D cn=%d -D convertToT=%s%s -D convertToFT=%s%s", 
+                 ocl::typeToStr(type), channels, 
+                 ocl::convertTypeStr(CV_32F, depth, channels, cvt[0]),
+                 ocl::convertTypeStr(depth, CV_32F, channels, cvt[1]),
+                 doubleSupport ? " -D DOUBLE_SUPPORT" : ""));
+
+    k.args(ocl::KernelArg::ReadOnly(src), ocl::KernelArg::WriteOnly(dst));
+    
+    size_t localThreads[2]  = { 256, 1 };
+    size_t globalThreads[2] = { src.cols, dst.rows };
+    return k.run(2, globalThreads, localThreads, false);
+}
+
+}
+
 void cv::pyrDown( InputArray _src, OutputArray _dst, const Size& _dsz, int borderType )
 {
+    if (ocl::useOpenCL() && _dst.isUMat() &&
+        ocl_pyrDown(_src, _dst, _dsz, borderType))
+    return;
+
     Mat src = _src.getMat();
     Size dsz = _dsz == Size() ? Size((src.cols + 1)/2, (src.rows + 1)/2) : _dsz;
     _dst.create( dsz, src.type() );

modules/imgproc/test/ocl/test_pyramids.cpp

@@ -0,0 +1,117 @@
+///////////////////////////////////////////////////////////////////////////////////////
+//
+//  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, Institute Of Software Chinese Academy Of Science, all rights reserved.
+// Copyright (C) 2010-2012, Advanced Micro Devices, Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// @Authors
+//    Yao Wang yao@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 materials 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 "test_precomp.hpp"
+#include <iomanip>
+
+#ifdef HAVE_OPENCL
+
+using namespace cv;
+using namespace testing;
+using namespace std;
+
+PARAM_TEST_CASE(PyrBase, MatDepth, Channels)
+{
+    int depth;
+    int channels;
+
+    Mat dst_cpu;
+    ocl::oclMat gdst;
+
+    virtual void SetUp()
+    {
+        depth = GET_PARAM(0);
+        channels = GET_PARAM(1);
+    }
+};
+
+/////////////////////// PyrDown //////////////////////////
+
+typedef PyrBase PyrDown;
+
+OCL_TEST_P(PyrDown, Mat)
+{
+    for (int j = 0; j < LOOP_TIMES; j++)
+    {
+        Size size(MWIDTH, MHEIGHT);
+        Mat src = randomMat(size, CV_MAKETYPE(depth, channels), 0, 255);
+        ocl::oclMat gsrc(src);
+
+        pyrDown(src, dst_cpu);
+        ocl::pyrDown(gsrc, gdst);
+
+        EXPECT_MAT_NEAR(dst_cpu, Mat(gdst), depth == CV_32F ? 1e-4f : 1.0f);
+    }
+}
+
+INSTANTIATE_TEST_CASE_P(OCL_ImgProc, PyrDown, Combine(
+                            Values(CV_8U, CV_16U, CV_16S, CV_32F),
+                            Values(1, 3, 4)));
+
+/////////////////////// PyrUp //////////////////////////
+
+typedef PyrBase PyrUp;
+
+OCL_TEST_P(PyrUp, Accuracy)
+{
+    for (int j = 0; j < LOOP_TIMES; j++)
+    {
+        Size size(MWIDTH, MHEIGHT);
+        Mat src = randomMat(size, CV_MAKETYPE(depth, channels), 0, 255);
+        ocl::oclMat gsrc(src);
+
+        pyrUp(src, dst_cpu);
+        ocl::pyrUp(gsrc, gdst);
+
+        EXPECT_MAT_NEAR(dst_cpu, Mat(gdst), (depth == CV_32F ? 1e-4f : 1.0));
+    }
+}
+
+
+INSTANTIATE_TEST_CASE_P(OCL_ImgProc, PyrUp, Combine(
+                            Values(CV_8U, CV_16U, CV_16S, CV_32F),
+                            Values(1, 3, 4)));
+#endif // HAVE_OPENCL