From 5e31a32f6ce2572cb01388150ddb325724ff15b8 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 28 六月 2019 19:29:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver
---
service/FaceSdkService.go | 62 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index 5f2888f..dcf7455 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -21,13 +21,13 @@
}
const (
- Ipc_Push_Ext = "_2.ipc"
- Ipc_Pull_Ext = "_1.ipc"
- Ipc_Url_Pre = "ipc:///tmp///"
+ Ipc_Push_Ext = "_2.ipc"
+ Ipc_Pull_Ext = "_1.ipc"
+ Ipc_Url_Pre = "ipc:///tmp///"
Virtual_FaceTaskId = "92496BDF-2BFA-98F2-62E8-96DD9866ABD2"
- Virtual_FaceSdkId = "virtual-faceextract-sdk-pull"
- Url_Service_PUSH = Ipc_Url_Pre + Virtual_FaceSdkId + Ipc_Push_Ext
- Url_Service_PULL = Ipc_Url_Pre + Virtual_FaceSdkId + Ipc_Pull_Ext
+ Virtual_FaceSdkId = "virtual-faceextract-sdk-pull"
+ Url_Service_PUSH = Ipc_Url_Pre + Virtual_FaceSdkId + Ipc_Push_Ext
+ Url_Service_PULL = Ipc_Url_Pre + Virtual_FaceSdkId + Ipc_Pull_Ext
)
func NewFaceSdkService(file multipart.File) FaceSdkService{
@@ -89,18 +89,18 @@
}
func ImgCompress(i *protomsg.Image) ([]byte,error){
- if b, err := proto.Marshal(i);err !=nil{
+ if b, err := proto.Marshal(i); err != nil {
fmt.Println("protoImage marshal err")
return nil,err
} else {
- bc := make([]byte,len(b))
+ bc := make([]byte, len(b))
ht := make([]int, 64<<10)
- n,err := lz4.CompressBlock(b, bc, ht)
- if err !=nil {
+ n, err := lz4.CompressBlock(b, bc, ht)
+ if err != nil {
fmt.Println(err)
return nil,err
}
- if n >= len(b){
+ if n >= len(b) {
fmt.Println("image is not compressible")
return nil,errors.New("compressed len is 0")
}
@@ -160,13 +160,13 @@
//gocv.IMWrite("xxx.jpg", wrMat)
i = protomsg.Image{
- Width: width,
- Height: height,
+ Width: width,
+ Height: height,
Timestamp: formatTimeStr,
- Data: data,
- Id: timeUnix,
+ Data: data,
+ Id: timeUnix,
}
- i.Cid = uuid.NewV4().String()//鏁版嵁鍞竴id
+ i.Cid = uuid.NewV4().String() //鏁版嵁鍞竴id
fmt.Println("gocv read img completed")
return i
}
@@ -177,11 +177,12 @@
var resultMap map[string][]*protomsg.ResultFaceExtCom
-
-func InitService(){
+func InitService() {
fmt.Println("service init!")
imgPushChan = make(chan []byte)
+
resultMap = make(map[string][]*protomsg.ResultFaceExtCom,0)
+
client_push = deliver.NewClient(deliver.PushPull, Url_Service_PUSH)
client_pull = deliver.NewClient(deliver.PushPull, Url_Service_PULL)
defer func() {
@@ -193,14 +194,14 @@
go thRecv()
}
-func thSend(){
+func thSend() {
for {
select {
- case d := <- imgPushChan:
+ case d := <-imgPushChan:
fmt.Println("imgPushChan in")
err := client_push.Send(d)
- if err !=nil {
- fmt.Println("img Send err:",err)
+ if err != nil {
+ fmt.Println("img Send err:", err)
}
default:
//fmt.Println("no img in")
@@ -208,19 +209,20 @@
}
}
-func thRecv(){
+func thRecv() {
for {
resultBytes, err := client_pull.Recv()
- if err !=nil{
- fmt.Println("pull err:",err)
+ if err != nil {
+ fmt.Println("pull err:", err)
continue
}
rMsg := protomsg.SdkMessage{}
- if err := proto.Unmarshal(resultBytes, &rMsg);err ==nil{
- fmt.Println("received MSG:",rMsg.Cid)
+ if err := proto.Unmarshal(resultBytes, &rMsg); err == nil {
+ fmt.Println("received MSG:", rMsg.Cid)
perId := rMsg.Cid //鏁版嵁id
- if rMsg.Tasklab !=nil && rMsg.Tasklab.Taskid == Virtual_FaceTaskId {
+ if rMsg.Tasklab != nil && rMsg.Tasklab.Taskid == Virtual_FaceTaskId {
sdkInfos := rMsg.Tasklab.Sdkinfos
+
fmt.Println("Len(sdkInfos)=",len(sdkInfos))
for _,swt :=range sdkInfos{
if swt.Sdktype =="FaceDetect"{
@@ -257,8 +259,8 @@
}
}
} else {
- fmt.Println("recv msg Err:",err)
+ fmt.Println("recv msg Err:", err)
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0