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/VideoToImageMulth/RtspAnalysManager.cpp | 70 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 12 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
index e00b34e..295ad0b 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();
@@ -79,11 +90,17 @@
}
}
} else if (itor_json.name() == "cam_edit") {
- string cam_idx = cfg_val["str_cam_dev_id"].asString();
+ string cam_idx = "";
+ if(pthis->m_GB28181_Enable){
+ cam_idx = cfg_val["equipCode"].asString();
+ }else{
+ 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 {
@@ -97,11 +114,40 @@
}
}
} else if (itor_json.name() == "cam_del") {
- string cam_idx = cfg_val["str_cam_dev_id"].asString();
+ string cam_idx = "";
+ if(pthis->m_GB28181_Enable){
+ cam_idx = cfg_val["equipCode"].asString();
+ }else{
+ 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 " << cam_idx);
+ 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 " << cam_idx);
+ 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 {
@@ -290,7 +336,7 @@
// auto lst = m_lDBTool->searchCamDevTableAll();
Record_Config lst_dev = m_lDBTool->searchConfigTableWithinServerInfo();
if (m_controllers.find(index) == m_controllers.end()) {
- INFO("MYH DEBUG HERE");
+// INFO("MYH DEBUG HERE");
if (m_currentCount >= m_maxCount) {
ERR("addCamera faild, camera's num is full!")
return -1;
@@ -321,7 +367,7 @@
* @return 鎬绘槸0
*/
int RtspAnalysManager::removeCamera(const std::string &index) {
- INFO("MYH DEBUG HERE");
+// INFO("MYH DEBUG HERE");
if (m_GB28181_Enable) {
if (m_controllers_videoCapElem.find(index) == m_controllers_videoCapElem.end())return -1;
auto controller = m_controllers_videoCapElem[index];
@@ -347,7 +393,7 @@
delete imgRedis;
m_imgRedisControllers.erase(index);
m_imgRedisCRwLock.unlock();
- INFO("MYH DEBUG HERE");
+// INFO("MYH DEBUG HERE");
return 0;
}
@@ -408,7 +454,7 @@
//褰曞彇瑙嗛鐨凴PC鐨勬帴鍙ｅ嚱鏁�
::std::string RtspAnalysManager::recordVideo(const ::std::string &name, const ::Ice::Current &) {
- INFO("Record Video For: " << name);
+// INFO("Record Video For: " << name);
ImageName_s_t nameSt = ImageName_s_t::fromString(name);
if (nameSt.Valid()) {
if (m_GB28181_Enable) {
--
Gitblit v1.8.0