From 87baff1f74bc17dc7a664b3176288a235bd024f6 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期二, 19 二月 2019 17:02:59 +0800
Subject: [PATCH] 录像失败不直接返回
---
QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp | 4 ++--
QiaoJiaSystem/StructureApp/PerimeterElement.cpp | 4 ++--
QiaoJiaSystem/VideoToImageMulth/RtspCaptureElement.h | 15 ++++++++++-----
QiaoJiaSystem/StructureApp/FaceExtractElement.cpp | 4 ++--
4 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/FaceExtractElement.cpp b/QiaoJiaSystem/StructureApp/FaceExtractElement.cpp
index 5269715..b0eab37 100644
--- a/QiaoJiaSystem/StructureApp/FaceExtractElement.cpp
+++ b/QiaoJiaSystem/StructureApp/FaceExtractElement.cpp
@@ -227,7 +227,7 @@
if (!server)
{
ERR("server is null");
- return;
+ //return;
}
INFO("Record Video "<<strImageKey);
server->recordVideo(strImageKey);
@@ -235,7 +235,7 @@
catch (std::exception &e)
{
ERR("Record Video Err: "<<strImageKey <<" Message: "<<e.what());
- return;
+ //return;
}
auto faceSearchServer = faceSearchRpcClient.getServer();
if (!faceSearchServer) {
diff --git a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp
index 5c3b95c..476883e 100644
--- a/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp
+++ b/QiaoJiaSystem/StructureApp/JudgmentRetrogradeTool.cpp
@@ -312,7 +312,7 @@
if (!server)
{
ERR("server is null");
- return false;
+ //return false;
}
INFO("Record Video "<<imgKey);
server->recordVideo(imgKey);
@@ -320,7 +320,7 @@
catch (std::exception &e)
{
ERR("Record Video Err: "<<imgKey <<" Message: "<<e.what());
- return false;
+ //return false;
}
bool retface = false;
diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
index e411855..778b8d4 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
@@ -388,7 +388,7 @@
if (!server)
{
ERR("server is null");
- return false;
+ //return false;
}
INFO("Record Video "<<imgKey);
server->recordVideo(imgKey);
@@ -396,7 +396,7 @@
catch (std::exception &e)
{
ERR("Record Video Err: "<<imgKey <<" Message: "<<e.what());
- return false;
+ //return false;
}
INFO("SaveImgKeyToES: "<<imgKey);
bool retface = false;
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspCaptureElement.h b/QiaoJiaSystem/VideoToImageMulth/RtspCaptureElement.h
index 981dc7a..e52ea77 100644
--- a/QiaoJiaSystem/VideoToImageMulth/RtspCaptureElement.h
+++ b/QiaoJiaSystem/VideoToImageMulth/RtspCaptureElement.h
@@ -12,19 +12,27 @@
* 浣跨敤ffmpeg灏佽鐨勮棰戦噰闆嗘祦姘村厓绱�
* 杈撳叆锛宺tsp鍦板潃鎴栨枃浠讹紙mp4鎴朼vi锛夎矾寰勶紝杈撳嚭opencv涓殑cv::Mat
* 鏀寔GPU纭В鐮�
+ * 涓昏瀹屾垚瑙嗛甯х殑鑾峰彇浠ュ強鍚慍vCapture_FFMPEG浼犻�佹暟鎹�
*/
class RtspCaptureElement: public TimerElement {
public:
RtspCaptureElement(const std::string& path,const std::string& camId, int fps = 30, int reOpenTime = -1, int gpuIndex = -1,RtspAnalysManager* manager= nullptr);
+ //淇濆瓨瑙嗛鎺ュ彛,浠嶳tspAnalysManager鍙戣捣璋冪敤
void SaveVideo(const std::string& strImageName);
+
+ //璁剧疆淇濆瓨瑙嗛鐨勬渶灏忓拰鏈�澶ч暱搴�,鍗曚綅鏄,瀹為檯鐨勮繍琛屾儏鍐垫湁涓�浜涘樊璺濓紝闇�瑕佸畬鍠�
void SetVideoMinMaxSeconds(const int minSeconds,const int maxSeconds);
private:
+ //绾跨▼鎵ц鍑芥暟
virtual void timerFunc() override;
+ //绾跨▼鐨勪竴浜涘彉閲忓垵濮嬪寲,绾跨▼鍚姩鐨勬椂鍊欒皟鐢�
virtual void threadInitial() override;
+ //绾跨▼缁撴潫鍑芥暟鐨勬椂鍊欒皟鐢�,瀹屾垚涓�浜涜祫婧愮殑閲婃斁
virtual void threadClosing() override;
+ //鎵撳紑瑙嗛
void openVideo();
- //
+ //鏍规嵁timeStamp鍒涘缓璺緞
std::string MakeDir(const std::string& timeStamp);
private:
//鐢ㄦ潵鎶撳彇瑙嗛鐨凢fmpeg鐨勫皝瑁呯被
@@ -49,11 +57,8 @@
//鐢ㄦ潵淇濆瓨褰曞儚瑙嗛鐨勮矾寰�
std::string m_cutPath;
- //鍑犲紶鍥句涪涓�寮�,鐩墠鏄�4寮犱涪涓�寮�
+ //鍑犲紶鍥句涪涓�寮�,鐩墠鏄�8寮犱涪涓�寮�
const int m_nPicsPickOne = 8;
-
- //姣忓彴鎽勫儚鏈轰繚瀛樺埌Redis鐨勫浘鐗囨暟閲忕殑鏈�澶у��
- //const int M_CAM_PIC_MAX_COUNT = 50;
RtspAnalysManager * m_pManager;
};
--
Gitblit v1.8.0