From 0436e5443295395025f89f0d091aab1e9551d1a4 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 20:26:31 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of ssh://192.168.1.226:29418/development/c++ into ywv1.2
---
QiaoJiaSystem/StructureApp/NewRecordVideoElement.h | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/NewRecordVideoElement.h b/QiaoJiaSystem/StructureApp/NewRecordVideoElement.h
index 4d56bc1..17a40f9 100644
--- a/QiaoJiaSystem/StructureApp/NewRecordVideoElement.h
+++ b/QiaoJiaSystem/StructureApp/NewRecordVideoElement.h
@@ -2,11 +2,12 @@
#define NEWRECORDVIDEOELEMENT_H
#include <basic/pipe/PipeElement.h>
#include <basic/pipe_element/ffmpeg/FfmpegElement.h>
-struct ImgInfo
-{
- std::string time;
- cv::Mat img;
-};
+#include "HiredisTool.h"
+//struct ImgInfo
+//{
+// std::string time;
+// cv::Mat img;
+//};
class NewRecordVideoElement : public basic::PipeElement{
public:
@@ -16,22 +17,16 @@
~NewRecordVideoElement();
- std::string startRecord();
void setSdkTrigger(bool isTrigger);
- void doRecord();
-
- void endRecord();
-
void pushImgBuf(const std::string& time,cv::Mat& img);
- void getImg(ImgInfo& info);
private:
virtual void threadFunc() override;
virtual void threadInitial() override;
private:
void recordInit(int videoMin, int videoMax);
-
void Record();
+
int fileMin;
int fileMax;
bool sdkTrigger;
@@ -44,16 +39,20 @@
int recordStatus;
int videoLength;
int recordDelay;
-
-
-
private:
- std::string getFileName(std::string timeStamp);
- std::string makeDir();
+ std::string startRecord();
+ void doRecord();
+ void endRecord();
+ void getImg(ImgInfo& info);
+ std::string getFileName(const std::string& timeStamp);
+ std::string makeDir(const std::string& timeStamp);
+
ffmpeg::VideoEncodeElement videoEncoderElement;
std::string camID;
std::string m_cutPath;
std::queue<ImgInfo> m_imgBufQue;
+ HiredisTool m_hiredisTool;
+ std::string m_filename;
};
#endif // RECORDVIDEOELEMENT_H
--
Gitblit v1.8.0