From 583c90eb2e8216badbddf65994ab41d0d2eac436 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 11 十二月 2019 09:26:47 +0800
Subject: [PATCH] update
---
go.sum | 56 -------------
go.mod | 9 --
goyolo.go | 144 ++---------------------------------
3 files changed, 14 insertions(+), 195 deletions(-)
diff --git a/go.mod b/go.mod
index a5d9976..be15861 100644
--- a/go.mod
+++ b/go.mod
@@ -2,11 +2,4 @@
go 1.12
-require (
- basic.com/pubsub/protomsg.git v0.0.0-20191209102656-8ef3322ca3dd
- github.com/gogo/protobuf v1.3.1
- golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 // indirect
- golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135 // indirect
- google.golang.org/grpc v1.25.1 // indirect
- honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc // indirect
-)
+require basic.com/libgowrapper/sdkstruct.git v0.0.0-20191211011351-89daaec8738e
diff --git a/go.sum b/go.sum
index 79c7276..939f47c 100644
--- a/go.sum
+++ b/go.sum
@@ -1,54 +1,2 @@
-basic.com/pubsub/protomsg.git v0.0.0-20191209102656-8ef3322ca3dd h1:XhDOb95T9g5kX3dEHOvpQJJHKZcAd3hgwEHOk9cS6c4=
-basic.com/pubsub/protomsg.git v0.0.0-20191209102656-8ef3322ca3dd/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
-github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1 h1:wdKvqQk7IttEw92GoRyKG2IDrUIpgpj6H6m81yfeMW0=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+basic.com/libgowrapper/sdkstruct.git v0.0.0-20191211011351-89daaec8738e h1:FIUozkg3tMk0K6cQMOt/DvlpK/A66AMDdCKpE4qlUzc=
+basic.com/libgowrapper/sdkstruct.git v0.0.0-20191211011351-89daaec8738e/go.mod h1:bNdkzVVGY+oQEcaYN9VlyIK/03WB3NQNQApjiPJjIag=
diff --git a/goyolo.go b/goyolo.go
index 7ed2d15..94145a7 100644
--- a/goyolo.go
+++ b/goyolo.go
@@ -11,51 +11,13 @@
*/
import "C"
import (
- "fmt"
"unsafe"
- "basic.com/pubsub/protomsg.git"
- "github.com/gogo/protobuf/proto"
+ "basic.com/libgowrapper/sdkstruct.git"
)
-// CPOINT pt
-type CPOINT struct {
- X int32
- Y int32
-}
-
-// CRECT rc
-type CRECT struct {
- Left int32
- Top int32
- Right int32
- Bottom int32
-}
-
-// CIMAGE img
-type CIMAGE struct {
- Data *uint8
- Width int32
- Height int32
- Channel int32
- Pad_cgo_0 [4]byte
-}
-
-// CObjInfo yolo
-type CObjInfo struct {
- RcObj CRECT
- Typ int32
- Prob float32
-}
-
-// CObjTrackInfo track yolo objs info
-type CObjTrackInfo struct {
- ObjInfo CObjInfo
- ID uint64
-}
-
type trackInfo struct {
- lastTrackObjs []CObjTrackInfo
+ lastTrackObjs []sdkstruct.CObjTrackInfo
lastTrackID uint64
}
@@ -98,11 +60,11 @@
}
// CYoloObjInfoArrayToGoArray convert cObjInfo array to go
-func CYoloObjInfoArrayToGoArray(cArray unsafe.Pointer, count int) (goArray []CObjInfo) {
+func CYoloObjInfoArrayToGoArray(cArray unsafe.Pointer, count int) (goArray []sdkstruct.CObjInfo) {
p := uintptr(cArray)
for i := 0; i < count; i++ {
- j := *(*CObjInfo)(unsafe.Pointer(p))
+ j := *(*sdkstruct.CObjInfo)(unsafe.Pointer(p))
goArray = append(goArray, j)
p += unsafe.Sizeof(j)
}
@@ -110,7 +72,7 @@
}
// YoloDetect yolo detect
-func YoloDetect(y *YoloHandle, data []byte, w, h, c int, thrsh float32, umns int) []CObjInfo {
+func YoloDetect(y *YoloHandle, data []byte, w, h, c int, thrsh float32, umns int) []sdkstruct.CObjInfo {
var count C.int
var cobjinfo unsafe.Pointer
@@ -148,7 +110,7 @@
return b
}
-func countInterAreaOfTwoRect(rect1 CRECT, rect2 CRECT) int32 {
+func countInterAreaOfTwoRect(rect1 sdkstruct.CRECT, rect2 sdkstruct.CRECT) int32 {
xMin := min(rect1.Left, rect2.Left)
yMin := min(rect1.Top, rect2.Top)
xMax := max(rect1.Right, rect2.Right)
@@ -176,9 +138,9 @@
}
// YoloDetectTrack2 yolo detect (鍙瘑鍒汉)
-func YoloDetectTrack2(y *YoloHandle, LastYoloObjs []CObjTrackInfo, LastTrackID *uint64, data []byte, w, h, c int, thrsh float32, umns int) (allObjs []CObjTrackInfo, newObjs []CObjTrackInfo) {
+func YoloDetectTrack2(y *YoloHandle, LastYoloObjs []sdkstruct.CObjTrackInfo, LastTrackID *uint64, data []byte, w, h, c int, thrsh float32, umns int) (allObjs []sdkstruct.CObjTrackInfo, newObjs []sdkstruct.CObjTrackInfo) {
- var tmp CObjTrackInfo
+ var tmp sdkstruct.CObjTrackInfo
//LastYoloObjs
detectObjs := YoloDetect(y, data, w, h, c, thrsh, umns)
@@ -218,77 +180,9 @@
}
// Run yolo detect (鍙瘑鍒汉)
-func Run(i interface{}, id string, data []byte, w, h, c int, thrsh float32, umns int) ([]byte, int) {
+func Run(i interface{}, id string, data []byte, w, h, c int, thrsh float32, umns int) ([]sdkstruct.CObjTrackInfo, []sdkstruct.CObjTrackInfo) {
if data == nil || w <= 0 || h <= 0 {
- return nil, 0
- }
- y := i.(*YoloHandle)
-
- channel := c
- if channel == 0 {
- channel = 3
- }
-
- v, ok := y.tracker[id]
- if !ok {
- i := &trackInfo{}
- y.tracker[id] = i
- v = i
- }
- whole, _ := YoloDetectTrack2(y, v.lastTrackObjs, &v.lastTrackID, data, w, h, channel, thrsh, umns)
- y.tracker[id].lastTrackObjs = whole
- y.tracker[id].lastTrackID = v.lastTrackID
-
- var dWhole []byte
- var err error
- if len(whole) > 0 {
-
- infos := convert2ProtoYoloTrack(whole, 1.0, 1.0)
- p := protomsg.ParamYoloObj{Infos: infos}
-
- dWhole, err = proto.Marshal(&p)
- if err != nil {
- fmt.Println("ydetect track marshal proto yolo obj error", err)
- dWhole = nil
- }
- }
-
- return dWhole, len(whole)
-}
-
-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
-}
-
-// Run2 yolo detect (鍙瘑鍒汉)
-func Run2(i interface{}, id string, data []byte, w, h, c int, thrsh float32, umns int) ([]byte, int, []byte, int) {
- if data == nil || w <= 0 || h <= 0 {
- return nil, 0, nil, 0
+ return nil, nil
}
y := i.(*YoloHandle)
@@ -307,21 +201,5 @@
y.tracker[id].lastTrackObjs = whole
y.tracker[id].lastTrackID = v.lastTrackID
- var dWhole, dRecent []byte
- var err error
- if len(whole) > 0 {
-
- infos := convert2ProtoYoloTrack(whole, 1.0, 1.0)
- p := protomsg.ParamYoloObj{Infos: infos}
-
- dWhole, err = proto.Marshal(&p)
- if err != nil {
- fmt.Println("ydetect track marshal proto yolo obj error", err)
- dWhole = nil
- }
- }
- if len(recent) > 0 {
- dRecent = nil
- }
- return dWhole, len(whole), dRecent, len(recent)
+ return whole, recent
}
--
Gitblit v1.8.0