From 8c7dd4313817f6854461a64a7cadb7d970fb3e88 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 27 八月 2019 09:56:37 +0800
Subject: [PATCH] run nomally
---
camera/camera.go | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/camera/camera.go b/camera/camera.go
index 5329bae..d039361 100644
--- a/camera/camera.go
+++ b/camera/camera.go
@@ -5,10 +5,13 @@
//"sync"
"taskpubsub/logger"
- "basic.com/pubsub/protomsg.git"
- "github.com/gogo/protobuf/proto"
"taskpubsub/sdk"
"taskpubsub/util"
+
+ "basic.com/pubsub/protomsg.git"
+ "github.com/gogo/protobuf/proto"
+
+ // "golang.org/x/sys/unix"
"fmt"
//"time"
@@ -21,6 +24,8 @@
var SocketManage = make(map[string]util.SocketContext)
+var shm bool = false
+
var innerRecvTopic = []string{
"virtual-faceextract-sdk-pull_2", //to web 浠ュ浘鎼滃浘
}
@@ -31,7 +36,9 @@
}
}
-func Init() {
+func Init(useShm bool) {
+ shm = useShm
+
logger.Info("============ camera info ====================")
for _, cd := range util.CameraIds {
logger.Info(cd)
@@ -54,7 +61,15 @@
if _, isExist := SocketManage[id]; !isExist { //涓嶅瓨鍦�
url := fmt.Sprintf("ipc:///tmp/%s.ipc", id)
- socket, err := util.NewSocketListen(int(deliver.PushPull), url)
+ m := deliver.PushPull
+ if shm {
+ m = deliver.Shm
+ url = id
+
+ }
+
+ fmt.Println("CAMERA URL : ", url)
+ socket, err := util.NewSocketListen(int(m), url, shm)
if err != nil {
logger.Error("create socket error")
return
--
Gitblit v1.8.0