Added new CSRT tracker from opencv_contrib

CMakeLists.txt

@@ -1,6 +1,6 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.5)
 
-project(MultitargetTracking)
+project(MTTracking)
 
 unset(CMAKE_CXX_FLAGS CACHE)
 
@@ -18,14 +18,21 @@ elseif (MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /W4 -DGTL_STATIC" CACHE STRING COMPILE_FLAGS FORCE)
 endif()
 
-
 set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/build)
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
 
 FIND_PACKAGE(OpenCV)
 
 add_subdirectory(src)
-add_subdirectory(example)
-add_subdirectory(cars_counting)
 
+option(BUILD_EXAMPLES "Should compiled examples (motion detection, pedestrians, faces, DNNs etc)?" ON)
+if (BUILD_EXAMPLES)
+    add_subdirectory(example)
+endif(BUILD_EXAMPLES)
+
+option(BUILD_CARS_COUNTING "Should compiled Cars counting example?" OFF)
+if (BUILD_CARS_COUNTING)
+    add_subdirectory(cars_counting)
+endif(BUILD_CARS_COUNTING)
+

cars_counting/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.5)
 
 project(CarsCounting)
 

cars_counting/CarsCounting.cpp

@@ -76,6 +76,8 @@ void CarsCounting::Process()
 
     m_fps = std::max(1.f, (float)capture.get(cv::CAP_PROP_FPS));
 
+    m_fps = std::max(1.f, (float)capture.get(cv::CAP_PROP_FPS));
+
     cv::Mat colorFrame;
     cv::UMat grayFrame;
     for (;;)
@@ -189,11 +191,19 @@ void CarsCounting::DrawTrack(cv::Mat frame,
 
     if (isStatic)
     {
-        cv::rectangle(frame, ResizeRect(track.GetLastRect()), cv::Scalar(255, 0, 255), 2, CV_AA);
+#if (CV_VERSION_MAJOR >= 4)
+        cv::rectangle(frame, ResizeRect(track.GetLastRect()), cv::Scalar(255, 0, 255), 2, cv::LINE_AA);
+#else
+		cv::rectangle(frame, ResizeRect(track.GetLastRect()), cv::Scalar(255, 0, 255), 2, CV_AA);
+#endif
     }
     else
     {
-        cv::rectangle(frame, ResizeRect(track.GetLastRect()), cv::Scalar(0, 255, 0), 1, CV_AA);
+#if (CV_VERSION_MAJOR >= 4)
+        cv::rectangle(frame, ResizeRect(track.GetLastRect()), cv::Scalar(0, 255, 0), 1, cv::LINE_AA);
+#else
+		cv::rectangle(frame, ResizeRect(track.GetLastRect()), cv::Scalar(0, 255, 0), 1, CV_AA);
+#endif
     }
 
     if (drawTrajectory)
@@ -204,11 +214,18 @@ void CarsCounting::DrawTrack(cv::Mat frame,
         {
             const TrajectoryPoint& pt1 = track.m_trace.at(j);
             const TrajectoryPoint& pt2 = track.m_trace.at(j + 1);
-
-            cv::line(frame, ResizePoint(pt1.m_prediction), ResizePoint(pt2.m_prediction), cl, 1, CV_AA);
+#if (CV_VERSION_MAJOR >= 4)
+            cv::line(frame, ResizePoint(pt1.m_prediction), ResizePoint(pt2.m_prediction), cl, 1, cv::LINE_AA);
+#else
+			cv::line(frame, ResizePoint(pt1.m_prediction), ResizePoint(pt2.m_prediction), cl, 1, CV_AA);
+#endif
             if (!pt2.m_hasRaw)
             {
-                cv::circle(frame, ResizePoint(pt2.m_prediction), 4, cl, 1, CV_AA);
+#if (CV_VERSION_MAJOR >= 4)
+                cv::circle(frame, ResizePoint(pt2.m_prediction), 4, cl, 1, cv::LINE_AA);
+#else
+				cv::circle(frame, ResizePoint(pt2.m_prediction), 4, cl, 1, CV_AA);
+#endif
             }
         }
     }
@@ -219,7 +236,11 @@ void CarsCounting::DrawTrack(cv::Mat frame,
 
         for (auto pt : track.m_lastRegion.m_points)
         {
-            cv::circle(frame, cv::Point(cvRound(pt.x), cvRound(pt.y)), 1, cl, -1, CV_AA);
+#if (CV_VERSION_MAJOR >= 4)
+            cv::circle(frame, cv::Point(cvRound(pt.x), cvRound(pt.y)), 1, cl, -1, cv::LINE_AA);
+#else
+			cv::circle(frame, cv::Point(cvRound(pt.x), cvRound(pt.y)), 1, cl, -1, CV_AA);
+#endif
         }
     }
 }
