From f2a3422c62a1176b50038e0e7bd81f05227834b7 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期一, 04 三月 2019 09:46:51 +0800
Subject: [PATCH] 测试代码变动，及格式化变更
---
QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp | 59 +++++++++++++++++++++++++----------------------------------
1 files changed, 25 insertions(+), 34 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
index 6166a4f..dd25e47 100644
--- a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
@@ -10,11 +10,10 @@
RtspAnalysManager::RtspAnalysManager(LDBTool *_dbTool) : m_lDBTool(nullptr), m_maxCount(50), m_currentCount(0) {
INFO("MYH DEBUG HERE");
- m_lDBTool=new LDBTool;
+ m_lDBTool = new LDBTool;
init();
}
-
static std::string rtspAddrBuild(std::string ip, const int port, std::string username,
@@ -50,27 +49,25 @@
if (lst.size() > 0) {
int startCamNO = appPref.getIntData("CamStart") * appPref.getIntData("CamStep");
int CamCount = appPref.getIntData("CamStep");
- INFO("StartCamNO: "<<startCamNO<<" CamStep: "<<CamCount);
+ INFO("StartCamNO: " << startCamNO << " CamStep: " << CamCount);
auto itor = lst.begin();
- if(startCamNO >= lst.size())
- {
+ if (startCamNO >= lst.size()) {
ERR("startCamNO > lst.size()");
return;
}
- for(int i=0; i < startCamNO; i++){
+ 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);
+ INFO("JumpCam: " << t_camIdex << " URL: " << rtsp_url);
itor++;
}
for (int i = 0; i < CamCount; i++) {
- if (itor == lst.end())
- {
+ if (itor == lst.end()) {
ERR("itor == lst.end()");
return;
}
@@ -102,7 +99,7 @@
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();
@@ -116,7 +113,7 @@
* @param rtsp 涓婇潰鐨勬憚鍍忔満瀵瑰簲鐨勮棰戣矾寰�
* @return -1 娣诲姞澶辫触,0 娣诲姞鎴愬姛
*/
-int RtspAnalysManager::addCamera(const std::string &index, const std::string& rtsp) {
+int RtspAnalysManager::addCamera(const std::string &index, const std::string &rtsp) {
auto lst = m_lDBTool->searchCamDevTableAll();
Record_Config lst_dev = m_lDBTool->searchConfigTableWithinServerInfo();
@@ -126,13 +123,13 @@
ERR("addCamera faild, camera's num is full!")
return -1;
}
- INFO("RTSP: "<<rtsp<<" INDEX:"<<index);
+ 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] = 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_controllers[index]->SetVideoMinMaxSeconds(lst_dev.n_cut_min_duration, lst_dev.n_cut_max_duration);
m_currentCount++;
return 0;
@@ -212,37 +209,31 @@
//褰曞彇瑙嗛鐨凴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())
- {
+::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())
- {
+ if (pCaptureElem != m_controllers.end()) {
pCaptureElem->second->SaveVideo(name);
- } else{
- ERR("Can not Find CamId "<<nameSt.m_camId);
+ } 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)
-{
+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);
+ 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");
return true;
--
Gitblit v1.8.0