From d3b7bbe7102cd089680a828f5d8f6402c8cf6342 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 07 三月 2019 14:43:28 +0800
Subject: [PATCH] GB28181集成完成,集成推流模块
---
QiaoJiaSystem/StructureApp/NewRecordVideoElement.h | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/NewRecordVideoElement.h b/QiaoJiaSystem/StructureApp/NewRecordVideoElement.h
index 4d56bc1..2b578f5 100644
--- a/QiaoJiaSystem/StructureApp/NewRecordVideoElement.h
+++ b/QiaoJiaSystem/StructureApp/NewRecordVideoElement.h
@@ -1,13 +1,14 @@
#ifndef NEWRECORDVIDEOELEMENT_H
#define NEWRECORDVIDEOELEMENT_H
-#include <basic/pipe/PipeElement.h>
+//#include <basic/pipe/PipeElement.h>
#include <basic/pipe_element/ffmpeg/FfmpegElement.h>
-struct ImgInfo
-{
- std::string time;
- cv::Mat img;
-};
-class NewRecordVideoElement : public basic::PipeElement{
+#include "HiredisTool.h"
+//struct ImgInfo
+//{
+// std::string time;
+// cv::Mat img;
+//};
+class NewRecordVideoElement {
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:
+// virtual void threadFunc() override;
+// virtual void threadInitial() override;
private:
void recordInit(int videoMin, int videoMax);
-
void Record();
+
int fileMin;
int fileMax;
bool sdkTrigger;
@@ -40,20 +35,24 @@
#define RECORD_STOP (0)
#define RECORD_DOING (1)
#define RECORD_ENDING (2)
-
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;
+ bool m_bSaveWH;
};
#endif // RECORDVIDEOELEMENT_H
--
Gitblit v1.8.0