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 | 168 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 122 insertions(+), 46 deletions(-)
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
index e354f4e..9900ab5 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
+++ b/QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp
@@ -29,6 +29,26 @@
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
// HttpSrvRetRecieve httpSrvRetRecieve("0.0.0.0", 12306, 1);
@@ -67,6 +87,74 @@
return rtsp_url;
}
+
+void RtspAnalysElement::OnMsgFunc(void *msgPtr, void *pThisPtr) {
+
+ 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();
+ }
+
+ 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;
+ }
+ }
+ }
+ } 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();
+ }
+ pthis->removeCamera(cam_idx);
+ }
+ } else {
+ DBG("itor value is not string ");
+ continue;
+ }
+ }
+ } else {
+ ERR("Error Message!!");
+ }
+}
+
void RtspAnalysElement::init() {
m_GB28181_Enable = appPref.getIntData("GB28181_Enable");
@@ -80,7 +168,6 @@
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) {
- Json::Value json;
int startCamNO = appPref.getIntData("CamStartNO");
int CamCount = appPref.getIntData("CamEndNO") - appPref.getIntData("CamStartNO") + 1;
auto itor = lst.begin();
@@ -89,7 +176,6 @@
ERR("startCamNO > lst.size()");
return;
}
-
for (int i = 0; i < startCamNO; i++) {
itor++;
}
@@ -99,29 +185,11 @@
ERR("itor == lst.end()");
return;
}
- std::string t_camIdex = itor->str_cam_dev_id.toStdString();
- std::string rtsp_url = "GB28181";
+ auto &item = *itor;
- SdkRuleMap ruleMap = m_lDBTool->searchSdkRuleByCamId(itor->str_cam_dev_id);
- for (auto &rule:ruleMap) {
+ string rtsp_url = "GB28181";
+ addCamWithSearchRuleMap(item, rtsp_url);
- rule.second.strAddr = itor->str_addr;
- rule.second.weekRuleVec = m_lDBTool->searchCameraWeekRuleByCamId(itor->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 " << itor->str_addr.toStdString());
- addCamera(t_camIdex, ruleMap);
itor++;
}
@@ -160,7 +228,6 @@
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) {
- Json::Value json;
int startCamNO = appPref.getIntData("CamStartNO");
int CamCount = appPref.getIntData("CamEndNO") - appPref.getIntData("CamStartNO") + 1;
auto itor = lst.begin();
@@ -179,30 +246,12 @@
ERR("itor == lst.end()");
return;
}
- std::string t_camIdex = itor->str_cam_dev_id.toStdString();
- std::string rtsp_url = rtspAddrBuild(itor->str_ip.toStdString(), 554, itor->str_username.toStdString(),
- itor->str_password.toStdString(), itor->str_brand.toStdString());
- SdkRuleMap ruleMap = m_lDBTool->searchSdkRuleByCamId(itor->str_cam_dev_id);
- for (auto &rule:ruleMap) {
+ 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());
- rule.second.strAddr = itor->str_addr;
- rule.second.weekRuleVec = m_lDBTool->searchCameraWeekRuleByCamId(itor->str_cam_dev_id, rule.first);
+ addCamWithSearchRuleMap(item, rtsp_url);
- 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);
- json["rtsp"] = rtsp_url;
-
- INFO("cam add is " << itor->str_addr.toStdString());
- addCamera(t_camIdex, ruleMap);
itor++;
}
} else {
@@ -212,6 +261,33 @@
}
}
+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) {
--
Gitblit v1.8.0