Merge pull request #492 from Nuzhny007/master

Time points for tracking

Author: Nuzhny007

CMakeLists.txt

@@ -50,12 +50,6 @@ else(HAVE_FILESYSTEM)
     message("Do not found filesystem header")
 endif(HAVE_FILESYSTEM)
 
-option(BUILD_ABANDONED_DETECTOR "Should compiled abandoned detector example?" OFF)
-if (BUILD_ABANDONED_DETECTOR)
-    add_definitions(-DBUILD_ABANDONED_DETECTOR)
-    add_subdirectory(combined)
-endif(BUILD_ABANDONED_DETECTOR)
-
 option(BUILD_EXAMPLES "Should compiled examples (motion detection, pedestrians, faces, DNNs etc)?" ON)
 if (BUILD_EXAMPLES)
     add_subdirectory(example)

async_detector/AsyncDetector.cpp

@@ -267,6 +267,8 @@ void AsyncDetector::CaptureThread(std::string fileName, int startFrame, int* fra
     *framesCount = cvRound(capture.get(cv::CAP_PROP_FRAME_COUNT));
     capture.set(cv::CAP_PROP_POS_FRAMES, startFrame);
 
+    time_point_t startTimeStamp = std::chrono::system_clock::now();
+
     *fps = std::max(1.f, (float)capture.get(cv::CAP_PROP_FPS));
 	int frameHeight = cvRound(capture.get(cv::CAP_PROP_FRAME_HEIGHT));
 
@@ -318,13 +320,13 @@ void AsyncDetector::CaptureThread(std::string fileName, int startFrame, int* fra
     {
         trackerSettings.m_minStaticTime = minStaticTime;
         trackerSettings.m_maxStaticTime = 60;
-        trackerSettings.m_maximumAllowedSkippedFrames = cvRound(trackerSettings.m_minStaticTime * (*fps)); // Maximum allowed skipped frames
-        trackerSettings.m_maxTraceLength = 2 * trackerSettings.m_maximumAllowedSkippedFrames;        // Maximum trace length
+        trackerSettings.m_maximumAllowedLostTime = trackerSettings.m_minStaticTime;      // Maximum allowed lost time
+        trackerSettings.m_maxTraceLength = 2 * trackerSettings.m_maximumAllowedLostTime; // Maximum trace length
     }
     else
     {
-        trackerSettings.m_maximumAllowedSkippedFrames = cvRound(2 * (*fps)); // Maximum allowed skipped frames
-        trackerSettings.m_maxTraceLength = cvRound(4 * (*fps));              // Maximum trace length
+        trackerSettings.m_maximumAllowedLostTime = 2.; // Maximum allowed lost time
+        trackerSettings.m_maxTraceLength = 4.;         // Maximum trace length
     }
 
     // Capture the first frame
@@ -341,6 +343,7 @@ void AsyncDetector::CaptureThread(std::string fileName, int startFrame, int* fra
     {
         frame_ptr frameInfo(new FrameInfo(frameInd));
         frameInfo->m_dt = cv::getTickCount();
+        frameInfo->m_frameTimeStamp = startTimeStamp + std::chrono::milliseconds(cvRound(frameInd * (1000.f / (*fps))));
         capture >> frameInfo->m_frame;
         if (frameInfo->m_frame.empty())
         {
@@ -412,7 +415,7 @@ void AsyncDetector::TrackingThread(const TrackerSettings& settings, FramesQueue*
         frame_ptr frameInfo = framesQue->GetFirstDetectedFrame();
         if (frameInfo)
         {
-            tracker->Update(frameInfo->m_regions, frameInfo->m_clFrame, frameInfo->m_fps);
+            tracker->Update(frameInfo->m_regions, frameInfo->m_clFrame, frameInfo->m_frameTimeStamp);
 
             tracker->GetTracks(frameInfo->m_tracks);
             frameInfo->m_inTracker.store(FrameInfo::StateCompleted);

async_detector/AsyncDetector.h

@@ -29,8 +29,8 @@ struct FrameInfo
     cv::UMat m_clFrame;
 	regions_t m_regions;
 	std::vector<TrackingObject> m_tracks;
+    time_point_t m_frameTimeStamp;
 	int64 m_dt = 0;
-	float m_fps = 0;
 	size_t m_frameInd = 0;
 
 	static constexpr int StateNotProcessed = 0;