Skip to content

E
evsuits
提交 7becf796 authored 作者: blu's avatar blu
浏览文件
操作

motion detect: new alg revise

上级 9393c9f1
隐藏空白字符变更
内嵌 并排
正在显示 包含 41 行增加 和 27 行删除
opencv-motion-detect/evmlmotion.cpp
浏览文件 @ 7becf796
...@@ -682,33 +682,46 @@ private: ...@@ -682,33 +682,46 @@ private:
evtStartTmLast = packetTm; evtStartTmLast = packetTm;
return; return;
} }
static long long pktDelt = 0;
if(pktCnt %18 == 0){
auto tmp = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
pktDelt = tmp - packetTm;
}
switch(evtState) { switch(evtState) {
case NONE: case NONE:
case PRE: case PRE:
if(dura >= detPara.pre) { if(dura >= detPara.pre) {
auto thr = frameProcessed/2; auto thr = frameProcessed/2;
if(evtCnt <= thr) { if(evtCnt <= thr) {
if(evtState == PRE) { // if(evtState == PRE) {
spdlog::info("{} state: PRE->NONE ({}, {}, {}, {}, {}, {})", selfId, this->fps, dura, frameProcessed, evtCnt, thr, _area); // spdlog::info("{} state: PRE->NONE ({}, {}, {}, {}, {}, {})", selfId, this->fps, dura, frameProcessed, evtCnt, thr, _area);
evtState = NONE; // evtState = NONE;
evtStartTmOrig = packetTm - detPara.pre; // evtStartTmOrig = packetTm - detPara.pre;
}else{ // }else{
spdlog::info("state: NONE->NONE ({}, {}, {}, {}, {}, {})", this->fps, dura, frameProcessed, evtCnt, thr, _area); // spdlog::info("state: NONE->NONE ({}, {}, {}, {}, {}, {})", this->fps, dura, frameProcessed, evtCnt, thr, _area);
} // }
spdlog::info("state: NONE->NONE ({}, {}, {}, {}, {}, {}, {})", pktDelt, this->fps, dura, frameProcessed, evtCnt, thr, _area);
}else{ }else{
if(evtState == PRE) { // if(evtState == PRE) {
json p; // json p;
evtState = IN; // evtState = IN;
spdlog::info("{} state: PRE->IN ({}, {}, {}, {}, {}, {})", selfId, this->fps, dura, frameProcessed, evtCnt, thr, _area); // spdlog::info("{} state: PRE->IN ({}, {}, {}, {}, {}, {})", selfId, this->fps, dura, frameProcessed, evtCnt, thr, _area);
makeEvent(EV_MSG_EVENT_MOTION_START, evtStartTmOrig); // makeEvent(EV_MSG_EVENT_MOTION_START, evtStartTmOrig);
auto tmp = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count(); // auto tmp = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
packetTsDelta = tmp - packetTm; // packetTsDelta = tmp - packetTm;
spdlog::info("{} packet ts delta: {}", selfId, packetTsDelta); // spdlog::info("{} packet ts delta: {}", selfId, packetTsDelta);
}else{ // }else{
evtState = PRE; // evtState = PRE;
spdlog::info("{} state: NONE->PRE ({}, {}, {}, {}, {}, {})", selfId, this->fps, dura, frameProcessed, evtCnt, thr, _area); // spdlog::info("{} state: NONE->PRE ({}, {}, {}, {}, {}, {})", selfId, this->fps, dura, frameProcessed, evtCnt, thr, _area);
evtStartTmOrig = packetTm; // evtStartTmOrig = packetTm;
} // }
json p;
evtState = IN;
evtStartTmOrig = packetTm - detPara.pre;
spdlog::info("{} state: NONE->IN ({}, {}, {}, {}, {}, {}, {})", selfId, pktDelt, this->fps, dura, frameProcessed, evtCnt, thr, _area);
makeEvent(EV_MSG_EVENT_MOTION_START, evtStartTmOrig);
} }
evtCnt = 0; evtCnt = 0;
frameProcessed = 0; frameProcessed = 0;
...@@ -729,9 +742,9 @@ private: ...@@ -729,9 +742,9 @@ private:
auto thr = frameProcessed/5; auto thr = frameProcessed/5;
if(evtCnt <= thr){ if(evtCnt <= thr){
evtState = POST; evtState = POST;
spdlog::info("{} state: IN->POST ({}, {}, {}, {}, {}, {})", selfId, this->fps, dura, frameProcessed, evtCnt, thr, _area); spdlog::info("{} state: IN->POST ({}, {}, {}, {}, {}, {}, {})", selfId, pktDelt, this->fps, dura, frameProcessed, evtCnt, thr, _area);
}else{ }else{
spdlog::info("{} state: IN->IN ({}, {}, {}, {}, {}, {})", selfId, this->fps, dura, frameProcessed, evtCnt, thr, _area); spdlog::info("{} state: IN->IN ({}, {}, {}, {}, {}, {}, {})", selfId, pktDelt, this->fps, dura, frameProcessed, evtCnt, thr, _area);
} }
evtCnt = 0; evtCnt = 0;
frameProcessed = 0; frameProcessed = 0;
...@@ -743,11 +756,11 @@ private: ...@@ -743,11 +756,11 @@ private:
if(dura >= detPara.post/2){ if(dura >= detPara.post/2){
auto thr = frameProcessed/5; auto thr = frameProcessed/5;
if(evtCnt <= thr){ if(evtCnt <= thr){
spdlog::info("{} state: POST->NONE ({}, {}, {}, {}, {}, {})",selfId, this->fps, dura, frameProcessed, evtCnt, thr, _area); spdlog::info("{} state: POST->NONE ({}, {}, {}, {}, {}, {}, {})",selfId, pktDelt, this->fps, dura, frameProcessed, evtCnt, thr, _area);
evtState = NONE; evtState = NONE;
makeEvent(EV_MSG_EVENT_MOTION_END, packetTs - detPara.post/2); makeEvent(EV_MSG_EVENT_MOTION_END, packetTs - detPara.post/2);
}else{ }else{
spdlog::info("{} state: POST->IN ({}, {}, {}, {}, {}, {})",selfId, this->fps, dura, frameProcessed, evtCnt, thr, _area); spdlog::info("{} state: POST->IN ({}, {}, {}, {}, {}, {}, {})",selfId, pktDelt, this->fps, dura, frameProcessed, evtCnt, thr, _area);
evtState = IN; evtState = IN;
} }
evtCnt = 0; evtCnt = 0;
......
opencv-motion-detect/evslicer.cpp
浏览文件 @ 7becf796
...@@ -840,7 +840,7 @@ protected: ...@@ -840,7 +840,7 @@ protected:
} }
// find video files // find video files
vector<string> findSlicesByRange(long tss, long tse, int offsetS, int offsetE) vector<string> findSlicesByRange(long tss, long tse, long & offsetS, long &offsetE)
{ {
vector<string> ret; vector<string> ret;
...@@ -883,6 +883,7 @@ protected: ...@@ -883,6 +883,7 @@ protected:
if(found == 1) { if(found == 1) {
string sf; string sf;
auto itr = tmp.begin(); auto itr = tmp.begin();
offsetS = tss - *itr;
for(; itr != tmp.end(); itr++) { for(; itr != tmp.end(); itr++) {
string fname = videoFileTs2Name(*itr, true); string fname = videoFileTs2Name(*itr, true);
sf += "\n\t" + this->urlOut + "/" + fname + ".mp4, " + to_string(*itr); sf += "\n\t" + this->urlOut + "/" + fname + ".mp4, " + to_string(*itr);
...@@ -1070,8 +1071,8 @@ public: ...@@ -1070,8 +1071,8 @@ public:
params["startTime"] = to_string(tss); params["startTime"] = to_string(tss);
params["endTime"] = to_string(tse); params["endTime"] = to_string(tse);
params["cameraId"] = ipcSn; params["cameraId"] = ipcSn;
params["headOffset"] = to_string(offsetS); params["headOffset"] = "0";//to_string(offsetS);
params["tailOffset"] = to_string(offsetE); params["tailOffset"] = "0";//to_string(offsetE);
params["type"] = jEvt["type"].get<string>(); params["type"] = jEvt["type"].get<string>();
json fileNames; json fileNames;
string sf; string sf;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论