From 1cfd2b4357cd46196211ebcb8dc462359d512cbb Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 10 十二月 2019 12:36:44 +0800
Subject: [PATCH] udpate
---
goyolo.go | 62 +++++++++++++++---------------
1 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/goyolo.go b/goyolo.go
index 76a7a94..b7169bc 100644
--- a/goyolo.go
+++ b/goyolo.go
@@ -215,37 +215,8 @@
return allObjs, newObjs
}
-func convert2ProtoYoloTrack(obj []CObjTrackInfo, fx, fy float64) []*protomsg.ObjInfo {
- ret := []*protomsg.ObjInfo{}
-
- for _, v := range obj {
- if fx < 1.0 || fy < 1.0 {
- v.ObjInfo.RcObj.Left = (int32)((float64)(v.ObjInfo.RcObj.Left) / fx)
- v.ObjInfo.RcObj.Right = (int32)((float64)(v.ObjInfo.RcObj.Right) / fx)
- v.ObjInfo.RcObj.Top = (int32)((float64)(v.ObjInfo.RcObj.Top) / fy)
- v.ObjInfo.RcObj.Bottom = (int32)((float64)(v.ObjInfo.RcObj.Bottom) / fy)
- }
-
- rect := protomsg.Rect{
- Left: v.ObjInfo.RcObj.Left,
- Right: v.ObjInfo.RcObj.Right,
- Top: v.ObjInfo.RcObj.Top,
- Bottom: v.ObjInfo.RcObj.Bottom,
- }
- obj := protomsg.ObjInfo{
- RcObj: &rect,
- Typ: v.ObjInfo.Typ,
- Prob: v.ObjInfo.Prob,
- ObjID: v.ID,
- }
-
- ret = append(ret, &obj)
- }
- return ret
-}
-
-// YoloDetectTrack yolo detect (鍙瘑鍒汉)
-func YoloDetectTrack(y *YoloHandle, id string, data []byte, w, h, c int, thrsh float32, umns int) ([]byte, []byte) {
+// Run yolo detect (鍙瘑鍒汉)
+func Run(y *YoloHandle, id string, data []byte, w, h, c int, thrsh float32, umns int) ([]byte, []byte) {
if data == nil || w <= 0 || h <= 0 {
return nil, nil
}
@@ -282,3 +253,32 @@
}
return dWhole, dRecent
}
+
+func convert2ProtoYoloTrack(obj []CObjTrackInfo, fx, fy float64) []*protomsg.ObjInfo {
+ ret := []*protomsg.ObjInfo{}
+
+ for _, v := range obj {
+ if fx < 1.0 || fy < 1.0 {
+ v.ObjInfo.RcObj.Left = (int32)((float64)(v.ObjInfo.RcObj.Left) / fx)
+ v.ObjInfo.RcObj.Right = (int32)((float64)(v.ObjInfo.RcObj.Right) / fx)
+ v.ObjInfo.RcObj.Top = (int32)((float64)(v.ObjInfo.RcObj.Top) / fy)
+ v.ObjInfo.RcObj.Bottom = (int32)((float64)(v.ObjInfo.RcObj.Bottom) / fy)
+ }
+
+ rect := protomsg.Rect{
+ Left: v.ObjInfo.RcObj.Left,
+ Right: v.ObjInfo.RcObj.Right,
+ Top: v.ObjInfo.RcObj.Top,
+ Bottom: v.ObjInfo.RcObj.Bottom,
+ }
+ obj := protomsg.ObjInfo{
+ RcObj: &rect,
+ Typ: v.ObjInfo.Typ,
+ Prob: v.ObjInfo.Prob,
+ ObjID: v.ID,
+ }
+
+ ret = append(ret, &obj)
+ }
+ return ret
+}
--
Gitblit v1.8.0