From 52ffba4b81a86d86cda9cdce6e33d2dc6392243c Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 08 三月 2019 11:50:47 +0800
Subject: [PATCH] 修改同步库更新的bug
---
QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp | 90 ++++++++++++++++++++++-----------------------
1 files changed, 44 insertions(+), 46 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
index 7c814eb..a49c256 100644
--- a/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
+++ b/QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp
@@ -165,9 +165,12 @@
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 BASICGB28181::VideoCaptureElementWithRtp(
+// const_cast<string &>(index),
+// 25, 0, 0, this);
+
+ m_controllers_videoCapElem[index] = new PushStreamAppPipeController(const_cast<string &>(index),
+ 25, 0, 0, this);
m_controllers_videoCapElem[index]->SetVideoMinMaxSeconds(lst_dev.n_cut_min_duration,
lst_dev.n_cut_max_duration);
m_controllers_videoCapElem[index]->start();
@@ -208,11 +211,6 @@
}
}
-#ifndef GB28181
-
-#else
-
-#endif
}
/**
@@ -222,24 +220,23 @@
*/
int RtspAnalysManager::removeCamera(const std::string &index) {
INFO("MYH DEBUG HERE");
-#ifndef GB28181
- 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--;
-
-#else
- 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--;
-#endif
+ 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];
@@ -258,25 +255,26 @@
*/
int RtspAnalysManager::removeAll() {
INFO("MYH DEBUG HERE");
-#ifndef GB28181
- for (auto controller: m_controllers) {
- controller.second->stop();
+
+ 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();
}
- for (auto controller: m_controllers) {
- controller.second->wait();
- delete controller.second;
- }
- m_controllers.clear();
-#else
- 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();
-#endif
INFO("MYH DEBUG HERE");
m_imgRedisCRwLock.wrlock();
@@ -311,11 +309,11 @@
INFO("Record Video For: " << name);
ImageName_s_t nameSt = ImageName_s_t::fromString(name);
if (nameSt.Valid()) {
- if (GB28181_Enable) {
+ 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);
+ pCaptureElem->second->SaveVideo(name);
} else {
ERR("Can not Find CamId " << nameSt.m_camId);
}
--
Gitblit v1.8.0