converted CPU-based example to T-API (Mat 2 UMat, etc)

modules/core/include/opencv2/core/mat.inl.hpp

@@ -267,6 +267,12 @@ inline _InputOutputArray::_InputOutputArray(const Mat& m)
 inline _InputOutputArray::_InputOutputArray(const std::vector<Mat>& vec)
 { init(FIXED_SIZE + STD_VECTOR_MAT + ACCESS_RW, &vec); }
 
+inline _InputOutputArray::_InputOutputArray(const UMat& m)
+{ init(FIXED_TYPE + FIXED_SIZE + UMAT + ACCESS_RW, &m); }
+
+inline _InputOutputArray::_InputOutputArray(const std::vector<UMat>& vec)
+{ init(FIXED_SIZE + STD_VECTOR_UMAT + ACCESS_RW, &vec); }
+
 inline _InputOutputArray::_InputOutputArray(const cuda::GpuMat& d_mat)
 { init(FIXED_TYPE + FIXED_SIZE + GPU_MAT + ACCESS_RW, &d_mat); }
 

samples/ocl/CMakeLists.txt

-SET(OPENCV_OCL_SAMPLES_REQUIRED_DEPS opencv_core opencv_imgproc opencv_highgui
+SET(OPENCV_OCL_SAMPLES_REQUIRED_DEPS opencv_core opencv_flann opencv_imgproc opencv_highgui
                                      opencv_ml opencv_video opencv_objdetect opencv_features2d
-                                     opencv_ocl opencv_nonfree opencv_bioinspired)
+                                     opencv_calib3d opencv_legacy opencv_contrib opencv_ocl
+                                     opencv_nonfree opencv_bioinspired)
 
 ocv_check_dependencies(${OPENCV_OCL_SAMPLES_REQUIRED_DEPS})
 

samples/tapi/camshift.cpp

 #include "opencv2/core/utility.hpp"
+#include "opencv2/core/ocl.hpp"
 #include "opencv2/video/tracking.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/highgui/highgui.hpp"
@@ -6,17 +7,18 @@
 #include <iostream>
 #include <cctype>
 
-static cv::Mat image;
+static cv::UMat image;
 static bool backprojMode = false;
 static bool selectObject = false;
 static int trackObject = 0;
 static bool showHist = true;
