加上人脸，过完规则的标签区分人脸和yolo

panlei

2019-06-26 a3a788801fcd2efb16d58e91f393bad8d7730b96

 main.go

@@ -82,45 +82,44 @@
   arg.KeepRight = false
   arg.IsStatic = false
   for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo算法
      if sdkinfo.Sdktype == "Yolo" {
         if len(sdkinfo.Sdkdata) > 1 {
            // 大于1才有数据
            fmt.Println("----------------------------------------------------",m.Caddr)
            yoloParam := protomsg.ParamYoloObj{}
            err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
            if err != nil {
               fmt.Println("解析YOLO sdk数据时出现错误", err)
               //continue
            }
            for _, info := range yoloParam.Infos {
               if info.Typ == 0 {
                  photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100}
                  arg.Photo = append(arg.Photo, photoMap)
               }
            }
         } else {
            continue
         }

      }
      //if sdkinfo.Sdktype == "FaceDetect" { // 人脸检测
      //   fmt.Println("数据长度为：", len(sdkinfo.Sdkdata))
      //if sdkinfo.Sdktype == "Yolo" {
      //   if len(sdkinfo.Sdkdata) > 1 {
      //      // 大于1才有数据
      //      fmt.Println("----------------------------------------------------",m.Caddr)
      //      faceParam := protomsg.ParamFacePos{}
      //      err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
      //      yoloParam := protomsg.ParamYoloObj{}
      //      err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
      //      if err != nil {
      //         fmt.Println("解析FACE sdk数据时出现错误", err)
      //         fmt.Println("解析YOLO sdk数据时出现错误", err)
      //         continue
      //      }
      //      for _, info := range faceParam.Faces {
      //         photoMap := ruleserver.PhotoMap{Rects: ruleserver.Rect{-1, -1, -1, -1}, Score: float64(info.Pos.Quality)}
      //      for _, info := range yoloParam.Infos {
      //         if info.Typ == 0 {
      //            photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100,IsYolo:true}
      //         arg.Photo = append(arg.Photo, photoMap)
      //         }
      //      }
      //   } else {
      //      continue
      //   }
      //
      //}
      if sdkinfo.Sdktype == "FaceDetect" { // 人脸检测
         if len(sdkinfo.Sdkdata) > 1 {
            fmt.Println("----------------------------------------------------",m.Caddr)
            faceParam := protomsg.ParamFacePos{}
            err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
            if err != nil {
               fmt.Println("解析FACE sdk数据时出现错误", err)
               continue
            }
            for _, info := range faceParam.Faces {
               photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.Quality)*100, IsYolo:false}
               arg.Photo = append(arg.Photo, photoMap)
            }
         } else {
            continue
         }
      }
      //if sdkinfo.Sdktype == "FaceExtract" { // 人脸提取

      //}
@@ -132,7 +131,6 @@
// 将外部传进来的rect（top,bottom,left,right）转化为自己内部的rect(left top width height)
func rectFormat(rcobj *protomsg.Rect) ruleserver.Rect {
   rect := ruleserver.Rect{}
   fmt.Println("看一下传入的矩形数据：", rcobj.Left, rcobj.Top, rcobj.Right, rcobj.Bottom)
   rect.X = float64(rcobj.Left)
   rect.Y = float64(rcobj.Top)
   rect.Width = float64(rcobj.Right - rcobj.Left)