From 76f25eb0e46494b7f564e704f422002331a969a5 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 15 七月 2019 14:24:54 +0800
Subject: [PATCH] add fn yolodetecttrack2
---
gosdk.go | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/gosdk.go b/gosdk.go
index b46eacc..b7e3222 100644
--- a/gosdk.go
+++ b/gosdk.go
@@ -17,11 +17,12 @@
// YoloHandle wrap C
type YoloHandle struct {
- handle C.YoloHandle
+ handle C.YoloHandle
LastYoloObjs []CObjTrackInfo //yolo璺熻釜鐨勪笂涓�甯т俊鎭�
- LastTrackID uint64 //yolo 琚娇鐢ㄧ殑ID
+ LastTrackID uint64 //yolo 琚娇鐢ㄧ殑ID
}
-const RatioInterTrack = 50 //璺熻釜鍒ゆ柇閲嶅彔闃堝��
+
+const RatioInterTrack = 50 //璺熻釜鍒ゆ柇閲嶅彔闃堝��
// SDKImage sdk image
type SDKImage struct {
@@ -43,7 +44,7 @@
g := C.int(gi)
p := C.c_api_yolo_init(c, w, n, g)
- return &YoloHandle{handle:p}
+ return &YoloHandle{handle: p}
}
// InitFaceDetector init face detector
@@ -362,3 +363,45 @@
return allObjs, newObjs
}
+
+// YoloDetectTrack2 yolo detect (鍙瘑鍒汉)
+func YoloDetectTrack2(handle *YoloHandle, LastYoloObjs []CObjTrackInfo, LastTrackID *uint64, img SDKImage, thrsh float32, umns int) (allObjs []CObjTrackInfo, newObjs []CObjTrackInfo) {
+
+ var tmp CObjTrackInfo
+ //LastYoloObjs
+ detectObjs := YoloDetect(handle, img, thrsh, umns)
+
+ for _, vLast := range LastYoloObjs {
+ for i := 0; i < len(detectObjs); i++ {
+ //fmt.Println("vNew.Typ:", vNew.Typ)
+ if vLast.ObjInfo.Typ == detectObjs[i].Typ { //鍚屼竴绫诲埆锛屾瘮濡傞兘鏄汉浣�
+ ratio := countInterAreaOfTwoRect(vLast.ObjInfo.RcObj, detectObjs[i].RcObj)
+ if ratio >= RatioInterTrack {
+ //update LastYoloObjs
+ vLast.ObjInfo.RcObj = detectObjs[i].RcObj
+ vLast.ObjInfo.Prob = detectObjs[i].Prob
+
+ allObjs = append(allObjs, vLast)
+ detectObjs = append(detectObjs[:i], detectObjs[i+1:]...) //浠庢娴嬬洰鏍囬噷鍒犻櫎宸茬粡鏌ュ埌鐨勮窡韪洰鏍�
+ i--
+ break //涓婁竴甯ц窡韪殑鐩爣宸茬粡鎵惧埌锛屾棤闇�寰�涓嬪鐞嗗叾浠栨娴嬬洰鏍�
+ }
+ }
+ }
+ }
+
+ //澶勭悊鏂板嚭鐜扮殑鐩爣
+ id := *LastTrackID
+ if len(detectObjs) > 0 {
+ for _, vAdd := range detectObjs {
+ tmp.ObjInfo = vAdd
+ tmp.ID = id
+ id++
+
+ allObjs = append(allObjs, tmp)
+ newObjs = append(newObjs, tmp)
+ }
+ }
+ *LastTrackID = id
+ return allObjs, newObjs
+}
--
Gitblit v1.8.0