X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=src%2FEngine.cpp;h=6d44f3c355c413517d00d8065fdd2d1eb705cfba;hb=48adce31a0ffdb3757ee1be8a63ce7e769e87deb;hp=be5ceda15a5e6824c428149e7d5ce836021c99e9;hpb=804f325c3a26e6ff253c3eb490071434da9c3b3f;p=trackerpp.git

diff --git a/src/Engine.cpp b/src/Engine.cpp
index be5ceda..6d44f3c 100644
--- a/src/Engine.cpp
+++ b/src/Engine.cpp
@@ -2,6 +2,7 @@
 #include <thread>
 #include "Engine.h"
 #include "Logger.h"
+#include "PredictorWrapper.h"
 
 using namespace suanzi;
 
@@ -42,17 +43,25 @@ void Engine::destroy()
 
 void Engine::setVideoSrc(VideoSrcType type, const std::string& url)
 {
-    videoSrc = url;
-    reader = VideoReaderFactory::createVideoReader(type, url);
+    PredictorWrapperPtr pp = PredictorWrapper::create("./python/model.pkl");
+
+    pp->dump();
+
+//    videoSrc = url;
+    //reader = VideoReaderFactory::createVideoReader(type, url);
+
 }
 
 void Engine::run()
 {
     LOG_DEBUG(TAG, "run");
     cv::Mat frame;
+    Detection detections[128];
     while (reader->read(frame)){
         LOG_DEBUG(TAG, "Size: " << frame.cols  <<  "x" << frame.rows);
-        detector->detect(frame);
+        // TODO
+        int total = detector->detect(frame, detections);
+        multiTracker->update(total, detections, frame);
     }
 }