From f26a0cab5bca17b7eab57f6330e576271e17a17f Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 13 十一月 2019 19:12:08 +0800
Subject: [PATCH] update ynSwagger,sync to master
---
service/FaceSdkService.go | 287 +++++---------------------------------------------------
1 files changed, 28 insertions(+), 259 deletions(-)
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index ca7f185..366ab3d 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -2,17 +2,11 @@
import (
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/deliver.git"
+ "basic.com/valib/logger.git"
"github.com/gogo/protobuf/proto"
- "github.com/pierrec/lz4"
"github.com/pkg/errors"
- "github.com/satori/go.uuid"
"gocv.io/x/gocv"
- "image"
- "sync"
"time"
- "webserver/extend/logger"
- "webserver/extend/util"
)
type FaceSdkService struct {
@@ -23,92 +17,62 @@
}
const (
- Ipc_Push_Ext = "_2.ipc"
- Ipc_Pull_Ext = "_1.ipc"
- Ipc_Url_Pre = "ipc:///tmp///"
faceExtractWebCID = "virtual-face-extract-web-camera-id"
- 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
)
func GetFaceFeaFromSdk(fileBytes []byte,deadTime time.Duration) ([]*protomsg.ResultFaceDetect,error,*protomsg.Image){
t1 := time.Now()
- s := NewFaceSdkService(fileBytes, deadTime)
- i, err := s.ReadFromUploadImg()
+ s := newFaceSdkService(fileBytes, deadTime)
+ i, err := s.readFromUploadImg()
logger.Debug("ReadFromUploadImg鐢ㄦ椂:", time.Since(t1))
- t1 = time.Now()
if err !=nil{
logger.Debug("readFromUploadImg err:",err)
return nil,err,i
}
- bc, err := ImgCompress(i)
- logger.Debug("ImgCompress鐢ㄦ椂:", time.Since(t1))
- t1 = time.Now()
+ imgBytes, err := proto.Marshal(i)
if err !=nil {
- logger.Debug("ImgCompress err:",err)
+ logger.Debug("i marshal err:",err)
return nil,err,i
}
- s.PushImgMsg(bc)
- logger.Debug("PushImgMsg鐢ㄦ椂:", time.Since(t1))
- t1 = time.Now()
- s.GetFaceFea()
- logger.Debug("GetFaceFea鐢ㄦ椂:", time.Since(t1))
- if s.Result == nil{
- return nil,errors.New("no fea"),i
+ detectResults, err := DoFDetectWithRpc(&protomsg.FaceDetectRequest{ReqParam: imgBytes}, deadTime)
+ logger.Debug("鎻愬彇face鍏辩敤鏃讹細", time.Since(t1))
+ if err !=nil {
+ logger.Debug("DoFDetectWithRpc err:",err)
+ return nil,err,i
} else {
- return s.Result,nil,i
+ return detectResults,nil,i
}
}
-func NewFaceSdkService(fileBytes []byte, deadTime time.Duration) FaceSdkService{
- return FaceSdkService{
+func newFaceSdkService(fileBytes []byte, deadTime time.Duration) *FaceSdkService{
+ return &FaceSdkService{
File:fileBytes,
Id:time.Now().UnixNano(),
DeadTime:deadTime,
}
}
-var imgPushChan chan []byte
-var client_push deliver.Deliver
-var client_pull deliver.Deliver
-
-func TestPushImgMsg() {
- InitService()
-
- i := readTestImgFile()
-
- logger.Debug("width:%d,height:%d,data.length:%d,timestamp:%s,id:%d\n",i.Width,i.Height,len(i.Data),i.Timestamp,i.Id)
-
- bc, err := ImgCompress(&i)
- if err !=nil {
- logger.Debug("image is not compressible")
- } else {
- var s FaceSdkService
- s.PushImgMsg(bc)
- }
-}
-
-func (s *FaceSdkService) ReadFromUploadImg() (*protomsg.Image,error){
+func (s *FaceSdkService) readFromUploadImg() (*protomsg.Image,error){
picMat, err := gocv.IMDecode(s.File, gocv.IMReadColor)
if err !=nil {
logger.Debug("gocv.IMDecode err:",err)
return nil,err
}
logger.Debug("picMat.Data.len:", len(picMat.ToBytes()))
- newMat := gocv.NewMat()
- size := 1024
- if picMat.Rows() > size || picMat.Cols() > size {
- fx := float64(size)/float64(picMat.Rows())
- fy := float64(size)/float64(picMat.Cols())
- ff := fx
- if fx > fy{
- ff = fy
- }
- gocv.Resize(picMat,&newMat, image.Pt(0,0), ff, ff, gocv.InterpolationDefault)
- picMat = newMat
- }
+
+ //鍥剧墖缂╁皬鍒嗚鲸鐜�
+ //newMat := gocv.NewMat()
+ //size := 1024
+ //if picMat.Rows() > size || picMat.Cols() > size {
+ // fx := float64(size)/float64(picMat.Rows())
+ // fy := float64(size)/float64(picMat.Cols())
+ // ff := fx
+ // if fx > fy{
+ // ff = fy
+ // }
+ // gocv.Resize(picMat,&newMat, image.Pt(0,0), ff, ff, gocv.InterpolationDefault)
+ // picMat = newMat
+ //}
defer picMat.Close()
@@ -130,199 +94,4 @@
Id: s.Id,
Cid: faceExtractWebCID,
},nil
-}
-
-func ImgCompress(i *protomsg.Image) ([]byte,error){
- if b, err := proto.Marshal(i); err != nil {
- logger.Debug("protoImage marshal err")
- return nil,err
- } else {
- bc := make([]byte, len(b))
- ht := make([]int, 64<<10)
- n, err := lz4.CompressBlock(b, bc, ht)
- if err != nil {
- logger.Debug(err)
- return nil,err
- }
- if n >= len(b) {
- logger.Debug("image is not compressible")
- return nil,errors.New("compressed len is 0")
- }
- bc = bc[:n]
- return bc,nil
- }
-}
-
-func (s *FaceSdkService) GetFaceFea(){
- var wg sync.WaitGroup
- wg.Add(1)
- ticker := time.NewTicker(s.DeadTime)
- go func(ticker *time.Ticker, s *FaceSdkService) {
- defer ticker.Stop()
- defer wg.Done()
-
- for {
- select {
- case <-ticker.C:
- return
- default:
- if faces,ok := resultMap.Get(s.Id);ok {
- s.Result = faces
- return
- }
- }
- }
- }(ticker, s)
- wg.Wait()
-}
-
-func readTestImgFile() 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"
-
- picMat := gocv.IMRead(filePath, gocv.IMReadColor)
-
- defer picMat.Close()
-
- if picMat.Empty() {
- logger.Debug("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
- logger.Debug("gocv read img completed")
- return i
-}
-
-func (s *FaceSdkService) PushImgMsg(is []byte){
- imgPushChan <- is
-}
-
-type FeaResult struct {
- FaceM map[int64][]*protomsg.ResultFaceDetect
- Lock sync.Mutex
-}
-
-func (f *FeaResult) Write(id int64,faceDetectResult []*protomsg.ResultFaceDetect){
- f.Lock.Lock()
- defer f.Lock.Unlock()
- f.FaceM[id] = faceDetectResult
-}
-
-func (f *FeaResult) Get(id int64) ([]*protomsg.ResultFaceDetect,bool){
- f.Lock.Lock()
- defer f.Lock.Unlock()
- coms,ok := f.FaceM[id]
- return coms,ok
-}
-
-func (f *FeaResult) Delete(id int64){
- f.Lock.Lock()
- defer f.Lock.Unlock()
- delete(f.FaceM,id)
-}
-
-var resultMap = FeaResult{}
-
-func InitService() {
- logger.Debug("service init!")
- imgPushChan = make(chan []byte)
- resultMap.FaceM = make(map[int64][]*protomsg.ResultFaceDetect,0)
- client_push = deliver.NewClient(deliver.PushPull, Url_Service_PUSH)
- client_pull = deliver.NewClient(deliver.PushPull, Url_Service_PULL)
- defer func() {
- client_push.Close()
- client_pull.Close()
- }()
- go thSend()
-
- go thRecv()
-}
-
-func thSend() {
- for {
- select {
- case d := <-imgPushChan:
- logger.Debug("imgPushChan in")
- err := client_push.Send(d)
- if err != nil {
- logger.Debug("img Send err:", err)
- }
- default:
- //logger.Debug("no img in")
- }
- }
-}
-
-func thRecv() {
- for {
- resultBytes, err := client_pull.Recv()
- if err != nil {
- //logger.Debug("pull err:", err)
- continue
- }
- rMsg := protomsg.SdkMessage{}
- if err := proto.Unmarshal(resultBytes, &rMsg); err == nil {
- i := protomsg.Image{}
- bdata, err := util.UnCompress(rMsg.Data)
- if err !=nil {
- logger.Debug("uncompress err:",err)
- continue
- }
- err = proto.Unmarshal(bdata, &i)
- if err !=nil {
- continue
- }
- perId := i.Id //鏁版嵁id
- if rMsg.Tasklab != nil && rMsg.Tasklab.Taskid == Virtual_FaceTaskId {
- sdkInfos := rMsg.Tasklab.Sdkinfos
-
- logger.Debug("Len(sdkInfos)=",len(sdkInfos))
- for _,swt :=range sdkInfos{
- //浜鸿劯妫�娴嬬殑缁撴灉
- if swt.Sdktype =="FaceDetect"{
- logger.Debug("浜鸿劯妫�娴嬬粨鏋滈暱搴︼細",len(swt.Sdkdata))
- if len(swt.Sdkdata)>1{
- var pfp protomsg.ParamFacePos
- err := proto.Unmarshal(swt.Sdkdata, &pfp)
- if err !=nil {
- logger.Debug("faceDetect result unmarshal err:",err)
- } else {
- logger.Debug("妫�娴嬩汉鑴告暟:",len(pfp.Faces))
- if len(pfp.Faces)>0{
- resultMap.Write(perId,pfp.Faces)
- }
- //for _,face :=range pfp.Faces{
- //logger.Debug("FacePos:",face.Pos)
- //logger.Debug("ThftResult:",face.Result)
- // base64Fea := base64.StdEncoding.EncodeToString(face.Feats)
- // logger.Debug("perId:",perId)
- // logger.Debug("faceFeature:",base64Fea)
- //}
- }
- }
- break
- }
- }
- }
- } else {
- logger.Debug("recv msg Err:", err)
- }
-
- }
}
--
Gitblit v1.8.0