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/RtspCaptureElement.h | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/QiaoJiaSystem/VideoToImageMulth/RtspCaptureElement.h b/QiaoJiaSystem/VideoToImageMulth/RtspCaptureElement.h
index 3421ba0..144b561 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鐨勫皝瑁呯被
@@ -33,7 +41,7 @@
std::string m_path;
// Redis鐨勫伐鍏风被
- HiredisTool m_redisTool;
+// HiredisTool m_redisTool;
//瀵逛繚瀛樺埌Redis鐨勫浘鐗囪繘琛岃鏁�
std::atomic<int> m_picCount{0};
@@ -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