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/work/service/ipcsender.go | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) 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