[FINAL] Konverze ComplexMat => cv::Mat

main_vot.cpp

@@ -11,6 +11,7 @@
 #include "kcf.h"
 #include "vot.hpp"
 #include "videoio.hpp"
+#include <opencv2/core/core_c.h>
 
 // Needed for OpenCV <= 3.2 as replacement for Rect::empty()
 bool empty(cv::Rect r)
@@ -280,15 +281,15 @@ int main(int argc, char *argv[])
         std::getline(groundtruth_stream, line);
     }
 
-    cv::Mat image;
+    cv::UMat image;
     io->getNextImage(image);
 
     //img = firts frame, initPos = initial position in the first frame
     if (empty(init_rect))
         init_rect = io->getInitRectangle(); // Try to get BBox from VOT or .txt files
 
     if (empty(init_rect) || set_box_interactively) {
-        init_rect = selectBBox(image, box_out, 1);
+        init_rect = selectBBox(image.getMat(cv::ACCESS_RW), box_out, 1);
         auto b = init_rect;
         printf("--box=%d,%d,%d,%d\n", b.x, b.y, b.width, b.height);
         if (visualize_delay < 0)
@@ -297,14 +298,13 @@ int main(int argc, char *argv[])
     io->outputBoundingBox(init_rect);
 
     if (!video_out.empty()) {
-        int codec = CV_FOURCC('M', 'J', 'P', 'G');  // select desired codec (must be available at runtime)
+        int codec = cv::VideoWriter::fourcc('M', 'J', 'P', 'G');  // select desired codec (must be available at runtime)
         double fps = 25.0;                          // framerate of the created video stream
         videoWriter.open(video_out, codec, fps, image.size(), true);
     }
 
     tracker.init(image, init_rect, fit_size_x, fit_size_y);
 
-
     BBox_c bb;
     cv::Rect bb_rect;
     double avg_time = 0., sum_accuracy = 0.;
@@ -367,7 +367,7 @@ int main(int argc, char *argv[])
                     break;
                 switch (key) {
                 case 'i':
-                    init_rect = selectBBox(image, box_out, io->getImageNum());
+                    init_rect = selectBBox(image.getMat(cv::ACCESS_RW), box_out, io->getImageNum());
                     tracker.init(image, init_rect, fit_size_x, fit_size_y);
                     break;
                 case 'o':

src/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
-set(KCF_LIB_SRC kcf.cpp kcf.h fft.cpp threadctx.hpp pragmas.h dynmem.hpp debug.cpp complexmat.hpp)
+set(KCF_LIB_SRC kcf.cpp kcf.h fft.cpp threadctx.hpp pragmas.h debug.cpp)
 
 find_package(PkgConfig)
 
@@ -51,12 +51,6 @@ ELSE()
   MESSAGE(FATAL_ERROR "Invalid FFT implementation selected")
 ENDIF()
 
-IF(FFT STREQUAL "cuFFT")
-  list(APPEND KCF_LIB_SRC complexmat.cu)
-ELSE()
-  list(APPEND KCF_LIB_SRC complexmat.cpp)
-ENDIF()
-
 IF((FFT STREQUAL "OpenCV") AND BIG_BATCH)
   message(SEND_ERROR "OpenCV version does not support big batch mode.")
 ENDIF()

src/cn/cnfeat.hpp

@@ -30,6 +30,27 @@ class CNFeat
         }
         return cn_feat;
     }
+
+    static std::vector<cv::UMat> extract(const cv::UMat & patch_rgb)
+    {
+        std::vector<cv::UMat> cn_feat(p_cn_channels);
+        for (int i = 0; i < p_cn_channels; ++i) {
+            cn_feat[i].create(patch_rgb.size(), CV_32FC1);
+        }
+
+        float * ch_ptr[p_cn_channels];
+        for (int y = 0; y < patch_rgb.rows; ++y) {
+            for (int i = 0; i < p_cn_channels; ++i)
+                ch_ptr[i] = cn_feat[i].getMat(cv::ACCESS_RW).ptr<float>(y);
+            for (int x = 0; x < patch_rgb.cols; ++x) {
+                //images in opencv stored in BGR order
+                cv::Vec3b bgr_val = patch_rgb.getMat(cv::ACCESS_RW).at<cv::Vec3b>(y,x);
+                for (int i = 0; i < p_cn_channels; ++i)
+                    ch_ptr[i][x] = p_id2feat[rgb2id(bgr_val[2], bgr_val[1], bgr_val[0])][i];
+            }
+        }
+        return cn_feat;
+    }
 
 private:
     inline static int rgb2id(int r, int g, int b)