From 19445d14e73f4bb96e218a65e126ae526f89537d Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 08 五月 2019 14:14:59 +0800
Subject: [PATCH] context使用
---
decoder/main.go | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/decoder/main.go b/decoder/main.go
index 3f5f252..eb39bae 100644
--- a/decoder/main.go
+++ b/decoder/main.go
@@ -84,11 +84,11 @@
goffmpeg.InitFFmpeg()
- if testIt {
- test()
- }
-
ctx, cancel := context.WithCancel(context.Background())
+
+ if testIt {
+ test(ctx)
+ }
ch := make(chan CameraInfo)
@@ -119,7 +119,7 @@
url := strings.TrimSpace(c.URL)
id := strings.TrimSpace(c.ID)
addr := strings.TrimSpace(ipcAddr)
- go runSender(id, url, addr)
+ go runSender(ctx, id, url, addr)
}
}
}
@@ -128,18 +128,18 @@
cancel()
}
-func runSender(cameraID, rtspURL, ipcLabel string) {
- d := srv.NewSender(cameraID, rtspURL, ipcLabel)
+func runSender(ctx context.Context, cameraID, rtspURL, ipcLabel string) {
+ d := srv.NewSender(ctx, cameraID, rtspURL, ipcLabel)
if asServer {
d.RunAsServer()
}
d.RunAsClient()
}
-func test() {
+func test(ctx context.Context) {
fmt.Println("start test")
fmt.Println(picFolder)
- runSender("cameraid", streamURL, ipcURL)
+ runSender(ctx, "cameraid", streamURL, ipcURL)
}
--
Gitblit v1.8.0