@@ -254,24 +275,24 @@ bool CarsCounting::InitTracker(cv::UMat frame)
     settings.m_distType = tracking::DistCenters;
     settings.m_kalmanType = tracking::KalmanLinear;
     settings.m_filterGoal = tracking::FilterRect;
-    settings.m_lostTrackType = tracking::TrackKCF;    // Use KCF tracker for collisions resolving
+    settings.m_lostTrackType = tracking::TrackerCSRT; // Use KCF tracker for collisions resolving
     settings.m_matchType = tracking::MatchHungrian;
     settings.m_dt = 0.5f;                             // Delta time for Kalman filter
     settings.m_accelNoiseMag = 0.5f;                  // Accel noise magnitude for Kalman filter
-    settings.m_distThres = frame.rows / 15;           // Distance threshold between region and object on two frames
+    settings.m_distThres = frame.rows / 15.f;         // Distance threshold between region and object on two frames
 
     settings.m_useAbandonedDetection = false;
     if (settings.m_useAbandonedDetection)
     {
         settings.m_minStaticTime = minStaticTime;
         settings.m_maxStaticTime = 60;
-        settings.m_maximumAllowedSkippedFrames = settings.m_minStaticTime * m_fps; // Maximum allowed skipped frames
+        settings.m_maximumAllowedSkippedFrames = cvRound(settings.m_minStaticTime * m_fps); // Maximum allowed skipped frames
         settings.m_maxTraceLength = 2 * settings.m_maximumAllowedSkippedFrames;        // Maximum trace length
     }
     else
     {
-        settings.m_maximumAllowedSkippedFrames = 2 * m_fps; // Maximum allowed skipped frames
-        settings.m_maxTraceLength = 4 * m_fps;              // Maximum trace length
+        settings.m_maximumAllowedSkippedFrames = cvRound(2 * m_fps); // Maximum allowed skipped frames
+        settings.m_maxTraceLength = cvRound(4 * m_fps);              // Maximum trace length
     }
 
     m_tracker = std::make_unique<CTracker>(settings);

example/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.5)
 
 project(MultitargetTracker)
 

example/MouseExample.h

@@ -86,7 +86,11 @@ void MouseTracking(cv::CommandLineParser parser)
 
         for (size_t i = 0; i < pts.size(); i++)
         {
-            cv::circle(frame, pts[i], 3, cv::Scalar(0, 255, 0), 1, CV_AA);
+#if (CV_VERSION_MAJOR >= 4)
+            cv::circle(frame, pts[i], 3, cv::Scalar(0, 255, 0), 1, cv::LINE_AA);
+#else
+			cv::circle(frame, pts[i], 3, cv::Scalar(0, 255, 0), 1, CV_AA);
+#endif
         }
 
         tracker.Update(regions, cv::UMat(), 100);
