From d78b0016f7b96f486fd4af84e889d541c3dba0eb Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 17 十二月 2019 10:33:20 +0800
Subject: [PATCH] udpate
---
work/sdk/facetrack.go | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/work/sdk/facetrack.go b/work/sdk/facetrack.go
index dc45d2c..891df72 100644
--- a/work/sdk/facetrack.go
+++ b/work/sdk/facetrack.go
@@ -30,15 +30,14 @@
*/
import "C"
import (
- "analysis/goconv"
"analysis/logo"
"analysis/work"
"context"
"time"
"unsafe"
+ "analysis/gosdk"
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/gosdk.git"
"github.com/gogo/protobuf/proto"
)
@@ -156,8 +155,8 @@
for {
select {
case <-ctx.Done():
- goconv.Free()
return
+
case rMsg := <-in:
if !validRemoteMessage(rMsg, typ) {
@@ -175,12 +174,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)
- continue
- }
- img := gosdk.SDKImage{Data: bgrData, Width: imgW, Height: imgH}
+
+ img := gosdk.SDKImage{Data: i.Data, Width: imgW, Height: imgH}
detect := gosdk.FaceTrackSimple(img, dtchn)
--
Gitblit v1.8.0