Fixed preview box for short-term object detection (small box) and long-term...

AlexeyAB

2018-01-25 8b94d474d591dd76d146c9aeed029d0b5836ac3f

 src/yolo_v2_class.hpp

@@ -8,11 +8,6 @@
#include <opencv2/opencv.hpp>       // C++
#include "opencv2/highgui/highgui_c.h" // C
#include "opencv2/imgproc/imgproc_c.h" // C

#include <opencv2/cudaoptflow.hpp>
#include <opencv2/cudaimgproc.hpp>
#include <opencv2/cudaarithm.hpp>
#include <opencv2/core/cuda.hpp>
#endif   // OPENCV

#ifdef YOLODLL_EXPORTS
@@ -34,6 +29,7 @@
   float prob;             // confidence - probability that the object was found correctly
   unsigned int obj_id;    // class of object - from range [0, classes-1]
   unsigned int track_id;     // tracking id for video (0 - untracked, 1 - inf - tracked object)
   unsigned int frames_counter;// counter of frames on which the object was detected
};

struct image_t {
@@ -62,7 +58,7 @@
   YOLODLL_API int get_net_width() const;
   YOLODLL_API int get_net_height() const;

   YOLODLL_API std::vector<bbox_t> tracking(std::vector<bbox_t> cur_bbox_vec, int const frames_story = 6);
   YOLODLL_API std::vector<bbox_t> tracking_id(std::vector<bbox_t> cur_bbox_vec, int const frames_story = 6, int const max_dist = 150);

#ifdef OPENCV
   std::vector<bbox_t> detect(cv::Mat mat, float thresh = 0.2, bool use_mean = false)
@@ -149,6 +145,11 @@

#if defined(TRACK_OPTFLOW) && defined(OPENCV)

#include <opencv2/cudaoptflow.hpp>
#include <opencv2/cudaimgproc.hpp>
#include <opencv2/cudaarithm.hpp>
#include <opencv2/core/cuda.hpp>

class Tracker_optflow {
public:
   const int gpu_count;
@@ -163,7 +164,7 @@
      stream = cv::cuda::Stream();

      sync_PyrLKOpticalFlow_gpu = cv::cuda::SparsePyrLKOpticalFlow::create();
      sync_PyrLKOpticalFlow_gpu->setWinSize(cv::Size(21, 21)); // 15, 21, 31
      sync_PyrLKOpticalFlow_gpu->setWinSize(cv::Size(9, 9));   // 15, 21, 31
      sync_PyrLKOpticalFlow_gpu->setMaxLevel(3);      // +- 3 pt
      sync_PyrLKOpticalFlow_gpu->setNumIters(2000);   // def: 30

@@ -201,7 +202,7 @@
   }


   std::vector<bbox_t> tracking_flow(cv::Mat dst_mat, std::vector<bbox_t> cur_bbox_vec)
   std::vector<bbox_t> tracking_flow(cv::Mat dst_mat, std::vector<bbox_t> cur_bbox_vec, bool check_error = false)
   {
      if (sync_PyrLKOpticalFlow_gpu.empty()) {
         std::cout << "sync_PyrLKOpticalFlow_gpu isn't initialized \n";
@@ -283,7 +284,7 @@

         if (err_cpu.cols > i &&  status_cpu.cols > i)
            if (abs(moved_x) < 100 && abs(moved_y) < 100)
               //if (err_cpu.at<float>(0, i) < 60 && status_cpu.at<unsigned char>(0, i) != 0)
               if (!check_error || (err_cpu.at<float>(0, i) < 60 && status_cpu.at<unsigned char>(0, i) != 0))
               {
                  cur_bbox_vec[i].x += moved_x + 0.5;
                  cur_bbox_vec[i].y += moved_y + 0.5;