From b7340a34ff68f018a4aa0e7aada3b7feaabd2fe1 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 22 十月 2019 14:52:49 +0800
Subject: [PATCH] 增加人脸跟踪检测的通道分辨率调整接口face_track_resize
---
gosdk.go | 48 +++++++++---------------------------------------
1 files changed, 9 insertions(+), 39 deletions(-)
diff --git a/gosdk.go b/gosdk.go
index b7e3222..42b4dcd 100644
--- a/gosdk.go
+++ b/gosdk.go
@@ -11,7 +11,6 @@
*/
import "C"
import (
- "fmt"
"unsafe"
)
@@ -70,6 +69,12 @@
C.c_api_face_tracker_init(C.int(tm), C.int(gi), C.int(w), C.int(h), C.int(maxFaces), C.int(interval), C.int(sample))
}
+// ResizeFaceTracker init face tracker
+func ResizeFaceTracker(ch, w, h int) int {
+
+ return int(C.c_api_face_track_resize(C.int(ch), C.int(w), C.int(h)))
+}
+
// Free free sdk
func Free() {
C.c_api_release()
@@ -85,7 +90,6 @@
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
@@ -114,7 +118,6 @@
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
}
@@ -123,36 +126,6 @@
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
@@ -172,7 +145,6 @@
if cFinfo == nil {
return
}
- defer C.free(unsafe.Pointer(cFinfo))
goFinfo := CFaceInfoArrayToGoArray(unsafe.Pointer(cFinfo), int(fCount))
// 绌猴紝娣诲姞
@@ -233,7 +205,7 @@
return fPos
}
-// FaceTrack face tracking info
+// FaceTrackSimple face tracking info
func FaceTrackSimple(img SDKImage, ch int) (faces []CFaceInfo) {
data := img.Data
w := img.Width
@@ -241,14 +213,13 @@
var fCount C.int
cFinfo := C.c_api_face_track(&fCount, (*C.uchar)(unsafe.Pointer(&data[0])), C.int(w), C.int(h), C.int(ch))
- fmt.Println("cFinfo detected:", cFinfo)
+ // fmt.Println("cFinfo detected:", cFinfo)
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))
+ // fmt.Println("faces detected:", len(faces))
//}
return faces
@@ -266,7 +237,6 @@
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