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 | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/decoder/main.go b/decoder/main.go
index 4684779..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 = 7001
)
func recvCameraInfoFromIPC(ctx context.Context, url string, ch chan<- CameraInfo) {
@@ -69,7 +67,7 @@
ch <- c
- msgIpc := MsgIPC{"new decoder", port}
+ msgIpc := MsgIPC{"new decoder", 0}
if b, err := json.Marshal(msgIpc); err == nil {
ipc.Send(b)
}
@@ -84,6 +82,8 @@
func main() {
flag.Parse()
+ goffmpeg.InitFFmpeg()
+
if testIt {
test()
}
@@ -91,8 +91,19 @@
ctx, cancel := context.WithCancel(context.Background())
ch := make(chan CameraInfo)
- // tcpURL := tcp + strconv.Itoa(port)
- // port++
+
+ 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 {
@@ -112,6 +123,8 @@
}
}
}
+
+ goffmpeg.FreeFFmpeg()
cancel()
}
--
Gitblit v1.8.0