From f946a62d3921e86b44ff8e2973138304b9cd53cd Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 16 四月 2019 16:36:32 +0800
Subject: [PATCH] 解决修改参数和推流画面跳跃问题
---
QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp | 443 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 297 insertions(+), 146 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
index b96f6bd..9900ab5 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
+++ b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
@@ -26,8 +26,28 @@
}
RtspAnalysElement::RtspAnalysElement(LDBTool *_dbTool) : m_lDBTool(_dbTool), maxCount(50), currentCount(0) {
- init();
resetFdfs();
+ init();
+ {
+ IMPORT_APP_ARGS;
+ //nsq set callback func
+ DBG("NsqMsgConsumer Init");
+ DBG("argv[0]:" << argv[0]);
+ if(argv[0][0] == '.' && argv[0][1] == '/'){
+ string pName(argv[0]+2, argv[0]+strlen(argv[0]));
+ DBG("pName:" << pName);
+ nsqMsgConsumer = new BasicMsg::Nsq::NsqMsgConsumer("127.0.0.1", "4150", pName,
+ to_string(appPref.getIntData("RpcVTIMPort")));
+ }else{
+ string pName(argv[0]);
+ DBG("pName:" << pName);
+ nsqMsgConsumer = new BasicMsg::Nsq::NsqMsgConsumer("127.0.0.1", "4150", pName,
+ to_string(appPref.getIntData("RpcVTIMPort")));
+ }
+ nsqMsgConsumer->setMessageCallback(std::bind(&OnMsgFunc, std::placeholders::_1, this));
+ nsqMsgConsumer->init();
+ DBG("NsqMsgConsumer Init END!!");
+ }
{
// std::thread httpServer([&]() {
// //#todo port
@@ -67,112 +87,207 @@
return rtsp_url;
}
-void RtspAnalysElement::init() {
- auto lst = m_lDBTool->searchCamDevTableAll();
- auto lst_dev = m_lDBTool->searchConfigTableWithinServerInfo();
- appPref.setIntData("n_cut_max_duration", lst_dev.n_cut_max_duration);
+void RtspAnalysElement::OnMsgFunc(void *msgPtr, void *pThisPtr) {
- if (lst.size() > 0) {
- Json::Value json;
- for (auto item : lst) {
- string t_camIdex = item.str_cam_dev_id.toStdString();
-// std::string rtsp_url;
-// if (item.str_brand.toStdString() == "haikang") {
-// //璋冪敤rtsp娴乺tsp://admin:a1234567@192.168.1.215:554/h264/ch1/main/av_stream
-// int port = 554;//TODO
-// string username =;
-// DBG("username:" << username << "!!!");
-// string passwd = item.str_password.toStdString();
-// string ip = item.str_ip.toStdString();
-//
-// rtsp_url = "rtsp://" + username + ":" + passwd + "@" + ip + ":" + std::to_string(port) +
-// "/h264/ch1/main/av_stream";
-//
-// }//else if(){}
+ evnsq::Message *msg = (evnsq::Message *) msgPtr;
+ DBG("Received a message, id=" << msg->id << " message=[" << msg->body.ToString() << "]");
+ RtspAnalysElement *pthis = (RtspAnalysElement *) pThisPtr;
+ Json::Reader reader;
+ Json::Value value;
+ if (reader.parse(msg->body.ToString(), value)) {
+ auto itor_json_end = value.end();
+ Json::Value cfg_val;
+ for (auto itor_json = value.begin(); itor_json != itor_json_end; ++itor_json) {
+ //#todo 浣跨敤绛栫暐妯″紡?鍙戦�佺澶氫釜鎸囦护绱Н鍚庡彂閫�?
+ if (itor_json->isString() && reader.parse(itor_json->asString(), cfg_val)) {
+ if (itor_json.name() == "cam_edit" || itor_json.name() == "editSdkRule") {
+ string cam_idx = "";
+ if(itor_json.name() == "cam_edit"){
+ if (pthis->m_GB28181_Enable){
+ cam_idx = cfg_val["equipCode"].asString();
+ }else{
+ cam_idx = cfg_val["str_cam_dev_id"].asString();
+ }
+ } else {
+ cam_idx = cfg_val["strCamId"].asString();
+ }
- std::string rtsp_url = rtspAddrBuild(item.str_ip.toStdString(), 554, item.str_username.toStdString(),
- item.str_password.toStdString(), item.str_brand.toStdString());
-
-
-// lRec.str_det_thr = rec.value("det_thr").toString();
-// lRec.str_cmp_thr = rec.value("cmp_thr").toString();
- auto en_sdk = m_lDBTool->searchCamSdkTableByCamId(item.str_cam_dev_id);
- vector<int> sdkVec = chnString2Vec(en_sdk.str_sdks.toStdString());
-
- //璁剧疆妫�娴嬪緱鍒�
-// std::string s_d = str_det_thr;
-// std::string s_c = str_cmp_thr;
- vector<int> sdkDetCoVec = chnString2Vec(en_sdk.str_det_thr.toStdString());
- vector<int> sdkComCoVec = chnString2Vec(en_sdk.str_cmp_thr.toStdString());
-
- int camId=item.str_cam_dev_id.toInt();
- int t_size = sdkVec.size();
- for (int i = 0; i < t_size; i++) {
- switch (sdkVec[i]) {
- case 1: {
-// INFO("face.enable");
- json["face.enable"] = "1";
- SETSCORE(sdkDetCoVec, i, t_camIdex + "face.det");
- SETSCORE(sdkComCoVec, i, t_camIdex + "face.cmp");
- DBG(" TESTCODE " << sdkDetCoVec[i] << " " << sdkComCoVec[i]);
-
- break;
+ if (pthis->controllers.find(cam_idx) != pthis->controllers.end()) {
+ if (pthis->m_GB28181_Enable) {
+ auto lst = pthis->m_lDBTool->searchCamDevTableByType(1);
+ for (auto &item : lst) {
+ if (item.str_cam_dev_id.toStdString() != cam_idx)continue;
+ string rtsp_url = "GB28181";
+ pthis->addCamWithSearchRuleMap(item, rtsp_url);
+ break;
+ }
+ } else {
+ auto lst = pthis->m_lDBTool->searchCamDevTableByType(0);
+ for (auto &item : lst) {
+ if (item.str_cam_dev_id.toStdString() != cam_idx)continue;
+ std::string rtsp_url = rtspAddrBuild(item.str_ip.toStdString(), 554,
+ item.str_username.toStdString(),
+ item.str_password.toStdString(),
+ item.str_brand.toStdString());
+ pthis->addCamWithSearchRuleMap(item, rtsp_url);
+ break;
+ }
+ }
}
- case 2: {
- DBG("XX.enable " << "1");
- SETSCORE(sdkDetCoVec, i, t_camIdex + "XX.det");
- SETSCORE(sdkComCoVec, i, t_camIdex + "XX.cmp");
- break;
+ } else if (itor_json.name() == "cam_del") {
+// string cam_idx = cfg_val["str_cam_dev_id"].asString();
+ string cam_idx = "";
+ if(cfg_val["equipCode"].asString().size()){
+ cam_idx = cfg_val["equipCode"].asString();
+ }else if(cfg_val["str_cam_dev_id"].asString().size()){
+ cam_idx = cfg_val["str_cam_dev_id"].asString();
}
- case 3: {
-// INFO("face.enable");
- json["yolo.enable"] = "1";
- SETSCORE(sdkDetCoVec, i, t_camIdex + "yolo.det");
- SETSCORE(sdkComCoVec, i, t_camIdex + "yolo.cmp");
- break;
- }
- case 4: {
-
- json["perimeter.enable"] = "1";
- SETSCORE(sdkDetCoVec, i, t_camIdex + "perimeter.det");
- SETSCORE(sdkComCoVec, i, t_camIdex + "perimeter.cmp");
- setDataByType(4,json,camId);
- break;
- }
- case 5: {
-
- json["crowd.enable"] = "1";
- SETSCORE(sdkDetCoVec, i, t_camIdex + "crowd.det");
- SETSCORE(sdkComCoVec, i, t_camIdex + "crowd.cmp");
- setDataByType(5,json,camId);
- break;
- }
- case 6: {
-
- json["keepRight.enable"] = "1";
- SETSCORE(sdkDetCoVec, i, t_camIdex + "keepRight.det");
- SETSCORE(sdkComCoVec, i, t_camIdex + "keepRight.cmp");
- setDataByType(6,json,camId);
- break;
- }
+ pthis->removeCamera(cam_idx);
}
+ } else {
+ DBG("itor value is not string ");
+ continue;
}
- json["rtsp"] = rtsp_url;
- json["addr"] = item.str_addr.toStdString();
-
- INFO("cam add is " << item.str_addr.toStdString());
-
-// DBG(t_camIdex);
-
- appPref.getLongData("gpu.index");
- addCamera(t_camIdex, json.toStyledString());
}
} else {
- ERR("searchCamDevTableAll size is 0");
+ ERR("Error Message!!");
}
-
}
+
+void RtspAnalysElement::init() {
+
+ m_GB28181_Enable = appPref.getIntData("GB28181_Enable");
+
+ Record_Config lst_dev = m_lDBTool->searchConfigTableWithinServerInfo();
+
+ //#todo GB28181
+ if (m_GB28181_Enable) {
+ auto lst = m_lDBTool->searchCamDevTableByType(1);
+
+ appPref.setIntData("n_cut_max_duration", lst_dev.n_cut_max_duration);
+ appPref.setIntData("n_cut_min_duration", lst_dev.n_cut_min_duration);
+ if (lst.size() > 0) {
+ int startCamNO = appPref.getIntData("CamStartNO");
+ int CamCount = appPref.getIntData("CamEndNO") - appPref.getIntData("CamStartNO") + 1;
+ auto itor = lst.begin();
+
+ if (startCamNO >= lst.size()) {
+ ERR("startCamNO > lst.size()");
+ return;
+ }
+ for (int i = 0; i < startCamNO; i++) {
+ itor++;
+ }
+
+ for (int i = 0; i < CamCount; i++) {
+ if (itor == lst.end()) {
+ ERR("itor == lst.end()");
+ return;
+ }
+ auto &item = *itor;
+
+ string rtsp_url = "GB28181";
+ addCamWithSearchRuleMap(item, rtsp_url);
+
+ itor++;
+ }
+
+// for (auto &item : lst) {
+// std::string t_camIdex = item.str_cam_dev_id.toStdString();
+// std::string rtsp_url = "GB28181";
+//
+// SdkRuleMap ruleMap = m_lDBTool->searchSdkRuleByCamId(item.str_cam_dev_id);
+// for (auto &rule:ruleMap) {
+//
+// rule.second.strAddr = item.str_addr;
+// rule.second.weekRuleVec = m_lDBTool->searchCameraWeekRuleByCamId(item.str_cam_dev_id, rule.first);
+//
+// if (rule.second.nSdkType == PerStaticSdk) {
+// float temp = 1 - (float) (rule.second.nThreshold) / 100;
+// rule.second.fSensitivity = (75 + 25 * temp) / 100;
+//
+// } else if (rule.second.nSdkType != FaceSdk) {
+// float temp = 1 - (float) (rule.second.nThreshold) / 100;
+// rule.second.fSensitivity = (5 + 90 * temp) / 100;
+// }
+// DBG("fSensitivity" << rule.second.fSensitivity);
+// }
+// appPref.setStringData(t_camIdex + "rtsp", rtsp_url);
+// INFO("cam add is " << item.str_addr.toStdString());
+// addCamera(t_camIdex, ruleMap);
+// }
+ } else {
+ ERR("searchCamDevTableAll size is 0");
+ }
+
+ } else {
+
+ auto lst = m_lDBTool->searchCamDevTableByType(0);
+
+ appPref.setIntData("n_cut_max_duration", lst_dev.n_cut_max_duration);
+ appPref.setIntData("n_cut_min_duration", lst_dev.n_cut_min_duration);
+ if (lst.size() > 0) {
+ int startCamNO = appPref.getIntData("CamStartNO");
+ int CamCount = appPref.getIntData("CamEndNO") - appPref.getIntData("CamStartNO") + 1;
+ auto itor = lst.begin();
+
+ if (startCamNO >= lst.size()) {
+ ERR("startCamNO > lst.size()");
+ return;
+ }
+
+ for (int i = 0; i < startCamNO; i++) {
+ itor++;
+ }
+
+ for (int i = 0; i < CamCount; i++) {
+ if (itor == lst.end()) {
+ ERR("itor == lst.end()");
+ return;
+ }
+ auto &item = *itor;
+ std::string rtsp_url = rtspAddrBuild(item.str_ip.toStdString(), 554, item.str_username.toStdString(),
+ item.str_password.toStdString(), item.str_brand.toStdString());
+
+ addCamWithSearchRuleMap(item, rtsp_url);
+
+ itor++;
+ }
+ } else {
+ ERR("searchCamDevTableAll size is 0");
+ }
+
+ }
+}
+
+void RtspAnalysElement::addCamWithSearchRuleMap(const Record_Cam_Dev &item, string rtsp_url) {
+ string t_camIdex = item.str_cam_dev_id.toStdString();
+
+ SdkRuleMap ruleMap = m_lDBTool->searchSdkRuleByCamId(item.str_cam_dev_id);
+ for (auto &rule:ruleMap) {
+
+ rule.second.strAddr = item.str_addr;
+ rule.second.weekRuleVec = m_lDBTool->searchCameraWeekRuleByCamId(item.str_cam_dev_id, rule.first);
+
+// if (rule.second.nSdkType == PerStaticSdk || rule.second.nSdkType == PerimeterSdk
+// || rule.second.nSdkType == KeepRightSdk || rule.second.nSdkType == KeepRightSdk) {
+ float temp = (float)1 - (float) (rule.second.nThreshold) / 100;
+ rule.second.fSensitivity = (temp * 50 + 50) / 100;
+// rule.second.fSensitivity = (temp * 25 + 75) / 100;
+
+// } else if (rule.second.nSdkType != FaceSdk) {
+// float temp = (float)1 - (float) (rule.second.nThreshold) / 100;
+// rule.second.fSensitivity = (temp * 90 + 5) / 100;
+// }
+ DBG("fSensitivity" << rule.second.fSensitivity);
+ }
+ appPref.setStringData(t_camIdex + "rtsp", rtsp_url);
+
+ INFO("cam add is " << item.str_addr.toStdString());
+ addCamera(t_camIdex, ruleMap);
+}
+
RtspAnalysElement::~RtspAnalysElement() {
for (auto controller: controllers) {
@@ -181,30 +296,23 @@
controllers.clear();
}
-int RtspAnalysElement::addCamera(const std::string &index, const std::string &json) {
+int RtspAnalysElement::addCamera(const std::string &index, const std::map<int, SdkRule> &sdkRuleMap) {
if (controllers.find(index) == controllers.end()) {
if (currentCount >= maxCount) {
ERR("addCamera faild, camera's num is full!")
return -1;
}
- Json::Reader reader;
- Json::Value value;
- if (reader.parse(json, value)) {
+ controllers[index] = new AppPipeController(index, sdkRuleMap, true);
+ controllers[index]->setfdfsClient(&fdfsClient);
+ controllers[index]->start();
+ currentCount++;
+ return 0;
- controllers[index] = new AppPipeController(index, std::move(value), true);
-// controllers[index] = new AppPipeController(index, std::move(value), false);
-
- controllers[index]->setfdfsClient(&fdfsClient);
- controllers[index]->start();
- currentCount++;
- return 0;
- }
- return -1;
} else {
removeCamera(index);
DBG("removeCamera " << index)
- return addCamera(index, json);
+ return addCamera(index, sdkRuleMap);
}
}
@@ -266,39 +374,82 @@
}
return result;
}
-void RtspAnalysElement::setDataByType(int type,Json::Value& json,int camId)
-{
- switch (type) {
- case 4:
- {
- auto rule=m_lDBTool->searchPerimeterRuleByCamId(camId);
- json["perimeter.area"]=rule.strAreas.toStdString();
- json["perimeter.num"]=rule.nAlarmPeopleNum;
- json["perimeter.delay"]=rule.nTriggerDelay;
- json["perimeter.tolerance"]=rule.nTriggertolerance;
- break;
- }
- case 5:
- {
- auto rule=m_lDBTool->searchCrowdRuleByCamId(camId);
- json["crowd.area"]=rule.strAreas.toStdString();
- json["crowd.num"]=rule.nAlarmPeopleNum;
- json["crowd.delay"]=rule.nTriggerDelay;
- json["crowd.tolerance"]=rule.nTriggertolerance;
- break;
- }
- case 6:
- {
- auto rule=m_lDBTool->searchActRuleByCamId(camId);
- json["keepRight.leftArea"]=rule.strAreas.toStdString();
- json["keepRight.leftLine"]=rule.strLine.toStdString();
- json["keepRight.rightArea"]=rule.strExAreas.toStdString();
- json["keepRight.rightLine"]=rule.strExLine.toStdString();
- json["keepRight.delay"]=rule.nTriggerDelay;
- json["keepRight.tolerance"]=rule.nTriggertolerance;
- break;
- }
- default:
- break;
- }
-}
+
+//void RtspAnalysElement::setDataByType(Json::Value& json,const SdkRule& rule)
+//{
+// std::string camId=rule.strCamId.toStdString();
+// sdkRuleMap[rule.nSdkType].weekRuleVec=m_lDBTool->searchCameraWeekRuleByCamId(rule.strCamId,rule.nSdkType);
+// switch (rule.nSdkType)
+// {
+// case FaceSdk:
+// {
+// json["face.enable"] = "1";
+
+// appPref.setFloatData(camId+"face.det",rule.nQuality);
+// appPref.setFloatData(camId+"face.cmp",rule.nThreshold);
+
+
+
+// break;
+// }
+// case CarSdk:
+// {
+// // DBG("XX.enable " << "1");
+
+// appPref.setFloatData(camId+"xx.det",rule.nQuality);
+// appPref.setFloatData(camId+"xx.cmp",rule.nThreshold);
+
+// break;
+// }
+// case YoloSdk:
+// {
+// json["yolo.enable"] = "1";
+// appPref.setFloatData(camId+"yolo.det",rule.nQuality);
+// appPref.setFloatData(camId+"yolo.cmp",rule.nThreshold);
+
+// break;
+// }
+// case PerimeterSdk:
+// {
+// // auto rule=m_lDBTool->searchPerimeterRuleByCamId(camId);
+// json["perimeter.enable"] = 1;
+// json["perimeter.area"]=rule.strAreas.toStdString();
+// json["perimeter.num"]=rule.nAlarmNumLowerLimit;
+
+// json["perimeter.delay"]=rule.nTriggerDelay;
+// json["perimeter.tolerance"]=rule.nTriggerTolerance;
+// appPref.setFloatData(camId+"perimeter.det",rule.nQuality);
+// appPref.setFloatData(camId+"perimeter.cmp",rule.nThreshold);
+
+
+// break;
+// }
+// case CrowdSdk:
+// {
+// json["crowd.enable"] = 1;
+// json["crowd.area"]=rule.strAreas.toStdString();
+// json["crowd.num"]=rule.nAlarmNumLowerLimit;
+// json["crowd.delay"]=rule.nTriggerDelay;
+// json["crowd.tolerance"]=rule.nTriggerTolerance;
+// appPref.setFloatData(camId+"crowd.det",rule.nQuality);
+// appPref.setFloatData(camId+"crowd.cmp",rule.nThreshold);
+
+// break;
+// }
+// case KeepRightSdk:
+// {
+// json["keepRight.enable"] = 1;
+// json["keepRight.leftArea"]=rule.strAreas.toStdString();
+// json["keepRight.leftLine"]=rule.strLine.toStdString();
+// json["keepRight.rightArea"]=rule.strExAreas.toStdString();
+// json["keepRight.rightLine"]=rule.strExLine.toStdString();
+// json["keepRight.delay"]=rule.nTriggerDelay;
+// json["keepRight.tolerance"]=rule.nTriggerTolerance;
+// appPref.setFloatData(camId+"keepRight.det",rule.nQuality);
+// appPref.setFloatData(camId+"keepRight.cmp",rule.nThreshold);
+// break;
+// }
+// default:
+// break;
+// }
+//}
--
Gitblit v1.8.0