From 5bf0020b189b2bc8c64737c2af4ea77c3e8f5612 Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 08 三月 2019 22:24:27 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/YoloServer/YoloDetectServerI.h | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/QiaoJiaSystem/YoloServer/YoloDetectServerI.h b/QiaoJiaSystem/YoloServer/YoloDetectServerI.h
index ad18554..40b25a2 100644
--- a/QiaoJiaSystem/YoloServer/YoloDetectServerI.h
+++ b/QiaoJiaSystem/YoloServer/YoloDetectServerI.h
@@ -1,20 +1,40 @@
#ifndef YOLODETECTSERVERI_H
#define YOLODETECTSERVERI_H
#define GPU
+
#include "YoloServer.h"
#include <thread>
#include <darknet.h>
#include <opencv2/opencv.hpp>
#include <basic/util/resource/ResourcesManager.h>
-class YoloDetectServerI : public YoloDetect::YoloDetectServer
-{
+
+//#include "DnDetect.h"
+//#include <atomic>
+
+/*struct DnDetectRes {
+public:
+ DnDetectRes() : i(3) {
+ }
+
+ DnDetect::DnDetect *dnDetect;
+// 搴忓彿鍙婄嚎绋媔d
+ std::unordered_map<int, std::thread::id> map_pid;
+// 鎺ュ彈鐨勭嚎绋嬩釜鏁�
+ int i;
+};*/
+
+class YoloDetectServerI : public YoloDetect::YoloDetectServer {
public:
YoloDetectServerI();
+
virtual ~YoloDetectServerI();
// FaceDetectServer interface
public:
- virtual ::YoloDetect::ObjInfos YoloDetect(::Ice::Int, ::Ice::Int, const ::std::string&, const ::Ice::Current& = ::Ice::emptyCurrent)override;
+ virtual ::YoloDetect::ObjInfos
+ YoloDetect(::Ice::Int, ::Ice::Int, const ::std::string &, const ::Ice::Current & = ::Ice::emptyCurrent) override;
+
virtual YoloDetect::stringData getCocoData(const Ice::Current &) override;
+
private:
network *m_net;
float m_thresh;
@@ -25,13 +45,17 @@
bool m_bInitThd;
std::thread m_thdInit;
- // ResourcesManager<int> resourcesManager;
+// std::map<int, DnDetectRes> map_dnDetRes;
+
+ // ResourcesManager<int> resourcesManager;
private:
- static int init(void* arg);
- image matToImg(cv::Mat& RefImg);
- cv::Mat bufferToMat(const int w,const int h,const int channels,const void* buffer);
+ static int init(void *arg);
+
+ image matToImg(cv::Mat &RefImg);
+
+ cv::Mat bufferToMat(const int w, const int h, const int channels, const void *buffer);
};
--
Gitblit v1.8.0