From 17b4db15ed0543099193ec337d064abde39e922e Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期四, 24 一月 2019 13:49:30 +0800
Subject: [PATCH] test
---
QiaoJiaSystem/StructureApp/NewRecordVideoElement.h | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/NewRecordVideoElement.h b/QiaoJiaSystem/StructureApp/NewRecordVideoElement.h
index 17a40f9..dc35006 100644
--- a/QiaoJiaSystem/StructureApp/NewRecordVideoElement.h
+++ b/QiaoJiaSystem/StructureApp/NewRecordVideoElement.h
@@ -1,6 +1,6 @@
#ifndef NEWRECORDVIDEOELEMENT_H
#define NEWRECORDVIDEOELEMENT_H
-#include <basic/pipe/PipeElement.h>
+//#include <basic/pipe/PipeElement.h>
#include <basic/pipe_element/ffmpeg/FfmpegElement.h>
#include "HiredisTool.h"
//struct ImgInfo
@@ -8,7 +8,7 @@
// std::string time;
// cv::Mat img;
//};
-class NewRecordVideoElement : public basic::PipeElement{
+class NewRecordVideoElement {
public:
@@ -20,9 +20,9 @@
void setSdkTrigger(bool isTrigger);
void pushImgBuf(const std::string& time,cv::Mat& img);
-private:
- virtual void threadFunc() override;
- virtual void threadInitial() override;
+//private:
+// virtual void threadFunc() override;
+// virtual void threadInitial() override;
private:
void recordInit(int videoMin, int videoMax);
void Record();
@@ -53,6 +53,7 @@
std::queue<ImgInfo> m_imgBufQue;
HiredisTool m_hiredisTool;
std::string m_filename;
+ bool isRecord;
};
#endif // RECORDVIDEOELEMENT_H
--
Gitblit v1.8.0