From 88d229d880079db1d31af1d4cbed3b8eb12fd47d Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期五, 28 六月 2019 14:31:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver
---
service/FaceSdkService.go | 160 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 102 insertions(+), 58 deletions(-)
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index a15485d..6609997 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -3,95 +3,101 @@
import (
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
+ "encoding/base64"
"fmt"
"github.com/gogo/protobuf/proto"
"github.com/pierrec/lz4"
"github.com/satori/go.uuid"
- "image"
- "io/ioutil"
- "os"
+ "gocv.io/x/gocv"
"time"
)
const (
- Url_Service_PUSH = "ipc:///tmp///virtual-faceextract-sdk-pull_2.ipc"
- Url_Service_PULL = "ipc:///tmp///virtual-faceextract-sdk-pull_1.ipc"
+ 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
)
-var imgPushChan chan protomsg.Recvmsg
+
+var imgPushChan chan []byte
var client_push deliver.Deliver
var client_pull deliver.Deliver
func TestPushImgMsg() {
InitService()
- proImg := readImgFile()
- if b, err := proto.Marshal(&proImg);err !=nil{
+ i := readImgFile()
+
+ fmt.Printf("width:%d,height:%d,data.length:%d,timestamp:%s,id:%d\n", i.Width, i.Height, len(i.Data), i.Timestamp, i.Id)
+ if b, err := proto.Marshal(&i); err != nil {
fmt.Println("protoImage marshal err")
return
} 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)
}
- if n >= len(b){
+ if n >= len(b) {
fmt.Println("image is not compressible")
}
bc = bc[:n]
- //for {
- PushImgMsg(protomsg.Recvmsg{
- Id:uuid.NewV4().String(),
- Addr:"",
- Picdata:bc,
- })
+ for {
+ PushImgMsg(bc)
fmt.Println("pushed img")
- //time.Sleep(10*time.Second)
- //}
+ time.Sleep(5 * time.Second)
+ }
}
}
-func readImgFile() protomsg.Image{
+func readImgFile() protomsg.Image {
var i protomsg.Image
timeUnix := time.Now().Unix()
formatTimeStr := time.Unix(timeUnix, 0).Format("2006-01-02 15:04:05")
filePath := "/home/user/workspace/timg.jpg"
- file, err := os.Open(filePath)
- defer file.Close()
- if err !=nil{
- fmt.Println("image not exist")
- return i
- } else {
- img, _, err := image.Decode(file)
- bytes, err := ioutil.ReadFile(filePath)
- if err !=nil {
- return i
- }
- b := img.Bounds()
- width := b.Max.X
- height := b.Max.Y
- i = protomsg.Image{
- Width:int32(width),
- Height:int32(height),
- Timestamp:formatTimeStr,
- Data:bytes,
- }
+ picMat := gocv.IMRead(filePath, gocv.IMReadColor)
+
+ defer picMat.Close()
+
+ if picMat.Empty() {
+ fmt.Println("file not exist")
return i
}
+ height := int32(picMat.Rows())
+ width := int32(picMat.Cols())
+ data := picMat.ToBytes()
+ //wrMat,_ := gocv.NewMatFromBytes(picMat.Rows(),picMat.Cols(),gocv.MatTypeCV8UC3,data)
+ //
+ //gocv.IMWrite("xxx.jpg", wrMat)
+
+ i = protomsg.Image{
+ Width: width,
+ Height: height,
+ Timestamp: formatTimeStr,
+ Data: data,
+ Id: timeUnix,
+ }
+ i.Cid = uuid.NewV4().String() //鏁版嵁鍞竴id
+ fmt.Println("gocv read img completed")
+ return i
}
-func PushImgMsg(is protomsg.Recvmsg){
+func PushImgMsg(is []byte) {
imgPushChan <- is
}
var resultMap map[string]protomsg.SdkMessage
-
-func InitService(){
+func InitService() {
fmt.Println("service init!")
- imgPushChan = make(chan protomsg.Recvmsg)
+ imgPushChan = make(chan []byte)
+ resultMap = make(map[string]protomsg.SdkMessage, 0)
client_push = deliver.NewClient(deliver.PushPull, Url_Service_PUSH)
client_pull = deliver.NewClient(deliver.PushPull, Url_Service_PULL)
defer func() {
@@ -103,15 +109,14 @@
go thRecv()
}
-func thSend(){
+func thSend() {
for {
select {
- case is := <- imgPushChan:
+ case d := <-imgPushChan:
fmt.Println("imgPushChan in")
- b, _ := proto.Marshal(&is)
- err := client_push.Send(b)
- if err !=nil {
- fmt.Println("img Send err:",err)
+ err := client_push.Send(d)
+ if err != nil {
+ fmt.Println("img Send err:", err)
}
default:
//fmt.Println("no img in")
@@ -119,18 +124,57 @@
}
}
-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("recv MSG:",rMsg)
- resultMap[rMsg.Cid] = rMsg
+ 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 {
+ sdkInfos := rMsg.Tasklab.Sdkinfos
+ fmt.Println("Len(sdkInfos)=", len(sdkInfos))
+ for _, swt := range sdkInfos {
+ fmt.Println("sdkName:", swt.SdkName)
+ if swt.Sdktype == "FaceDetect" {
+ fmt.Println("浜鸿劯妫�娴嬬粨鏋�")
+ var pfp protomsg.ParamFacePos
+ err := proto.Unmarshal(swt.Sdkdata, &pfp)
+ if err != nil {
+ fmt.Println("faceDetect result unmarshal err:", err)
+ } else {
+ for _, face := range pfp.Faces {
+ fmt.Println("FacePos:", face.Pos)
+ fmt.Println("ThftResult:", face.Result)
+ }
+ }
+ }
+ if swt.Sdktype == "FaceExtract" {
+ fmt.Println("sdkData.len:", len(swt.Sdkdata))
+ var pff protomsg.ParamFaceFeature
+ if err := proto.Unmarshal(swt.Sdkdata, &pff); err != nil {
+ //fmt.Println("ParamFaceFeature unmarshal err:",err)
+ } else {
+ fmt.Println("鐩爣鏁帮細", len(pff.ExtComp))
+ for _, fea := range pff.ExtComp {
+ base64Fea := base64.StdEncoding.EncodeToString(fea.Feats)
+ fmt.Println("perId:", perId)
+ fmt.Println("faceFeature:", base64Fea)
+ }
+ }
+ break
+ }
+ }
+
+ }
+ //resultMap[rMsg.Cid] = rMsg
+ } else {
+ fmt.Println("recv msg Err:", err)
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0