@@ -101,7 +105,11 @@ void MouseTracking(cv::CommandLineParser parser)
             {
                 for (size_t j = 0; j < track->m_trace.size() - 1; j++)
                 {
-                    cv::line(frame, track->m_trace[j], track->m_trace[j + 1], colors[i % colors.size()], 2, CV_AA);
+#if (CV_VERSION_MAJOR >= 4)
+                    cv::line(frame, track->m_trace[j], track->m_trace[j + 1], colors[i % colors.size()], 2, cv::LINE_AA);
+#else
+					cv::line(frame, track->m_trace[j], track->m_trace[j + 1], colors[i % colors.size()], 2, CV_AA);
+#endif
                 }
             }
         }

example/VideoExample.cpp

@@ -322,11 +322,19 @@ void VideoExample::DrawTrack(cv::Mat frame,
 
     if (isStatic)
     {
-        cv::rectangle(frame, ResizeRect(track.GetLastRect()), cv::Scalar(255, 0, 255), 2, CV_AA);
+#if (CV_VERSION_MAJOR >= 4)
+        cv::rectangle(frame, ResizeRect(track.GetLastRect()), cv::Scalar(255, 0, 255), 2, cv::LINE_AA);
+#else
+		cv::rectangle(frame, ResizeRect(track.GetLastRect()), cv::Scalar(255, 0, 255), 2, CV_AA);
+#endif
     }
     else
     {
-        cv::rectangle(frame, ResizeRect(track.GetLastRect()), cv::Scalar(0, 255, 0), 1, CV_AA);
+#if (CV_VERSION_MAJOR >= 4)
+        cv::rectangle(frame, ResizeRect(track.GetLastRect()), cv::Scalar(0, 255, 0), 1, cv::LINE_AA);
+#else
+		cv::rectangle(frame, ResizeRect(track.GetLastRect()), cv::Scalar(0, 255, 0), 1, CV_AA);
+#endif
     }
 
     if (drawTrajectory)
@@ -337,11 +345,18 @@ void VideoExample::DrawTrack(cv::Mat frame,
         {
             const TrajectoryPoint& pt1 = track.m_trace.at(j);
             const TrajectoryPoint& pt2 = track.m_trace.at(j + 1);
-
-            cv::line(frame, ResizePoint(pt1.m_prediction), ResizePoint(pt2.m_prediction), cl, 1, CV_AA);
+#if (CV_VERSION_MAJOR >= 4)
+            cv::line(frame, ResizePoint(pt1.m_prediction), ResizePoint(pt2.m_prediction), cl, 1, cv::LINE_AA);
+#else
+			cv::line(frame, ResizePoint(pt1.m_prediction), ResizePoint(pt2.m_prediction), cl, 1, CV_AA);
+#endif
             if (!pt2.m_hasRaw)
             {
-                cv::circle(frame, ResizePoint(pt2.m_prediction), 4, cl, 1, CV_AA);
+#if (CV_VERSION_MAJOR >= 4)
+                cv::circle(frame, ResizePoint(pt2.m_prediction), 4, cl, 1, cv::LINE_AA);
+#else
+				cv::circle(frame, ResizePoint(pt2.m_prediction), 4, cl, 1, CV_AA);
+#endif
             }
         }
     }
@@ -352,7 +367,11 @@ void VideoExample::DrawTrack(cv::Mat frame,
 
         for (auto pt : track.m_lastRegion.m_points)
         {
-            cv::circle(frame, cv::Point(cvRound(pt.x), cvRound(pt.y)), 1, cl, -1, CV_AA);
+#if (CV_VERSION_MAJOR >= 4)
+            cv::circle(frame, cv::Point(cvRound(pt.x), cvRound(pt.y)), 1, cl, -1, cv::LINE_AA);
+#else
+			cv::circle(frame, cv::Point(cvRound(pt.x), cvRound(pt.y)), 1, cl, -1, CV_AA);
+#endif
         }
     }
 }

example/VideoExample.h

@@ -138,20 +138,20 @@ class MotionDetectorExample : public VideoExample
         settings.m_matchType = tracking::MatchHungrian;
         settings.m_dt = 0.4f;                             // Delta time for Kalman filter
         settings.m_accelNoiseMag = 0.5f;                  // Accel noise magnitude for Kalman filter
