From ce15b43db3e60acc65ddd25de253b8577c2693aa Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 08 五月 2019 14:11:03 +0800
Subject: [PATCH] context使用
---
decoder/main.go | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/decoder/main.go b/decoder/main.go
index 97b3496..3f5f252 100644
--- a/decoder/main.go
+++ b/decoder/main.go
@@ -2,6 +2,7 @@
import (
"context"
+ "decoder/valib/goffmpeg"
"decoder/valib/ipc"
srv "decoder/work/service"
"encoding/json"
@@ -48,9 +49,6 @@
var (
mapCameraInfo = make(map[string]CameraInfo)
-
- tcp = `tcp://192.168.1.124`
- port = 7000
)
func recvCameraInfoFromIPC(ctx context.Context, url string, ch chan<- CameraInfo) {
@@ -59,24 +57,32 @@
for {
msg := ipc.Recv()
if msg != nil {
- fmt.Println(string(msg))
+
var c CameraInfo
if err := json.Unmarshal(msg, &c); err == nil {
+
+ if _, ok := mapCameraInfo[c.ID]; ok {
+ continue
+ }
+
ch <- c
- fmt.Printf("recv camere info %+v\n", c)
+
+ msgIpc := MsgIPC{"new decoder", 0}
+ if b, err := json.Marshal(msgIpc); err == nil {
+ ipc.Send(b)
+ }
} else {
fmt.Println(err)
}
- msgIpc := MsgIPC{"new decoder", port}
- if b, err := json.Marshal(msgIpc); err == nil {
- ipc.Send(b)
- }
+
}
}
}
func main() {
flag.Parse()
+
+ goffmpeg.InitFFmpeg()
if testIt {
test()
@@ -85,9 +91,20 @@
ctx, cancel := context.WithCancel(context.Background())
ch := make(chan CameraInfo)
- tcpURL := tcp + strconv.Itoa(port)
- port++
- go recvCameraInfoFromIPC(ctx, tcpURL, ch)
+
+ tcp := ``
+ port := 7001
+
+ if strings.Index(ipcURL, "tcp://") == 0 {
+ i := strings.LastIndex(ipcURL, ":")
+ tcp = ipcURL[0 : i+1]
+
+ strPort := ipcURL[i+1:]
+ port, _ = strconv.Atoi(strPort)
+ port++
+ }
+
+ go recvCameraInfoFromIPC(ctx, ipcURL, ch)
for {
select {
@@ -98,7 +115,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)
@@ -107,6 +123,8 @@
}
}
}
+
+ goffmpeg.FreeFFmpeg()
cancel()
}
@@ -117,6 +135,7 @@
}
d.RunAsClient()
}
+
func test() {
fmt.Println("start test")
--
Gitblit v1.8.0