-static cv::Point origin;
 static cv::Rect selection;
 static int vmin = 10, vmax = 256, smin = 30;
 
 static void onMouse(int event, int x, int y, int, void*)
 {
+    static cv::Point origin;
+
     if (selectObject)
     {
         selection.x = std::min(x, origin.x);
@@ -27,7 +29,7 @@ static void onMouse(int event, int x, int y, int, void*)
         selection &= cv::Rect(0, 0, image.cols, image.rows);
     }
 
-    switch(event)
+    switch (event)
     {
     case cv::EVENT_LBUTTONDOWN:
         origin = cv::Point(x, y);
@@ -54,14 +56,15 @@ static void help()
 
     std::cout << "\n\nHot keys: \n"
             "\tESC - quit the program\n"
-            "\tc - stop the tracking\n"
+            "\ts - stop the tracking\n"
             "\tb - switch to/from backprojection view\n"
             "\th - show/hide object histogram\n"
             "\tp - pause video\n"
+            "\tc - use OpenCL or not\n"
             "To initialize tracking, select the object with mouse\n";
 }
 
-int main(int argc, const char** argv)
+int main(int argc, const char ** argv)
 {
     help();
 
@@ -69,7 +72,6 @@ int main(int argc, const char** argv)
     cv::Rect trackWindow;
     int hsize = 16;
     float hranges[2] = { 0, 180 };
-    const float * phranges = hranges;
 
     const char * const keys = { "{@camera_number| 0 | camera number}" };
     cv::CommandLineParser parser(argc, argv, keys);
@@ -80,6 +82,7 @@ int main(int argc, const char** argv)
     if (!cap.isOpened())
     {
         help();
+
         std::cout << "***Could not initialize capturing...***\n";
         std::cout << "Current parameter's value: \n";
         parser.printMessage();
@@ -89,12 +92,13 @@ int main(int argc, const char** argv)
 
     cv::namedWindow("Histogram", cv::WINDOW_NORMAL);
     cv::namedWindow("CamShift Demo", cv::WINDOW_NORMAL);
-    cv::setMouseCallback("CamShift Demo", onMouse, NULL);
-    cv::createTrackbar("Vmin", "CamShift Demo", &vmin, 256, NULL);
-    cv::createTrackbar("Vmax", "CamShift Demo", &vmax, 256, NULL);
-    cv::createTrackbar("Smin", "CamShift Demo", &smin, 256, NULL);
+    cv::setMouseCallback("CamShift Demo", onMouse);
+    cv::createTrackbar("Vmin", "CamShift Demo", &vmin, 256);
+    cv::createTrackbar("Vmax", "CamShift Demo", &vmax, 256);
+    cv::createTrackbar("Smin", "CamShift Demo", &smin, 256);
 
-    cv::Mat frame, hsv, hue, mask, hist, histimg = cv::Mat::zeros(200, 320, CV_8UC3), backproj;
+    cv::Mat frame, histimg(200, 320, CV_8UC3, cv::Scalar::all(0));
+    cv::UMat hsv, hist, hue, mask, backproj;
     bool paused = false;
 
     for ( ; ; )
@@ -119,14 +123,15 @@ int main(int argc, const char** argv)
                 cv::inRange(hsv, cv::Scalar(0, smin, std::min(_vmin, _vmax)),
                         cv::Scalar(180, 256, std::max(_vmin, _vmax)), mask);
 
-                int ch[2] = { 0, 0 };
+                int fromTo[2] = { 0,0 };
                 hue.create(hsv.size(), hsv.depth());
-                cv::mixChannels(&hsv, 1, &hue, 1, ch, 1);
+                cv::mixChannels(std::vector<cv::UMat>(1, hsv), std::vector<cv::UMat>(1, hue), fromTo, 1);
 
                 if (trackObject < 0)
                 {
-                    cv::Mat roi(hue, selection), maskroi(mask, selection);
-                    cv::calcHist(&roi, 1, 0, maskroi, hist, 1, &hsize, &phranges);
+                    cv::UMat roi(hue, selection), maskroi(mask, selection);
+                    cv::calcHist(std::vector<cv::Mat>(1, roi.getMat(cv::ACCESS_READ)), std::vector<int>(1, 0),
+                                 maskroi, hist, std::vector<int>(1, hsize), std::vector<float>(hranges, hranges + 2));
                     cv::normalize(hist, hist, 0, 255, cv::NORM_MINMAX);
 
                     trackWindow = selection;
@@ -139,17 +144,22 @@ int main(int argc, const char** argv)
                         buf.at<cv::Vec3b>(i) = cv::Vec3b(cv::saturate_cast<uchar>(i*180./hsize), 255, 255);
                     cv::cvtColor(buf, buf, cv::COLOR_HSV2BGR);
 
-                    for (int i = 0; i < hsize; i++)
                     {
-                        int val = cv::saturate_cast<int>(hist.at<float>(i)*histimg.rows/255);
-                        cv::rectangle(histimg, cv::Point(i*binW, histimg.rows),
-                                   cv::Point((i+1)*binW, histimg.rows - val),
-                                   cv::Scalar(buf.at<cv::Vec3b>(i)), -1, 8);
+                        cv::Mat _hist = hist.getMat(cv::ACCESS_READ);
+                        for (int i = 0; i < hsize; i++)
+                        {
+                            int val = cv::saturate_cast<int>(_hist.at<float>(i)*histimg.rows/255);
+                            cv::rectangle(histimg, cv::Point(i*binW, histimg.rows),
+                                       cv::Point((i+1)*binW, histimg.rows - val),
+                                       cv::Scalar(buf.at<cv::Vec3b>(i)), -1, 8);
+                        }
                     }
                 }
 
-                cv::calcBackProject(&hue, 1, 0, hist, backproj, &phranges);
-                backproj &= mask;
+                cv::calcBackProject(std::vector<cv::UMat>(1, hue), std::vector<int>(1, 0), hist, backproj,
+                                    std::vector<float>(hranges, hranges + 2), 1.0);
+                cv::bitwise_and(backproj, mask, backproj);
+
                 cv::RotatedRect trackBox = cv::CamShift(backproj, trackWindow,
                                     cv::TermCriteria(cv::TermCriteria::EPS | cv::TermCriteria::COUNT, 10, 1));
                 if (trackWindow.area() <= 1)
@@ -162,7 +172,11 @@ int main(int argc, const char** argv)
 
                 if (backprojMode)
                     cv::cvtColor(backproj, image, cv::COLOR_GRAY2BGR);
-                cv::ellipse(image, trackBox, cv::Scalar(0, 0, 255), 3, cv::LINE_AA);
+
+                {
+                    cv::Mat _image = image.getMat(cv::ACCESS_RW);
+                    cv::ellipse(_image, trackBox, cv::Scalar(0, 0, 255), 3, cv::LINE_AA);
+                }
             }
         }
         else if (trackObject < 0)
@@ -170,12 +184,13 @@ int main(int argc, const char** argv)
 
         if (selectObject && selection.width > 0 && selection.height > 0)
         {
-            cv::Mat roi(image, selection);
+            cv::UMat roi(image, selection);
             cv::bitwise_not(roi, roi);
         }
 
         cv::imshow("CamShift Demo", image);
-        cv::imshow("Histogram", histimg);
+        if (showHist)
+            cv::imshow("Histogram", histimg);
 
         char c = (char)cv::waitKey(10);
         if (c == 27)
@@ -186,7 +201,7 @@ int main(int argc, const char** argv)
         case 'b':
             backprojMode = !backprojMode;
             break;
-        case 'c':
+        case 't':
             trackObject = 0;
             histimg = cv::Scalar::all(0);
             break;
@@ -200,6 +215,8 @@ int main(int argc, const char** argv)
         case 'p':
             paused = !paused;
             break;
+        case 'c':
+            cv::ocl::setUseOpenCL(!cv::ocl::useOpenCL());
         default:
             break;
         }