From 6540a2a9d69432c4cc475e3b32eae11e9e0ace73 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期四, 11 四月 2019 20:28:10 +0800
Subject: [PATCH] 1.srs的分辨率在config.json配置 2.单播推流控制，国标摄像机差一个关闭测试 3. 底库字段添加
---
QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp | 463 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 350 insertions(+), 113 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
index 6166a4f..b281268 100644
--- a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
@@ -7,15 +7,7 @@
using std::string;
-
-RtspAnalysManager::RtspAnalysManager(LDBTool *_dbTool) : m_lDBTool(nullptr), m_maxCount(50), m_currentCount(0) {
- INFO("MYH DEBUG HERE");
- m_lDBTool=new LDBTool;
- init();
-
-}
-
-
+void *gRtspAnalysManagerCamera = nullptr;
static std::string rtspAddrBuild(std::string ip, const int port, std::string username,
std::string passwd, std::string brand) {
@@ -38,50 +30,215 @@
return rtsp_url;
}
+RtspAnalysManager::RtspAnalysManager(LDBTool *_dbTool) : m_lDBTool(nullptr), m_maxCount(50), m_currentCount(0) {
+// INFO("MYH DEBUG HERE");
+ m_lDBTool = _dbTool;
+ 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!!");
+
+}
+
+void RtspAnalysManager::OnMsgFunc(void *msgPtr, void *pThisPtr) {
+ evnsq::Message *msg = (evnsq::Message *) msgPtr;
+ DBG("Received a message, id=" << msg->id << " message=[" << msg->body.ToString() << "]");
+ RtspAnalysManager *pthis = (RtspAnalysManager *) 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)) {
+ 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();
+ DBG("cut_max_duration: " << cut_max_duration << " cut_min_duration: " << cut_min_duration);
+ appPref.setIntData("n_cut_max_duration", cut_max_duration);
+ appPref.setIntData("n_cut_min_duration", cut_min_duration);
+
+ DBG("cut_max_duration: " << cut_max_duration << " cut_min_duration: " << cut_min_duration);
+// m_GB28181_Enable = appPref.getIntData("GB28181_Enable");
+ //#todo GB28181
+ if (pthis->m_GB28181_Enable) {
+ for (auto &item : pthis->m_controllers_videoCapElem) {
+ item.second->SetVideoMinMaxSeconds(cut_min_duration, cut_max_duration);
+ }
+ } else {
+ for (auto &item : pthis->m_controllers) {
+ item.second->SetVideoMinMaxSeconds(cut_min_duration, cut_max_duration);
+ }
+ }
+ } 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 " << cam_idx);
+ pthis->addCamera(cam_idx, "GB28181");
+ }
+ } else {
+ if (pthis->m_controllers.find(cam_idx) != pthis->m_controllers.end()) {
+ std::string rtsp_url = rtspAddrBuild(cfg_val["str_ip"].asString(), 554,
+ cfg_val["str_username"].asString(),
+ cfg_val["str_password"].asString(),
+ cfg_val["str_brand"].asString());
+ INFO("cam add is " << cfg_val["str_addr"].asString());
+ pthis->addCamera(cam_idx, rtsp_url);
+ }
+ }
+ } 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) {
+ 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 {
+ 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 {
+ DBG("itor value is not string ");
+ continue;
+ }
+ }
+ } else {
+ ERR("Error Message!!");
+ }
+}
+
+
//鍒濆鍖栧嚱鏁�
void RtspAnalysManager::init() {
- INFO("MYH DEBUG HERE")
- auto lst = m_lDBTool->searchCamDevTableAll();
- Record_Config lst_dev = m_lDBTool->searchConfigTableWithinServerInfo();
+// INFO("MYH DEBUG HERE")
- //璁剧疆瑙嗛鐨勬渶闀垮拰鏈�鐭椂闂撮棿闅�
- 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("CamStart") * appPref.getIntData("CamStep");
- int CamCount = appPref.getIntData("CamStep");
- INFO("StartCamNO: "<<startCamNO<<" CamStep: "<<CamCount);
- auto itor = lst.begin();
+ gRtspAnalysManagerCamera = this;
+ DBG("gRtspAnalysManagerCamera ADDR:" << gRtspAnalysManagerCamera);
- if(startCamNO >= lst.size())
- {
- ERR("startCamNO > lst.size()");
- return;
- }
+ m_GB28181_Enable = appPref.getIntData("GB28181_Enable");
+ //#todo GB28181
+ if (m_GB28181_Enable) {
+ auto lst = m_lDBTool->searchCamDevTableByType(1);
+ Record_Config lst_dev = m_lDBTool->searchConfigTableWithinServerInfo();
- for(int i=0; i < startCamNO; i++){
+ //璁剧疆瑙嗛鐨勬渶闀垮拰鏈�鐭椂闂撮棿闅�
+ 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;
+ INFO("StartCamNO: " << startCamNO << " CamCount: " << CamCount);
+ auto itor = lst.begin();
- 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());
- INFO("JumpCam: "<<t_camIdex<<" URL: "<<rtsp_url);
- itor++;
- }
-
- for (int i = 0; i < CamCount; i++) {
- if (itor == lst.end())
- {
- ERR("itor == lst.end()");
+ if (startCamNO >= lst.size()) {
+ ERR("startCamNO > lst.size()");
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());
- INFO("cam add is " << itor->str_addr.toStdString());
- addCamera(t_camIdex, rtsp_url);
- itor++;
+ for (int i = 0; i < startCamNO; i++) {
+ itor++;
+ }
+
+ for (int i = 0; i < CamCount; i++) {
+ if (itor == lst.end()) {
+ ERR("itor == lst.end()");
+ return;
+ }
+ std::string t_camIdex = itor->str_cam_dev_id.toStdString();
+ std::string rtsp_url = "GB28181";
+
+ INFO("cam add is " << itor->str_addr.toStdString());
+
+ addCamera(t_camIdex, rtsp_url);
+ sleep(1);
+ itor++;
+ }
+ } else {
+ ERR("searchCamDevTableByType size is 0");
}
+
+ } else {
+ auto lst = m_lDBTool->searchCamDevTableByType(0);
+ Record_Config lst_dev = m_lDBTool->searchConfigTableWithinServerInfo();
+
+ //璁剧疆瑙嗛鐨勬渶闀垮拰鏈�鐭椂闂撮棿闅�
+ 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;
+ INFO("StartCamNO: " << startCamNO << " CamCount: " << CamCount);
+ auto itor = lst.begin();
+
+ if (startCamNO >= lst.size()) {
+ ERR("startCamNO > lst.size()");
+ return;
+ }
+
+ for (int i = 0; i < startCamNO; i++) {
+
+ 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());
+ INFO("JumpCam: " << t_camIdex << " URL: " << rtsp_url);
+ itor++;
+ }
+
+ for (int i = 0; i < CamCount; i++) {
+ if (itor == lst.end()) {
+ 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());
+ INFO("cam add is " << itor->str_addr.toStdString());
+
+ addCamera(t_camIdex, rtsp_url);
+ itor++;
+ }
// for (auto item : lst)
// {
@@ -93,19 +250,24 @@
// addCamera(t_camIdex, rtsp_url);
//
// }
- } else {
- ERR("searchCamDevTableAll size is 0");
+ } else {
+ ERR("searchCamDevTableByType size is 0");
+ }
}
-
}
RtspAnalysManager::~RtspAnalysManager() {
INFO("Program Exit");
for (auto controller: m_controllers) {
- INFO("Delete Controller: "<<controller.first);
+ INFO("Delete Controller: " << controller.first);
delete controller.second;
}
m_controllers.clear();
+ for (auto controller: m_controllers_videoCapElem) {
+ INFO("Delete Controller: " << controller.first);
+ delete controller.second;
+ }
+ m_controllers_videoCapElem.clear();
}
/**
@@ -116,32 +278,76 @@
* @param rtsp 涓婇潰鐨勬憚鍍忔満瀵瑰簲鐨勮棰戣矾寰�
* @return -1 娣诲姞澶辫触,0 娣诲姞鎴愬姛
*/
-int RtspAnalysManager::addCamera(const std::string &index, const std::string& rtsp) {
- auto lst = m_lDBTool->searchCamDevTableAll();
- Record_Config lst_dev = m_lDBTool->searchConfigTableWithinServerInfo();
+int RtspAnalysManager::addCamera(const std::string &index, const std::string &rtsp) {
- if (m_controllers.find(index) == m_controllers.end()) {
- INFO("MYH DEBUG HERE");
- if (m_currentCount >= m_maxCount) {
- ERR("addCamera faild, camera's num is full!")
- return -1;
+ if (m_GB28181_Enable) {
+ //#todo
+// why search lst ?
+// auto lst = m_lDBTool->searchCamDevTableAll();
+ Record_Config lst_dev = m_lDBTool->searchConfigTableWithinServerInfo();
+
+ //#todo end
+ if (m_controllers_videoCapElem.find(index) == m_controllers_videoCapElem.end()) {
+// INFO("MYH DEBUG HERE");
+ if (m_currentCount >= m_maxCount) {
+ ERR("addCamera faild, camera's num is full!")
+ return -1;
+ }
+ INFO("RTSP: " << rtsp << " INDEX:" << index);
+
+ m_imgRedisCRwLock.wrlock();
+ m_imgRedisControllers[index] = new RtspImageRedisElement(index);
+ m_imgRedisControllers[index]->start();
+ m_imgRedisCRwLock.unlock();
+
+ //VideoCaptureElementWithRtp(std::string &chanPubID, int fps, int streamTransType, int gpuIdx = -1)
+// m_controllers_videoCapElem[index] = new BASICGB28181::VideoCaptureElementWithRtp(
+// const_cast<string &>(index),
+// 25, 0, 0, this);
+
+ m_controllers_videoCapElem[index] = new PushStreamAppPipeController(const_cast<string &>(index),
+ 25, 0, appPref.getIntData("gpu.index"),
+ this);
+ m_controllers_videoCapElem[index]->SetVideoMinMaxSeconds(lst_dev.n_cut_min_duration,
+ lst_dev.n_cut_max_duration);
+ m_controllers_videoCapElem[index]->start();
+ m_currentCount++;
+ return 0;
+
+ } else {
+ removeCamera(index);
+ INFO("removeCamera " << index);
+ //DBG("removeCamera " << index);
+ return addCamera(index, rtsp);
}
- INFO("RTSP: "<<rtsp<<" INDEX:"<<index);
- m_imgRedisControllers[index] = new RtspImageRedisElement(index);
- m_imgRedisControllers[index]->start();
-
- m_controllers[index] = new RtspCaptureElement(rtsp,index, 25,3000,0,this);
- m_controllers[index]->start();
- m_controllers[index]->SetVideoMinMaxSeconds(lst_dev.n_cut_min_duration,lst_dev.n_cut_max_duration);
- m_currentCount++;
- return 0;
-
} else {
- removeCamera(index);
- INFO("removeCamera " << index);
- //DBG("removeCamera " << index);
- return addCamera(index, rtsp);
+ // why search lst ?
+ // auto lst = m_lDBTool->searchCamDevTableAll();
+ Record_Config lst_dev = m_lDBTool->searchConfigTableWithinServerInfo();
+ if (m_controllers.find(index) == m_controllers.end()) {
+ INFO("MYH DEBUG HERE");
+ if (m_currentCount >= m_maxCount) {
+ ERR("addCamera faild, camera's num is full!")
+ return -1;
+ }
+ INFO("RTSP: " << rtsp << " INDEX:" << index);
+ m_imgRedisControllers[index] = new RtspImageRedisElement(index);
+ m_imgRedisControllers[index]->start();
+
+ m_controllers[index] = new RtspCaptureElement(rtsp, index, 25, 3000, appPref.getIntData("gpu.index"), this);
+ m_controllers[index]->SetVideoMinMaxSeconds(lst_dev.n_cut_min_duration, lst_dev.n_cut_max_duration);
+ m_controllers[index]->start();
+ m_currentCount++;
+ return 0;
+
+ } else {
+ removeCamera(index);
+ INFO("removeCamera " << index);
+ //DBG("removeCamera " << index);
+ return addCamera(index, rtsp);
+ }
}
+
}
/**
@@ -151,19 +357,31 @@
*/
int RtspAnalysManager::removeCamera(const std::string &index) {
INFO("MYH DEBUG HERE");
- if (m_controllers.find(index) == m_controllers.end())return -1;
- auto controller = m_controllers[index];
- controller->stop();
- controller->wait();
- delete controller;
- m_controllers.erase(index);
- m_currentCount--;
+ if (m_GB28181_Enable) {
+ if (m_controllers_videoCapElem.find(index) == m_controllers_videoCapElem.end())return -1;
+ auto controller = m_controllers_videoCapElem[index];
+ controller->stop();
+ controller->wait();
+ delete controller;
+ m_controllers_videoCapElem.erase(index);
+ m_currentCount--;
+ } else {
+ if (m_controllers.find(index) == m_controllers.end())return -1;
+ auto controller = m_controllers[index];
+ controller->stop();
+ controller->wait();
+ delete controller;
+ m_controllers.erase(index);
+ m_currentCount--;
+ }
+ m_imgRedisCRwLock.wrlock();
auto imgRedis = m_imgRedisControllers[index];
imgRedis->stop();
imgRedis->wait();
delete imgRedis;
m_imgRedisControllers.erase(index);
+ m_imgRedisCRwLock.unlock();
INFO("MYH DEBUG HERE");
return 0;
}
@@ -173,18 +391,30 @@
* @return
*/
int RtspAnalysManager::removeAll() {
- INFO("MYH DEBUG HERE");
- for (auto controller: m_controllers) {
- controller.second->stop();
- }
- for (auto controller: m_controllers) {
- controller.second->wait();
- delete controller.second;
- }
- m_controllers.clear();
- INFO("MYH DEBUG HERE");
+// INFO("MYH DEBUG HERE");
+ if (m_GB28181_Enable) {
+ for (auto controller: m_controllers_videoCapElem) {
+ controller.second->stop();
+ }
+ for (auto controller: m_controllers_videoCapElem) {
+ controller.second->wait();
+ delete controller.second;
+ }
+ m_controllers_videoCapElem.clear();
+ } else {
+ for (auto controller: m_controllers) {
+ controller.second->stop();
+ }
+ for (auto controller: m_controllers) {
+ controller.second->wait();
+ delete controller.second;
+ }
+ m_controllers.clear();
+ }
+// INFO("MYH DEBUG HERE");
+ m_imgRedisCRwLock.wrlock();
for (auto controller: m_imgRedisControllers) {
controller.second->stop();
}
@@ -192,11 +422,12 @@
controller.second->wait();
delete controller.second;
}
- m_controllers.clear();
+ m_imgRedisControllers.clear();
+ m_imgRedisCRwLock.unlock();
m_currentCount = 0;
- INFO("MYH DEBUG HERE");
+// INFO("MYH DEBUG HERE");
return 0;
}
@@ -210,41 +441,47 @@
return m_currentCount;
}
-
//褰曞彇瑙嗛鐨凴PC鐨勬帴鍙ｅ嚱鏁�
-::std::string RtspAnalysManager::recordVideo(const ::std::string& name, const ::Ice::Current&)
-{
- INFO("Record Video For: "<<name);
- ImageName_s_t nameSt=ImageName_s_t::fromString(name);
- if(nameSt.Valid())
- {
- auto pCaptureElem = m_controllers.find(nameSt.m_camId);
- if(pCaptureElem!= m_controllers.end())
- {
- pCaptureElem->second->SaveVideo(name);
- } else{
- ERR("Can not Find CamId "<<nameSt.m_camId);
+::std::string RtspAnalysManager::recordVideo(const ::std::string &name, const ::Ice::Current &) {
+ INFO("Record Video For: " << name);
+ ImageName_s_t nameSt = ImageName_s_t::fromString(name);
+ if (nameSt.Valid()) {
+ if (m_GB28181_Enable) {
+ auto pCaptureElem = m_controllers_videoCapElem.find(nameSt.m_camId);
+ if (pCaptureElem != m_controllers_videoCapElem.end()) {
+//#todo ~~~~~~!!!!!!! 杩欓噷鏈塨ug 闇�瑕佹斁寮�璋冭瘯
+ pCaptureElem->second->SaveVideo(name);
+ } else {
+ ERR("Can not Find CamId " << nameSt.m_camId);
+ }
+ } else {
+ auto pCaptureElem = m_controllers.find(nameSt.m_camId);
+ if (pCaptureElem != m_controllers.end()) {
+ pCaptureElem->second->SaveVideo(name);
+ } else {
+ ERR("Can not Find CamId " << nameSt.m_camId);
+ }
}
- }
- else{
- ERR("Record Video Failed:Name Not Valid Name: "<<name);
+ } else {
+ ERR("Record Video Failed:Name Not Valid Name: " << name);
}
return name;
}
//淇濆瓨瑙嗛鍒癛tspImageRedis鐨勯槦鍒�,鐢盧tspCaptureElement璋冪敤
-bool RtspAnalysManager::SaveImageToRedis(const std::string& camId,const std::string& imageName,const cv::Mat& img)
-{
- INFO("MYH DEBUG HERE");
+bool RtspAnalysManager::SaveImageToRedis(const std::string &camId, const std::string &imageName, const cv::Mat &img) {
+// INFO("MYH DEBUG HERE " << camId);
+
+// m_imgRedisCRwLock.rdlock();
auto item = m_imgRedisControllers.find(camId);
- if(item!=m_imgRedisControllers.end())
- {
- INFO("Save Succeed Cam: "<<camId<<" ImageKey: "<<imageName);
- item->second->SaveImage(imageName,img);
+ if (item != m_imgRedisControllers.end()) {
+// INFO("Save Succeed Cam: " << camId << " ImageKey: " << imageName);
+ item->second->SaveImage(imageName, img);
} else {
- ERR("Save Failed Cam: "<<camId<<" ImageKey: "<<imageName);
+// ERR("Save Failed Cam: " << camId << " ImageKey: " << imageName);
}
- INFO("MYH DEBUG HERE");
+// m_imgRedisCRwLock.unlock();
+// INFO("MYH DEBUG HERE");
return true;
}
--
Gitblit v1.8.0