From 1875d1339590ca97de50bd8f19a22e8801631263 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 07 五月 2019 10:06:36 +0800
Subject: [PATCH] decoder push
---
decoder/main.go | 6 +++---
decoder/work/service/ipcsender.go | 16 +++++++++++-----
decoder/work/service/common.go | 2 +-
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/decoder/main.go b/decoder/main.go
index b1fe26b..9b8c5cd 100644
--- a/decoder/main.go
+++ b/decoder/main.go
@@ -34,7 +34,7 @@
flag.BoolVar(&asServer, "server", false, "run ipc as server")
}
-// CameraInfo camera info
+// cameraInfo camera info
type CameraInfo struct {
ID string `json:"Cameraid"`
URL string `json:"Rtsp"`
@@ -50,7 +50,7 @@
mapCameraInfo = make(map[string]CameraInfo)
tcp = `tcp://192.168.1.124:`
- port = 7000
+ port = 7001
)
func recvCameraInfoFromIPC(ctx context.Context, url string, ch chan<- CameraInfo) {
@@ -104,7 +104,6 @@
mapCameraInfo[c.ID] = c
ipcAddr := tcp + strconv.Itoa(port)
port++
- fmt.Printf("create ipc %s for decode : %s, on camera id %s\n", ipcAddr, c.URL, c.ID)
url := strings.TrimSpace(c.URL)
id := strings.TrimSpace(c.ID)
@@ -123,6 +122,7 @@
}
d.RunAsClient()
}
+
func test() {
fmt.Println("start test")
diff --git a/decoder/work/service/common.go b/decoder/work/service/common.go
index 54cff5d..cd5bcf2 100644
--- a/decoder/work/service/common.go
+++ b/decoder/work/service/common.go
@@ -10,7 +10,7 @@
Width int
Height int
- CameraID string
+ // CameraID string
}
// ContextIPC server context
diff --git a/decoder/work/service/ipcsender.go b/decoder/work/service/ipcsender.go
index dc4734e..102c735 100644
--- a/decoder/work/service/ipcsender.go
+++ b/decoder/work/service/ipcsender.go
@@ -24,6 +24,8 @@
func NewSender(cameraID, streamURL, ipcURL string) *Sender {
ctx, cancel := context.WithCancel(context.Background())
+ fmt.Printf("create ipc %s for decode : %s, on camera id %s\n", ipcURL, streamURL, cameraID)
+
return &Sender{
ctxIPC: &ContextIPC{ctx, cancel},
@@ -49,6 +51,7 @@
}
b := buf.Bytes()
data <- b
+ fmt.Printf("send %d length data ipc address %s\n", len(b), s.ipcURL)
}
}
@@ -66,26 +69,29 @@
gf.ActiveDecoder(func(d *[]byte, w, h *int) {
if *w > 0 && *h > 0 {
- i := ImageInfo{*d, *w, *h, s.cameraID}
- imageChan <- i
+ img := ImageInfo{*d, *w, *h}
+ imageChan <- img
} else {
fmt.Println("decode jpg error")
}
})
gf.Run(s.streamURL)
-
i.SendFromChannel(dataChan)
}
// RunAsServer run a IPC server
func (s *Sender) RunAsServer() {
- s.run(ipc.NewServer(s.ctxIPC.ctx, s.ipcURL))
+ i := ipc.NewServer(s.ctxIPC.ctx, s.ipcURL)
+ fmt.Println("ipc :", s.ipcURL, " cameraid:", s.cameraID)
+ s.run(i)
}
// RunAsClient run as a IPC client
func (s *Sender) RunAsClient() {
- s.run(ipc.NewClient(s.ctxIPC.ctx, s.ipcURL))
+ i := ipc.NewClient(s.ctxIPC.ctx, s.ipcURL)
+ fmt.Println("ipc :", s.ipcURL, " cameraid:", s.cameraID)
+ s.run(i)
}
// Stop stop run decoder, must run in goroutine
--
Gitblit v1.8.0