-        settings.m_distThres = frame.rows / 20;           // Distance threshold between region and object on two frames
+        settings.m_distThres = frame.rows / 20.f;         // Distance threshold between region and object on two frames
 
         settings.m_useAbandonedDetection = true;
         if (settings.m_useAbandonedDetection)
         {
             settings.m_minStaticTime = minStaticTime;
             settings.m_maxStaticTime = 60;
-            settings.m_maximumAllowedSkippedFrames = settings.m_minStaticTime * m_fps; // Maximum allowed skipped frames
+            settings.m_maximumAllowedSkippedFrames = cvRound(settings.m_minStaticTime * m_fps); // Maximum allowed skipped frames
             settings.m_maxTraceLength = 2 * settings.m_maximumAllowedSkippedFrames;        // Maximum trace length
         }
         else
         {
-            settings.m_maximumAllowedSkippedFrames = 2 * m_fps; // Maximum allowed skipped frames
-            settings.m_maxTraceLength = 4 * m_fps;              // Maximum trace length
+            settings.m_maximumAllowedSkippedFrames = cvRound(2 * m_fps); // Maximum allowed skipped frames
+            settings.m_maxTraceLength = cvRound(4 * m_fps);              // Maximum trace length
         }
 
         m_tracker = std::make_unique<CTracker>(settings);
@@ -235,8 +235,8 @@ class FaceDetectorExample : public VideoExample
         settings.m_dt = 0.3f;                             // Delta time for Kalman filter
         settings.m_accelNoiseMag = 0.1f;                  // Accel noise magnitude for Kalman filter
         settings.m_distThres = 0.8f;           // Distance threshold between region and object on two frames
-        settings.m_maximumAllowedSkippedFrames = m_fps / 2;   // Maximum allowed skipped frames
-        settings.m_maxTraceLength = 5 * m_fps;            // Maximum trace length
+        settings.m_maximumAllowedSkippedFrames = cvRound(m_fps / 2);   // Maximum allowed skipped frames
+        settings.m_maxTraceLength = cvRound(5 * m_fps);            // Maximum trace length
 
         m_tracker = std::make_unique<CTracker>(settings);
 
@@ -313,9 +313,9 @@ class PedestrianDetectorExample : public VideoExample
         settings.m_matchType = tracking::MatchHungrian;
         settings.m_dt = 0.3f;                             // Delta time for Kalman filter
         settings.m_accelNoiseMag = 0.1f;                  // Accel noise magnitude for Kalman filter
-        settings.m_distThres = frame.rows / 10;           // Distance threshold between region and object on two frames
-        settings.m_maximumAllowedSkippedFrames = m_fps;   // Maximum allowed skipped frames
-        settings.m_maxTraceLength = 5 * m_fps;            // Maximum trace length
+        settings.m_distThres = frame.rows / 10.f;         // Distance threshold between region and object on two frames
+        settings.m_maximumAllowedSkippedFrames = cvRound(m_fps);   // Maximum allowed skipped frames
+        settings.m_maxTraceLength = cvRound(5 * m_fps);   // Maximum trace length
 
         m_tracker = std::make_unique<CTracker>(settings);
 
@@ -391,9 +391,9 @@ class SSDMobileNetExample : public VideoExample
         settings.m_matchType = tracking::MatchHungrian;
         settings.m_dt = 0.3f;                                // Delta time for Kalman filter
         settings.m_accelNoiseMag = 0.1f;                     // Accel noise magnitude for Kalman filter
-        settings.m_distThres = frame.rows / 10;              // Distance threshold between region and object on two frames
-        settings.m_maximumAllowedSkippedFrames = 2 * m_fps;  // Maximum allowed skipped frames
-        settings.m_maxTraceLength = 5 * m_fps;               // Maximum trace length
+        settings.m_distThres = frame.rows / 10.f;            // Distance threshold between region and object on two frames
+        settings.m_maximumAllowedSkippedFrames = cvRound(2 * m_fps); // Maximum allowed skipped frames
+        settings.m_maxTraceLength = cvRound(5 * m_fps);      // Maximum trace length
 
         m_tracker = std::make_unique<CTracker>(settings);
 
