fix bug

liuxiaolong

2019-07-05 dea5314d2564b6b0693c5ca360af8fe8cf72e66c

 service/FaceSdkService.go

@@ -3,22 +3,20 @@
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/pkg/errors"
   "github.com/satori/go.uuid"
   "gocv.io/x/gocv"
   "io/ioutil"
   "mime/multipart"
   "sync"
   "time"
)

type FaceSdkService struct {
   File *multipart.File
   File []byte
   Id string
   Result []*protomsg.ResultFaceExtCom
}

const (
@@ -31,9 +29,9 @@
   Url_Service_PULL   = Ipc_Url_Pre + Virtual_FaceSdkId + Ipc_Pull_Ext
)

func NewFaceSdkService(file multipart.File) FaceSdkService{
func NewFaceSdkService(fileBytes []byte) FaceSdkService{
   return FaceSdkService{
      File:&file,
      File:fileBytes,
      Id:uuid.NewV4().String(),
   }
}
@@ -59,16 +57,14 @@
}

func (s *FaceSdkService) ReadFromUploadImg() (*protomsg.Image,error){
   defer (*(s.File)).Close()
   imgB, err := ioutil.ReadAll(*(s.File))
   if err !=nil{
      fmt.Println("File.Read err:",err)
      return nil,err
   }
   //defer (*(s.File)).Close()
   //imgB, err := ioutil.ReadAll(*(s.File))
   //if err !=nil{
   //   fmt.Println("File.Read err:",err)
   //   return nil,err
   //}

   fmt.Println("imgB.len:",len(imgB))

   picMat, err := gocv.IMDecode(imgB, gocv.IMReadColor)
   picMat, err := gocv.IMDecode(s.File, gocv.IMReadColor)
   if err !=nil {
      fmt.Println("gocv.IMDecode err:",err)
      return nil,err
@@ -115,33 +111,27 @@
   }
}

func (s *FaceSdkService) GetFaceFea() (feas []*protomsg.ResultFaceExtCom,err error){
func (s *FaceSdkService) GetFaceFea(){
   var wg sync.WaitGroup
   wg.Add(1)
   ch := make(chan []*protomsg.ResultFaceExtCom,0)
   go func() {
   ticker := time.NewTicker(time.Second * 3)
   go func(ticker *time.Ticker, s *FaceSdkService) {
      defer ticker.Stop()
      defer wg.Done()

      for {
         select {
         case <-time.Tick(time.Second*10):
            ch <- nil
            wg.Done()
         case <-ticker.C:
            return
         default:
            if feas,ok := resultMap[s.Id];ok {
               fmt.Println("faceFea got!!!")
               ch <- feas
            if feas,ok := resultMap.Get(s.Id);ok {
               s.Result = feas
               return
            }
         }
      }
   }()
   }(ticker, s)
   wg.Wait()
   msg := <- ch
   if msg != nil {
      return msg,nil
   } else {
      return msg,errors.New("no fea")
   }
}

func readTestImgFile() protomsg.Image{
@@ -181,14 +171,36 @@
   imgPushChan <- is
}

var resultMap map[string][]*protomsg.ResultFaceExtCom
type FeaResult struct {
   FeaM map[string][]*protomsg.ResultFaceExtCom
   Lock sync.Mutex
}

func (f *FeaResult) Write(id string,faceResult []*protomsg.ResultFaceExtCom){
   f.Lock.Lock()
   defer f.Lock.Unlock()
   f.FeaM[id] = faceResult
}

func (f *FeaResult) Get(id string) ([]*protomsg.ResultFaceExtCom,bool){
   f.Lock.Lock()
   defer f.Lock.Unlock()
   coms,ok := f.FeaM[id]
   return coms,ok
}

func (f *FeaResult) Delete(id string){
   f.Lock.Lock()
   defer f.Lock.Unlock()
   delete(f.FeaM,id)
}

var resultMap =  FeaResult{}

func InitService() {
   fmt.Println("service init!")
   imgPushChan = make(chan []byte)

   resultMap = make(map[string][]*protomsg.ResultFaceExtCom,0)

   resultMap.FeaM = 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() {
@@ -231,36 +243,43 @@

            fmt.Println("Len(sdkInfos)=",len(sdkInfos))
            for _,swt :=range sdkInfos{
               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 =="FaceDetect"{
               //   fmt.Println("人脸检测结果长度：",len(swt.Sdkdata))
               //   if len(swt.Sdkdata)>1{
               //      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"{
                  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))
                     if len(pff.ExtComp) >0 {
                        resultMap[rMsg.Cid] = pff.ExtComp
                  fmt.Println("人脸提取结果长度:",len(swt.Sdkdata))
                  if len(swt.Sdkdata) > 1{
                     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))
                        if len(pff.ExtComp) >0 {
                           resultMap.Write(perId,pff.ExtComp)

                        for _,fea :=range pff.ExtComp{
                           base64Fea := base64.StdEncoding.EncodeToString(fea.Feats)
                           fmt.Println("perId:",perId)
                           fmt.Println("faceFeature:",base64Fea)
                           //for _,fea :=range pff.ExtComp{
                           //   base64Fea := base64.StdEncoding.EncodeToString(fea.Feats)
                           //   fmt.Println("perId:",perId)
                           //   fmt.Println("faceFeature:",base64Fea)
                           //}
                        }
                     }
                     break
                  }
                  break
               }
            }
         }