From 6540a2a9d69432c4cc475e3b32eae11e9e0ace73 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期四, 11 四月 2019 20:28:10 +0800
Subject: [PATCH] 1.srs的分辨率在config.json配置 2.单播推流控制，国标摄像机差一个关闭测试 3. 底库字段添加
---
QiaoJiaSystem/YoloServer/ImageDrawElement.h | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/QiaoJiaSystem/YoloServer/ImageDrawElement.h b/QiaoJiaSystem/YoloServer/ImageDrawElement.h
index 03fd9df..a9c2a51 100644
--- a/QiaoJiaSystem/YoloServer/ImageDrawElement.h
+++ b/QiaoJiaSystem/YoloServer/ImageDrawElement.h
@@ -1,20 +1,30 @@
#ifndef IMAGEDRAWELEMENT_H
#define IMAGEDRAWELEMENT_H
-#include <basic/pipe_element/ImageFactoryElement.h>
-#include <mutex>
-class ImageDrawElement : public ImageFactoryElement
-{
+#include <YoloServer.h>
+//#include <FaceServer.h>
+#include <basic/pipe_element/ImageFactoryElement.h>
+#include <basic/core/DoubleBufferedData.h>
+#include "../StructureApp/TrackingTrigger.h"
+
+class ImageDrawElement : public ImageFactoryElement {
public:
ImageDrawElement();
- void setRects(const std::vector<cv::Rect2f> &value);
+
+ // ImageFactoryElement interface
+// void setFaces(std::vector<ScoredRect> value);
+
+ void setYoloObjects(std::vector<ScoredRect> value);
private:
- std::mutex rectsMtx;
- std::vector<cv::Rect2f> rects;
- std::vector<cv::Rect2f> rectsBuffer;
- bool rectsUpdated;
- virtual void processImage(cv::Mat& image);
+ virtual void processImage(cv::Mat &) override;
+
+ void darwProperty(cv::Mat &image, string key, string value, int x, int y);
+
+private:
+// DoubleBufferedData<std::vector<ScoredRect>> faces;
+ DoubleBufferedData<std::vector<ScoredRect>> yoloObjects;
};
+
#endif // IMAGEDRAWELEMENT_H
--
Gitblit v1.8.0