From 88e467b44140cfd4cac253b0672cda954f7ac922 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 01 七月 2019 17:03:51 +0800
Subject: [PATCH] 改方法名
---
main.go | 231 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 158 insertions(+), 73 deletions(-)
diff --git a/main.go b/main.go
index 2e237a1..2518815 100644
--- a/main.go
+++ b/main.go
@@ -2,21 +2,27 @@
import (
"fmt"
- "ruleprocess/ruleserver"
+ "log"
"ruleprocess/insertdata"
+ "ruleprocess/ruleserver"
+ "ruleprocess/util"
- "sync"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
"github.com/golang/protobuf/proto"
)
func main() {
- wg := sync.WaitGroup{}
- wg.Add(1)
- go ruleserver.TimeTicker()
- nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
- wg.Wait()
+ //wg := sync.WaitGroup{}
+ //wg.Add(1)
+ //go ruleserver.TimeTicker()
+ //nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
+ //wg.Wait()
+ resp,err := util.DrawPolygonOnImage()
+ if err != nil {
+ log.Println("鐢绘鎴栬�呬笂浼犳湁闂")
+ }
+ log.Println(resp["fileUrl"].(string))
}
func nReciever(url string, m deliver.Mode, count int) {
c := deliver.NewServer(m, url)
@@ -38,10 +44,10 @@
fmt.Println("recv error : ", err)
continue
} else {
- arg := ruleserver.ArgsFromSdk{}
- m := paramFormat(msg,&arg)
- fmt.Println("瑙ｆ瀽鍑烘潵鐨勬暟鎹細",arg)
- ruleserver.MainJudge(&arg)
+ arg := ruleserver.SdkDatas{}
+ m := paramFormat(msg, &arg)
+ fmt.Println("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
+ ruleserver.Judge(&arg)
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
resultMag := ruleserver.ResultMsg{SdkMessage: m, RuleResult: arg.RuleResult}
//fmt.Println("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
@@ -53,68 +59,6 @@
}
}
-// 灏嗗閮ㄤ紶杩涙潵鐨剆dk鏁版嵁鍖呰В鎴� ArgsFromSdk
-func paramFormat(msg []byte,arg *ruleserver.ArgsFromSdk) protomsg.SdkMessage {
- defer func() {
- if err := recover();err != nil{
- fmt.Println("瑙ｅ寘杩囩▼鐨勯敊璇�",err.(string))
- }
-
- }()
- // 鍙嶅簭鍒楀寲鏁版嵁寰楀埌sdk鍏ュ弬
- m := protomsg.SdkMessage{}
- err := proto.Unmarshal(msg, &m)
- if err != nil {
- panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
- }
- arg.CameraId = m.Cid
- arg.TaskId = m.Tasklab.Taskid
- bdata,err := UnCompress(m.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
- arg.ImageWidth = int(i.Width)
- arg.ImageHeight = int(i.Height)
- // 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
- arg.KeepRight = false
- arg.IsStatic = false
- fmt.Println("浠巑ongos涓嬁鍒扮殑鏁版嵁鍖呴暱搴︿负锛�", len(msg))
- for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
- if sdkinfo.Sdktype == "Yolo" {
- yoloParam := protomsg.ParamYoloObj{}
- err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
- if err != nil {
- fmt.Println("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- //continue
- }
- for _, info := range yoloParam.Infos {
- photoMap := ruleserver.PhotoMap{Rects:rectFormat(info.RcObj), Score: float64(info.Prob)}
- arg.Photo = append(arg.Photo, photoMap)
- }
-
- }
- if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
- 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:ruleserver.Rect{}, Score: float64(info.Pos.Quality)}
- arg.Photo = append(arg.Photo, photoMap)
- }
- }
- //if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
-
- //}
-
- }
- return m
-}
-
// 灏嗗閮ㄤ紶杩涙潵鐨剅ect锛坱op,bottom,left,right锛夎浆鍖栦负鑷繁鍐呴儴鐨剅ect(left top width height)
func rectFormat(rcobj *protomsg.Rect) ruleserver.Rect {
rect := ruleserver.Rect{}
@@ -124,3 +68,144 @@
rect.Height = float64(rcobj.Bottom - rcobj.Top)
return rect
}
+
+// 灏嗗閮ㄤ紶杩涙潵鐨剆dk鏁版嵁鍖呰В鎴� SdkDatas
+func paramFormat(msg []byte, args *ruleserver.SdkDatas) protomsg.SdkMessage {
+ defer func() {
+ if err := recover(); err != nil {
+ fmt.Println("瑙ｅ寘杩囩▼鐨勯敊璇�", err.(string))
+ }
+
+ }()
+ // 鍙嶅簭鍒楀寲鏁版嵁寰楀埌sdk鍏ュ弬
+ m := protomsg.SdkMessage{}
+ err := proto.Unmarshal(msg, &m)
+ if err != nil {
+ panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
+ }
+ args.CameraId = m.Cid
+ // 鎶婂浘鐗囩殑浜岃繘鍒惰В鍘嬬缉杩涜鐢绘鍦ㄥ帇缂╁洖鍘�
+ bdata, err := util.UnCompress(m.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+
+ for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
+ if sdkinfo.Sdktype == "Yolo" {
+ arg := ruleserver.SdkData{}
+ arg.TaskId = m.Tasklab.Taskid
+ arg.SdkId = sdkinfo.Sdkid
+ arg.SdkName = sdkinfo.SdkName
+ arg.IsYolo = true
+ bdata, err := util.UnCompress(m.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ arg.ImageWidth = int(i.Width)
+ arg.ImageHeight = int(i.Height)
+ // 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
+ arg.KeepRight = false
+ arg.IsStatic = false
+ if len(sdkinfo.Sdkdata) > 1 {
+ // 澶т簬1鎵嶆湁鏁版嵁
+ fmt.Println("----------------------------------------------------",m.Cid)
+ 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,IsYolo:true}
+ arg.Photo = append(arg.Photo, photoMap)
+ }
+ }
+ args.Sdkdata = append(args.Sdkdata,&arg)
+ } else {
+ continue
+ }
+
+ }
+ if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
+ arg := ruleserver.SdkData{}
+ arg.TaskId = m.Tasklab.Taskid
+ arg.SdkId = sdkinfo.Sdkid
+ arg.SdkName = sdkinfo.SdkName
+ arg.IsYolo = false
+ bdata, err := util.UnCompress(m.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ arg.ImageWidth = int(i.Width)
+ arg.ImageHeight = int(i.Height)
+ // 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
+ arg.KeepRight = false
+ arg.IsStatic = false
+ 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,ThftRes:*(info.Result)}
+ arg.Photo = append(arg.Photo, photoMap)
+ }
+ args.Sdkdata = append(args.Sdkdata,&arg)
+ } else {
+ continue
+ }
+ }
+ if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
+ arg := ruleserver.SdkData{}
+ arg.TaskId = m.Tasklab.Taskid
+ arg.SdkId = sdkinfo.Sdkid
+ arg.SdkName = sdkinfo.SdkName
+ arg.IsYolo = false
+ bdata, err := util.UnCompress(m.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ arg.ImageWidth = int(i.Width)
+ arg.ImageHeight = int(i.Height)
+ // 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
+ arg.KeepRight = false
+ arg.IsStatic = false
+ if len(sdkinfo.Sdkdata) > 1 {
+ fmt.Println("----------------------------------------------------",m.Caddr)
+ faceParam := protomsg.ParamFaceFeature{}
+ err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
+ if err != nil {
+ fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ continue
+ }
+ for _, extComp := range faceParam.ExtComp {
+ baseinfos := protomsg.Binfos{}
+ err1 := proto.Unmarshal(extComp.Comp, &baseinfos)
+ if err1 != nil {
+ fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ continue
+ }
+ photoMap := ruleserver.PhotoMap{Rects: rectFormat(extComp.Pos.Pos.RcFace), Score: float64(extComp.Pos.Pos.Quality)*100, IsYolo:false,ThftRes:*(extComp.Pos.Result),Liker:baseinfos.Infos}
+ arg.Photo = append(arg.Photo, photoMap)
+ }
+ args.Sdkdata = append(args.Sdkdata,&arg)
+ } else {
+ continue
+ }
+ }
+
+ }
+ return m
+}
\ No newline at end of file
--
Gitblit v1.8.0