From 768cdfe80e3cdd37448ca967b3c72d9837b626d7 Mon Sep 17 00:00:00 2001
From: Unknown <csj_sky@126.com>
Date: 星期五, 12 七月 2019 15:52:15 +0800
Subject: [PATCH] 增加多线程处理
---
gosdk.go | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/gosdk.go b/gosdk.go
index baeb1a6..b46eacc 100644
--- a/gosdk.go
+++ b/gosdk.go
@@ -18,7 +18,10 @@
// YoloHandle wrap C
type YoloHandle struct {
handle C.YoloHandle
+ LastYoloObjs []CObjTrackInfo //yolo璺熻釜鐨勪笂涓�甯т俊鎭�
+ LastTrackID uint64 //yolo 琚娇鐢ㄧ殑ID
}
+const RatioInterTrack = 50 //璺熻釜鍒ゆ柇閲嶅彔闃堝��
// SDKImage sdk image
type SDKImage struct {
@@ -26,10 +29,6 @@
Width int
Height int
}
-
-var LastYoloObjs []CObjTrackInfo //yolo璺熻釜鐨勪笂涓�甯т俊鎭�
-var LastTrackID uint64 = 0 //yolo 琚娇鐢ㄧ殑ID
-const RatioInterTrack = 50 //璺熻釜鍒ゆ柇閲嶅彔闃堝��
// InitYolo init yolo sdk
func InitYolo(fc, fw, fn string, gi int) *YoloHandle {
@@ -44,7 +43,7 @@
g := C.int(gi)
p := C.c_api_yolo_init(c, w, n, g)
- return &YoloHandle{p}
+ return &YoloHandle{handle:p}
}
// InitFaceDetector init face detector
@@ -327,7 +326,7 @@
//LastYoloObjs
detectObjs := YoloDetect(handle, img, thrsh, umns)
- for _, vLast := range LastYoloObjs {
+ for _, vLast := range handle.LastYoloObjs {
for i := 0; i < len(detectObjs); i++ {
//fmt.Println("vNew.Typ:", vNew.Typ)
if vLast.ObjInfo.Typ == detectObjs[i].Typ { //鍚屼竴绫诲埆锛屾瘮濡傞兘鏄汉浣�
@@ -350,8 +349,8 @@
if len(detectObjs) > 0 {
for _, vAdd := range detectObjs {
tmp.ObjInfo = vAdd
- tmp.ID = LastTrackID
- LastTrackID++
+ tmp.ID = handle.LastTrackID
+ handle.LastTrackID++
allObjs = append(allObjs, tmp)
newObjs = append(newObjs, tmp)
@@ -359,7 +358,7 @@
}
//鍒锋柊涓婁竴甯х殑璺熻釜鐩爣
- LastYoloObjs = allObjs
+ handle.LastYoloObjs = allObjs
return allObjs, newObjs
}
--
Gitblit v1.8.0