@@ -424,7 +424,11 @@ class SSDMobileNetExample : public VideoExample
                 int baseLine = 0;
                 cv::Size labelSize = cv::getTextSize(label, cv::FONT_HERSHEY_SIMPLEX, 0.5, 1, &baseLine);
                 auto rect(track->GetLastRect());
-                cv::rectangle(frame, cv::Rect(cv::Point(rect.x, rect.y - labelSize.height), cv::Size(labelSize.width, labelSize.height + baseLine)), cv::Scalar(255, 255, 255), CV_FILLED);
+#if (CV_VERSION_MAJOR >= 4)
+                cv::rectangle(frame, cv::Rect(cv::Point(rect.x, rect.y - labelSize.height), cv::Size(labelSize.width, labelSize.height + baseLine)), cv::Scalar(255, 255, 255), cv::FILLED);
+#else
+				cv::rectangle(frame, cv::Rect(cv::Point(rect.x, rect.y - labelSize.height), cv::Size(labelSize.width, labelSize.height + baseLine)), cv::Scalar(255, 255, 255), CV_FILLED);
+#endif
                 cv::putText(frame, label, cv::Point(rect.x, rect.y), cv::FONT_HERSHEY_SIMPLEX, 0.5, cv::Scalar(0, 0, 0));
             }
         }
@@ -502,9 +506,9 @@ class YoloExample : public VideoExample
         settings.m_matchType = tracking::MatchHungrian;
         settings.m_dt = 0.3f;                                // Delta time for Kalman filter
         settings.m_accelNoiseMag = 0.2f;                     // Accel noise magnitude for Kalman filter
-        settings.m_distThres = frame.rows / 10;              // Distance threshold between region and object on two frames
-        settings.m_maximumAllowedSkippedFrames = 2 * m_fps;  // Maximum allowed skipped frames
-        settings.m_maxTraceLength = 5 * m_fps;               // Maximum trace length
+        settings.m_distThres = frame.rows / 10.f;            // Distance threshold between region and object on two frames
+        settings.m_maximumAllowedSkippedFrames = cvRound(2 * m_fps); // Maximum allowed skipped frames
+        settings.m_maxTraceLength = cvRound(5 * m_fps);      // Maximum trace length
 
         m_tracker = std::make_unique<CTracker>(settings);
 
@@ -535,7 +539,11 @@ class YoloExample : public VideoExample
                 int baseLine = 0;
                 cv::Size labelSize = cv::getTextSize(label, cv::FONT_HERSHEY_SIMPLEX, 0.5, 1, &baseLine);
                 auto rect(track->GetLastRect());
-                cv::rectangle(frame, cv::Rect(cv::Point(rect.x, rect.y - labelSize.height), cv::Size(labelSize.width, labelSize.height + baseLine)), cv::Scalar(255, 255, 255), CV_FILLED);
+#if (CV_VERSION_MAJOR >= 4)
+                cv::rectangle(frame, cv::Rect(cv::Point(rect.x, rect.y - labelSize.height), cv::Size(labelSize.width, labelSize.height + baseLine)), cv::Scalar(255, 255, 255), cv::FILLED);
+#else
+				cv::rectangle(frame, cv::Rect(cv::Point(rect.x, rect.y - labelSize.height), cv::Size(labelSize.width, labelSize.height + baseLine)), cv::Scalar(255, 255, 255), CV_FILLED);
+#endif
                 cv::putText(frame, label, cv::Point(rect.x, rect.y), cv::FONT_HERSHEY_SIMPLEX, 0.5, cv::Scalar(0, 0, 0));
             }
         }