From 53630c440d592792dcdd86f8d5b2c59da4f3c359 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期一, 28 一月 2019 20:35:35 +0800
Subject: [PATCH] Merge branch 'ywv1.2' into ywv1.2_布控feature
---
QiaoJiaSystem/StructureApp/AppPipeController.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.h b/QiaoJiaSystem/StructureApp/AppPipeController.h
index 2827a56..51a47ed 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.h
+++ b/QiaoJiaSystem/StructureApp/AppPipeController.h
@@ -84,6 +84,7 @@
void initPerHub();
private:
+ ffmpeg::VideoCaptureElement videoCaptureElement;
YoloRpcElement yoloRpcElement;
FaceRpcElement faceRpcElement;
FaceExtractElement faceExtractElement;
@@ -116,6 +117,7 @@
std::string getFullFileName();
std::mutex mutex;
+ bool m_bSetWH;
};
#endif // APPPIPECONTROLLER_H
--
Gitblit v1.8.0