X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=src%2FEngine.cpp;h=fbdf337d91b0615f1120afdd0e89b0089847db39;hb=81741fb5b3fe86bf29a130f367ea102e3aa99b0b;hp=a1defdb230d2145233f9923713a82537ecc9caeb;hpb=3aa517d206c44156fe86697aeadc5f75ea212329;p=trackerpp.git

diff --git a/src/Engine.cpp b/src/Engine.cpp
index a1defdb..fbdf337 100644
--- a/src/Engine.cpp
+++ b/src/Engine.cpp
@@ -1,16 +1,18 @@
 #include <mutex>
 #include <thread>
+#include <condition_variable>
 #include "Engine.h"
 #include "Logger.h"
 #include "PredictorWrapper.h"
 
 using namespace suanzi;
+using namespace std;
 
 static const std::string TAG = "Engine";
-
 static std::mutex g_mutex;
 static EngineWPtr g_instance;
 
+typedef std::shared_ptr<std::vector<Person>> PersonsInfoPtr;
 
 EnginePtr Engine::create()
 {
@@ -18,7 +20,7 @@ EnginePtr Engine::create()
     std::lock_guard<std::mutex> lock(g_mutex);
     if (g_instance.lock()){
         LOG_ERROR(TAG, "already exists");
-        return EnginePtr(); // nullptr
+        return EnginePtr();
     }
     EnginePtr instance (new Engine());
     g_instance = instance;
@@ -27,8 +29,8 @@ EnginePtr Engine::create()
 
 Engine::Engine()
 {
-    detector = std::make_shared<Detector>();
-    multiTracker = std::make_shared<MultiTracker>();
+    //detector = std::make_shared<Detector>();
+    detector = DetectorPtr(new Detector());
 }
 
 Engine::~Engine()
@@ -45,7 +47,6 @@ void Engine::destroy()
     observer_list.clear();
 }
 
-
 void Engine::setVideoSrc(VideoSrcType type, const std::string& url)
 {
     reader = VideoReaderFactory::createVideoReader(type, url);
@@ -58,7 +59,6 @@ void Engine::run()
     Detection detections[128];
     while (reader->read(frame)){
         LOG_DEBUG(TAG, "Size: " << frame.cols  <<  "x" << frame.rows);
-        // TODO
         int total = detector->detect(frame, detections);
         multiTracker->update(total, detections, frame);
     }
@@ -67,6 +67,7 @@ void Engine::run()
 void Engine::start()
 {
     LOG_DEBUG(TAG, "start");
+    multiTracker = std::make_shared<MultiTracker>(g_instance);
     if (!reader){
         LOG_ERROR(TAG, "reader is null. exit");
         return;
@@ -77,5 +78,54 @@ void Engine::start()
 
 void Engine::addObserver(EngineObserver *observer)
 {
+    LOG_DEBUG(TAG, "addObserver");
     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)
+{
+    LOG_DEBUG(TAG, "onPersonOut");
+    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)
+{
+    LOG_DEBUG(TAG, "onPersonIn");
+    PersonsInfoPtr pp = std::make_shared<std::vector<Person>>(p);
+    eventThread.enqueue(new PersonInEventWorkItem(this->observer_list, pp));
+}