From 3d4c378b6f65f03f9fab19bdee5decb2be989b92 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期日, 03 三月 2019 16:12:40 +0800
Subject: [PATCH] 添加GB28181解码模块
---
QiaoJiaSystem/StructureApp/NewRecordVideoElement.h | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/NewRecordVideoElement.h b/QiaoJiaSystem/StructureApp/NewRecordVideoElement.h
index 17a40f9..2b578f5 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();
@@ -35,7 +35,6 @@
#define RECORD_STOP (0)
#define RECORD_DOING (1)
#define RECORD_ENDING (2)
-
int recordStatus;
int videoLength;
int recordDelay;
@@ -53,6 +52,7 @@
std::queue<ImgInfo> m_imgBufQue;
HiredisTool m_hiredisTool;
std::string m_filename;
+ bool m_bSaveWH;
};
#endif // RECORDVIDEOELEMENT_H
--
Gitblit v1.8.0