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

diff --git a/src/Engine.cpp b/src/Engine.cpp
index be5ceda..4f67103 100644
--- a/src/Engine.cpp
+++ b/src/Engine.cpp
@@ -1,16 +1,20 @@
 #include <mutex>
 #include <thread>
+#include <condition_variable>
 #include "Engine.h"
 #include "Logger.h"
+#include "PredictorWrapper.h"
 
 using namespace suanzi;
+using namespace std;
 
-const static std::string TAG = "Engine";
-
+static const std::string TAG = "Engine";
 static std::mutex g_mutex;
 static EngineWPtr g_instance;
 
+typedef std::shared_ptr<std::vector<Person>> PersonsInfoPtr;
 
+// class Engine
 EnginePtr Engine::create()
 {
     LOG_DEBUG(TAG, "create");
@@ -27,22 +31,25 @@ EnginePtr Engine::create()
 Engine::Engine()
 {
     detector = std::make_shared<Detector>();
-    MetricsPtr m (new Metrics("model.pkl"));
-    multiTracker = std::make_shared<MultiTracker>(m);
 }
 
 Engine::~Engine()
 {    
+    destroy();
 }
 
 void Engine::destroy()
 {
+    LOG_DEBUG(TAG, "destroy");
+    detector.reset();
+    multiTracker.reset();
+    reader.reset();
+    observer_list.clear();
 }
 
 
 void Engine::setVideoSrc(VideoSrcType type, const std::string& url)
 {
-    videoSrc = url;
     reader = VideoReaderFactory::createVideoReader(type, url);
 }
 
@@ -50,15 +57,18 @@ 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);
+        int total = detector->detect(frame, detections);
+        multiTracker->update(total, detections, frame);
     }
 }
 
 void Engine::start()
 {
     LOG_DEBUG(TAG, "start");
+    multiTracker = std::make_shared<MultiTracker>(g_instance);
     if (!reader){
         LOG_ERROR(TAG, "reader is null. exit");
         return;
@@ -71,3 +81,58 @@ void Engine::addObserver(EngineObserver *observer)
 {
     observer_list.insert(observer);
 }
+
+
+// WorkItem class for event thread
+class PersonInEventWorkItem : public WorkItem
+{
+public:
+    PersonInEventWorkItem(std::set<EngineObserver*> obs, PersonsInfoPtr info) : obs(obs), info(info){
+    }
+    ~PersonInEventWorkItem(){}
+    void run (){
+        for (auto o : obs){
+            o->onPersonsIn(*(info.get()));
+        }
+    }
+private:
+    std::set<EngineObserver*> obs;
+    PersonsInfoPtr info;
+};
+
+class PersonOutEventWorkItem : public WorkItem
+{
+public:
+    PersonOutEventWorkItem(std::set<EngineObserver*> obs, PersonsInfoPtr info) : obs(obs), info(info){
+    }
+    ~PersonOutEventWorkItem(){}
+    void run (){
+        for (auto o : obs){
+            o->onPersonsIn(*(info.get()));
+        }
+    }
+private:
+    std::set<EngineObserver*> obs;
+    PersonsInfoPtr info;
+};
+
+void Engine::onPersonsOut(const std::vector<Person>& p)
+{
+    PersonsInfoPtr pp = std::make_shared<std::vector<Person>>(p);
+    eventThread.enqueue(new PersonOutEventWorkItem(this->observer_list, pp));
+}
+
+void Engine::onPersonsIn(const std::vector<Person>& p)
+{
+    PersonsInfoPtr pp = std::make_shared<std::vector<Person>>(p);
+    eventThread.enqueue(new PersonInEventWorkItem(this->observer_list, pp));
+}
+
+void Engine::onStatusChanged()
+{
+    Person pm, p2;
+    std::vector<Person> ps;
+    ps.push_back(pm);
+    ps.push_back(p2);
+    onPersonsOut(ps);
+}