From f0a55fbe2c2757bc64883ae65a717ad1a1ae9072 Mon Sep 17 00:00:00 2001
From: zhangmeng <zhangmeng@aiotlink.com>
Date: 星期一, 16 十二月 2019 10:41:00 +0800
Subject: [PATCH] update cuda10.0/cuda10.2(face)
---
work/sdk/yolotrack.go | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/work/sdk/yolotrack.go b/work/sdk/yolotrack.go
index a4d309f..29058d2 100644
--- a/work/sdk/yolotrack.go
+++ b/work/sdk/yolotrack.go
@@ -1,14 +1,14 @@
package sdk
import (
- "analysis/goconv"
"analysis/logo"
"analysis/work"
"context"
"time"
+ "analysis/gosdk"
+
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/gosdk.git"
"github.com/gogo/protobuf/proto"
)
@@ -54,7 +54,6 @@
for {
select {
case <-ctx.Done():
- goconv.Free()
return
default:
@@ -100,12 +99,8 @@
// conv to bgr24 and resize
imgW, imgH := int(i.Width), int(i.Height)
- bgrData := goconv.YUV2BGR(i.Data, imgW, imgH)
- if bgrData == nil {
- ejectResult(nil, rMsg, out)
- return
- }
- img := gosdk.SDKImage{Data: bgrData, Width: imgW, Height: imgH}
+
+ img := gosdk.SDKImage{Data: i.Data, Width: imgW, Height: imgH}
v, ok := y.tracker[rMsg.Msg.Cid]
if !ok {
@@ -152,7 +147,6 @@
id, name = rMsg.Msg.Tasklab.Taskid, rMsg.Msg.Tasklab.Taskname
}
logo.Infoln("CAMERAID: ", rMsg.Msg.Cid, " TASKID: ", id, " TASKNAME: ", name, " DETECT YOLO COUNT: ", len(allO))
-
}
func convert2ProtoYoloTrack(obj []gosdk.CObjTrackInfo, fx, fy float64) []*protomsg.ObjInfo {
--
Gitblit v1.8.0