From 168cad8214b2229130485fdbf3f64d85ac458402 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 11 四月 2019 17:35:36 +0800
Subject: [PATCH] 添加宏定义屏蔽VptRpcElement并替换为VptRpcElement
---
QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
index 746b804..36b2df4 100644
--- a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
@@ -38,9 +38,19 @@
IMPORT_APP_ARGS;
//nsq set callback func
DBG("NsqMsgConsumer Init");
- string pName(argv[0]);
- nsqMsgConsumer = new BasicMsg::Nsq::NsqMsgConsumer("127.0.0.1", "4150", pName,
- to_string(appPref.getIntData("RpcVTIMPort")));
+ 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!!");
@@ -59,6 +69,7 @@
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)) {
+ DBG("itor_json.name():" << itor_json.name());
if (itor_json.name() == "cut_dura_edit") {
int cut_max_duration = cfg_val["cut_max_duration"].asInt();
int cut_min_duration = cfg_val["cut_min_duration"].asInt();
@@ -78,12 +89,12 @@
item.second->SetVideoMinMaxSeconds(cut_min_duration, cut_max_duration);
}
}
- } else if (itor_json.name() == "cam_edit" ) {
+ } else if (itor_json.name() == "cam_edit") {
string cam_idx = cfg_val["str_cam_dev_id"].asString();
if (pthis->m_GB28181_Enable) {
if (pthis->m_controllers_videoCapElem.find(cam_idx) !=
pthis->m_controllers_videoCapElem.end()) {
- INFO("cam add is " << cfg_val["str_addr"].asString());
+ INFO("cam add is " << cam_idx);
pthis->addCamera(cam_idx, "GB28181");
}
} else {
@@ -98,10 +109,34 @@
}
} else if (itor_json.name() == "cam_del") {
string cam_idx = cfg_val["str_cam_dev_id"].asString();
+ pthis->removeCamera(cam_idx);
+ } else if (itor_json.name() == "cam_startPublish") {
+ string cam_idx = cfg_val["id"].asString();
if (pthis->m_GB28181_Enable) {
- pthis->removeCamera(cam_idx);
+ if (pthis->m_controllers_videoCapElem.find(cam_idx) !=
+ pthis->m_controllers_videoCapElem.end()) {
+ INFO("cam add is " << cfg_val["str_addr"].asString());
+ pthis->m_controllers_videoCapElem[cam_idx]->startPublishVideo();
+ }
} else {
- pthis->removeCamera(cam_idx);
+ if (pthis->m_controllers.find(cam_idx) != pthis->m_controllers.end()) {
+ INFO("cam add is " << cfg_val["str_addr"].asString());
+ pthis->m_controllers[cam_idx]->startPublishVideo();
+ }
+ }
+ } else if (itor_json.name() == "cam_stopPublish") {
+ string cam_idx = cfg_val["id"].asString();
+ if (pthis->m_GB28181_Enable) {
+ if (pthis->m_controllers_videoCapElem.find(cam_idx) !=
+ pthis->m_controllers_videoCapElem.end()) {
+ INFO("cam add is " << cfg_val["str_addr"].asString());
+ pthis->m_controllers_videoCapElem[cam_idx]->stopPublishVideo();
+ }
+ } else {
+ if (pthis->m_controllers.find(cam_idx) != pthis->m_controllers.end()) {
+ INFO("cam add is " << cfg_val["str_addr"].asString());
+ pthis->m_controllers[cam_idx]->stopPublishVideo();
+ }
}
}
} else {
--
Gitblit v1.8.0