From 1b388e4b0207003630c326ba1e71af8c8746070f Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 22 十月 2019 15:14:23 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/valib/gosdk
---
gosdk.go | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/gosdk.go b/gosdk.go
index 42b4dcd..5d9858c 100644
--- a/gosdk.go
+++ b/gosdk.go
@@ -90,6 +90,7 @@
var count C.int
cfpos := C.c_api_face_detect(&count, (*C.uchar)(unsafe.Pointer(&data[0])), C.int(w), C.int(h), C.int(ch))
if cfpos != nil {
+ defer C.free(unsafe.Pointer(cfpos))
return CFacePosArrayToGoArray(unsafe.Pointer(cfpos), int(count))
}
return nil
@@ -118,6 +119,7 @@
pos := (*C.cFacePos)(unsafe.Pointer(&fpos))
p := C.c_api_face_extract(&featLen, pos, (*C.uchar)(unsafe.Pointer(&data[0])), C.int(w), C.int(h), C.int(ch))
+ defer C.free(unsafe.Pointer(p))
b := C.GoBytes(unsafe.Pointer(p), featLen)
return b
}
@@ -126,6 +128,36 @@
func FaceCompare(feat1 []byte, feat2 []byte) float32 {
res := C.c_api_face_compare((*C.uchar)(unsafe.Pointer(&feat1[0])), (*C.uchar)(unsafe.Pointer(&feat2[0])))
return float32(res)
+}
+
+// FaceTrackOnly face tracker face only
+func FaceTrackOnly(img SDKImage, ch int) []CRECT {
+ data := img.Data
+ w := img.Width
+ h := img.Height
+
+ var fCount C.int
+ rect := C.c_api_face_track_only(&fCount, (*C.uchar)(unsafe.Pointer(&data[0])), C.int(w), C.int(h), C.int(ch))
+ if rect != nil {
+ defer C.free(unsafe.Pointer(rect))
+ return CRECTArrayToGoArray(unsafe.Pointer(rect), int(fCount))
+ }
+ return nil
+}
+
+// FaceTrackDetect face tracker face detect
+func FaceTrackDetect(img SDKImage, ch int) []CFaceInfo {
+ data := img.Data
+ w := img.Width
+ h := img.Height
+
+ var fCount C.int
+ finfo := C.c_api_face_track_only(&fCount, (*C.uchar)(unsafe.Pointer(&data[0])), C.int(w), C.int(h), C.int(ch))
+ if finfo != nil {
+ defer C.free(unsafe.Pointer(finfo))
+ return CFaceInfoArrayToGoArray(unsafe.Pointer(finfo), int(fCount))
+ }
+ return nil
}
// FaceTrackingInfo face track info
@@ -145,6 +177,7 @@
if cFinfo == nil {
return
}
+ defer C.free(unsafe.Pointer(cFinfo))
goFinfo := CFaceInfoArrayToGoArray(unsafe.Pointer(cFinfo), int(fCount))
// 绌猴紝娣诲姞
@@ -217,6 +250,7 @@
if cFinfo == nil {
return faces
}
+ defer C.free(unsafe.Pointer(cFinfo))
faces = CFaceInfoArrayToGoArray(unsafe.Pointer(cFinfo), int(fCount))
//if len(faces) > 0{
// fmt.Println("faces detected:", len(faces))
@@ -237,6 +271,7 @@
cobjinfo := C.c_api_yolo_detect(handle.handle, &count, (*C.uchar)(unsafe.Pointer(&data[0])), C.int(w), C.int(h), C.float(thrsh), C.int(umns))
if cobjinfo != nil {
+ defer C.free(unsafe.Pointer(cobjinfo))
return CYoloObjInfoArrayToGoArray(unsafe.Pointer(cobjinfo), int(count))
}
return nil
--
Gitblit v1.8.0