From b334e8872e8598ea301db9b891ab58c01e5618f0 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 25 六月 2019 11:32:37 +0800
Subject: [PATCH] ---
---
main.go | 47 +++++++++++++++++++++++++++--------------------
1 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/main.go b/main.go
index a5fc975..18700b9 100644
--- a/main.go
+++ b/main.go
@@ -2,8 +2,10 @@
import (
"fmt"
+ "log"
"ruleprocess/insertdata"
"ruleprocess/ruleserver"
+ "ruleprocess/util"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
@@ -69,7 +71,7 @@
}
arg.CameraId = m.Cid
arg.TaskId = m.Tasklab.Taskid
- bdata, err := UnCompress(m.Data)
+ bdata, err := util.UnCompress(m.Data)
if err != nil {
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
}
@@ -86,6 +88,7 @@
fmt.Println("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
if len(sdkinfo.Sdkdata) > 1 {
// 澶т簬1鎵嶆湁鏁版嵁
+ fmt.Println("----------------------------------------------------",m.Caddr)
yoloParam := protomsg.ParamYoloObj{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
if err != nil {
@@ -93,31 +96,35 @@
//continue
}
for _, info := range yoloParam.Infos {
- photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)}
- arg.Photo = append(arg.Photo, photoMap)
+ log.Println("yolo绫诲瀷锛�",info.Typ)
+ 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 len(sdkinfo.Sdkdata) > 1 {
- 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{-1, -1, -1, -1}, Score: float64(info.Pos.Quality)}
- arg.Photo = append(arg.Photo, photoMap)
- }
- } else {
- continue
- }
- }
+ //if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
+ // fmt.Println("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
+ // 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: ruleserver.Rect{-1, -1, -1, -1}, Score: float64(info.Pos.Quality)}
+ // arg.Photo = append(arg.Photo, photoMap)
+ // }
+ // } else {
+ // continue
+ // }
+ //}
//if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
//}
--
Gitblit v1.8.0