From a2ea58c567a078bb97a9e45a56fe50df41438d22 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 15 四月 2019 10:37:31 +0800
Subject: [PATCH] 整合c++ver1.3的修改代码进入该分支
---
QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
index b281268..fa3087a 100644
--- a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
@@ -325,7 +325,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;
@@ -356,7 +356,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];
@@ -382,7 +382,7 @@
delete imgRedis;
m_imgRedisControllers.erase(index);
m_imgRedisCRwLock.unlock();
- INFO("MYH DEBUG HERE");
+// INFO("MYH DEBUG HERE");
return 0;
}
@@ -443,7 +443,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