From 8ac7f0ec5873c84c44d4cb2bc0a1d1247d6ae5ba Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期一, 18 二月 2019 10:02:35 +0800
Subject: [PATCH] 增加日志，查找重启的问题
---
QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
index 5e713a3..a01ab7a 100644
--- a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
@@ -9,6 +9,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();
@@ -37,8 +38,9 @@
return rtsp_url;
}
+//鍒濆鍖栧嚱鏁�
void RtspAnalysManager::init() {
-
+ NFO("MYH DEBUG HERE")
auto lst = m_lDBTool->searchCamDevTableAll();
Record_Config lst_dev = m_lDBTool->searchConfigTableWithinServerInfo();
@@ -49,6 +51,7 @@
for (auto item : lst)
{
+ INFO("MYH DEBUG HERE");
std::string t_camIdex = item.str_cam_dev_id.toStdString();
std::string rtsp_url = rtspAddrBuild(item.str_ip.toStdString(), 554, item.str_username.toStdString(),
item.str_password.toStdString(), item.str_brand.toStdString());
@@ -64,22 +67,33 @@
}
RtspAnalysManager::~RtspAnalysManager() {
+ INFO("Program Exit");
for (auto controller: m_controllers) {
+ INFO("Delete Controller: "<<controller.first);
delete controller.second;
}
m_controllers.clear();
}
+/**
+ * 鏍规嵁鎽勫儚鏈篒D鍜孯TSP璺緞,澧炲姞鎽勫儚鏈�
+ * 瀵逛簬姣忎釜鎽勫儚鏈烘湁涓�涓� RtspImageRedisElement 瀵硅薄鐢ㄤ簬淇濆瓨鍥剧墖鍒癛edis
+ * 鏈変竴涓� RtspCaptureElement 鐢ㄦ埛褰曞彇鍜屼繚瀛樿棰�
+ * @param index 鎽勫儚鏈篿d
+ * @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();
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;
}
- DBG("RTSP: "<<rtsp<<" INDEX:"<<index);
+ INFO("RTSP: "<<rtsp<<" INDEX:"<<index);
m_imgRedisControllers[index] = new RtspImageRedisElement(index);
m_imgRedisControllers[index]->start();
@@ -91,12 +105,18 @@
} else {
removeCamera(index);
- DBG("removeCamera " << index)
- return addCamera(rtsp, index);
+ INFO("removeCamera " << index);
+ return addCamera(index, rtsp);
}
}
+/**
+ * 鏍规嵁CamID绉婚櫎鎽勫儚鏈�,鍚屾椂鍋滄瑙嗛鐨勬姄鍙栧拰淇濆瓨鍥剧墖鍒癛edis
+ * @param index 鎽勫儚鏈篒D
+ * @return 鎬绘槸0
+ */
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();
@@ -110,10 +130,16 @@
imgRedis->wait();
delete imgRedis;
m_imgRedisControllers.erase(index);
+ INFO("MYH DEBUG HERE");
return 0;
}
+/**
+ * 绉婚櫎鎵�鏈夌殑鎽勫儚鏈�
+ * @return
+ */
int RtspAnalysManager::removeAll() {
+ INFO("MYH DEBUG HERE");
for (auto controller: m_controllers) {
controller.second->stop();
}
@@ -122,6 +148,7 @@
delete controller.second;
}
m_controllers.clear();
+ INFO("MYH DEBUG HERE");
for (auto controller: m_imgRedisControllers) {
@@ -135,16 +162,22 @@
m_currentCount = 0;
+ INFO("MYH DEBUG HERE");
return 0;
}
+//鑾峰彇鏈�澶х殑鎽勫儚鏈烘暟閲�
int RtspAnalysManager::getMaxCamCount() {
return m_maxCount;
}
+//鑾峰彇褰撳墠鐨勬憚鍍忔満鏁伴噺
int RtspAnalysManager::getCurrentCamCount() {
return m_currentCount;
}
+
+
+//褰曞彇瑙嗛鐨凴PC鐨勬帴鍙ｅ嚱鏁�
::std::string RtspAnalysManager::recordVideo(const ::std::string& name, const ::Ice::Current&)
{
INFO("Record Video For: "<<name);
@@ -165,14 +198,19 @@
return name;
}
-
+//淇濆瓨瑙嗛鍒癛tspImageRedis鐨勯槦鍒�,鐢盧tspCaptureElement璋冪敤
bool RtspAnalysManager::SaveImageToRedis(const std::string& camId,const std::string& imageName,const cv::Mat& img)
{
+ INFO("MYH DEBUG HERE");
auto item = m_imgRedisControllers.find(camId);
if(item!=m_imgRedisControllers.end())
{
+ INFO("Save Succeed Cam: "<<camId<<" ImageKey: "<<imageName);
item->second->SaveImage(imageName,img);
+ } else {
+ ERROR("Save Failed Cam: "<<camId<<" ImageKey: "<<imageName);
}
+ INFO("MYH DEBUG HERE");
return true;
}
--
Gitblit v1.8.0