From 7c6a958f00e327a8991f48093456de7cb84cf918 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 05 二月 2020 20:20:24 +0800
Subject: [PATCH] change log for proto marshal
---
common/helper.go | 82 +----------------------------------------
1 files changed, 2 insertions(+), 80 deletions(-)
diff --git a/common/helper.go b/common/helper.go
index 0e016c3..2e4db0d 100644
--- a/common/helper.go
+++ b/common/helper.go
@@ -8,13 +8,9 @@
"strconv"
"time"
- "basic.com/libgowrapper/sdkstruct.git"
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/deliver.git"
"github.com/gogo/protobuf/proto"
)
-
-const mode = deliver.PushPull
// GetIpcAddress get ipc
func GetIpcAddress(shm bool, id string) string {
@@ -71,7 +67,7 @@
}
msg := protomsg.SdkMessage{}
if err := proto.Unmarshal(d, &msg); err != nil {
- fn(err, " msg 澶勭悊寮傚父")
+ fn("UnserilizeProto Unmarshal msg 澶勭悊寮傚父:", err)
continue
}
@@ -83,87 +79,13 @@
}
}
-// Msg2MsgSDK msg->msgsdk
-func Msg2MsgSDK(msg protomsg.SdkMessage) *sdkstruct.MsgSDK {
-
- d, err := proto.Marshal(&msg)
- if err != nil {
- return nil
- }
-
- index, count := int(msg.Tasklab.Index), len(msg.Tasklab.Sdkinfos)
- if index >= count {
- return &sdkstruct.MsgSDK{
- MsgData: d,
- SdkCount: count,
- SdkIndex: index,
- SdkDataLen: 0,
- }
- }
-
- return &sdkstruct.MsgSDK{
- MsgData: d,
- SdkCount: count,
- SdkIndex: index,
- SdkDataLen: len(d),
- }
-}
-
-// EjectResult eject
-func EjectResult(res []byte, msg protomsg.SdkMessage, out chan<- sdkstruct.MsgSDK) {
-
- if res == nil {
- s := Msg2MsgSDK(msg)
- if s == nil {
- return
- }
- out <- *s
- return
- }
-
- msg.Tasklab.Sdkinfos[int(msg.Tasklab.Index)].Sdkdata = res
-
- s := Msg2MsgSDK(msg)
- if s == nil {
- return
- }
- out <- *s
-}
-
-/////////////////////////////////////////////////////////////
-
-// ValidRemoteMessage valid or not
-func ValidRemoteMessage(msg protomsg.SdkMessage, fnName string, fn func(...interface{})) bool {
- if msg.Tasklab == nil {
- fn(fnName, " recieve msg nil")
- return false
- }
-
- sdkLen := len(msg.Tasklab.Sdkinfos)
- if sdkLen == 0 {
- fn(fnName, " has no sdk info")
- return false
- }
-
- curIndex := int(msg.Tasklab.Index)
- if curIndex < 0 || curIndex >= sdkLen {
- fn(fnName, " tasklab index ", curIndex, " error")
- return false
- }
- if msg.Tasklab.Sdkinfos[curIndex].Sdktype != fnName {
- fn(fnName, " is different from ", msg.Tasklab.Sdkinfos[curIndex].Sdktype)
- return false
- }
- return true
-}
-
// UnpackImage unpack
func UnpackImage(msg protomsg.SdkMessage, fnName string, fn func(...interface{})) *protomsg.Image {
// 鍙嶅簭鍒楀寲鏁版嵁寰楀埌sdk鍏ュ弬
i := &protomsg.Image{}
err := proto.Unmarshal(msg.Data, i)
if err != nil {
- fn(fnName, " protobuf decode CameraImage error: ", err.Error())
+ fn(fnName, " protobuf Unmarshal decode CameraImage error: ", err.Error())
return nil
}
if i.Data == nil {
--
Gitblit v1.8.0