From 7a440030ad7b8dee53cc97e69ca466c7fb4ee0df Mon Sep 17 00:00:00 2001 From: aler9 <46489434+aler9@users.noreply.github.com> Date: Sat, 15 Aug 2020 22:43:57 +0200 Subject: [PATCH] update gortsplib --- Makefile | 6 +++--- go.mod | 2 +- go.sum | 4 ++-- source.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 125e5fcc..5ca0a632 100644 --- a/Makefile +++ b/Makefile @@ -73,15 +73,15 @@ logDestinations: [stdout, file] paths: all: - runOnPublish: ffmpeg -i rtsp://localhost:8554/$$RTSP_SERVER_PATH -c copy -f mpegts myfile_$$RTSP_SERVER_PATH.ts +# runOnPublish: ffmpeg -i rtsp://localhost:8554/$$RTSP_SERVER_PATH -c copy -f mpegts myfile_$$RTSP_SERVER_PATH.ts # readUser: test # readPass: tast - proxied: +# proxied: # source: rtsp://192.168.2.198:8554/stream # sourceProtocol: tcp # sourceOnDemand: yes - runOnDemand: ffmpeg -i rtsp://192.168.2.198:8554/stream -c copy -f rtsp rtsp://localhost:8554/proxied2 +# runOnDemand: ffmpeg -i rtsp://192.168.2.198:8554/stream -c copy -f rtsp rtsp://localhost:8554/proxied2 # original: # runOnPublish: ffmpeg -i rtsp://localhost:8554/original -b:a 64k -c:v libx264 -preset ultrafast -b:v 500k -max_muxing_queue_size 1024 -f rtsp rtsp://localhost:8554/compressed diff --git a/go.mod b/go.mod index 206e19d7..925ca935 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.12 require ( github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect - github.com/aler9/gortsplib v0.0.0-20200730132448-3b14ef755b05 + github.com/aler9/gortsplib v0.0.0-20200815203804-c889483a7a41 github.com/aler9/sdp/v3 v3.0.0-20200719093237-2c3d108a7436 github.com/davecgh/go-spew v1.1.1 // indirect github.com/stretchr/testify v1.6.1 diff --git a/go.sum b/go.sum index 0423c21b..cdef097b 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafo github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2cI+DC1Mbh0TJxzA3RcLoMsFw+aXw7E= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/aler9/gortsplib v0.0.0-20200730132448-3b14ef755b05 h1:DWxXmtYvLYt3FNAZYKENS8NmxtkpBZJIbtZyOZ8Xu+c= -github.com/aler9/gortsplib v0.0.0-20200730132448-3b14ef755b05/go.mod h1:kBMvjIdOHRjLdV+oT28JD72JUPpJuwxOc9u72GG8GpY= +github.com/aler9/gortsplib v0.0.0-20200815203804-c889483a7a41 h1:4iFqyQZmteb8HuutMQzchVhleaVzkNG9lT+B5S1WaK4= +github.com/aler9/gortsplib v0.0.0-20200815203804-c889483a7a41/go.mod h1:kBMvjIdOHRjLdV+oT28JD72JUPpJuwxOc9u72GG8GpY= github.com/aler9/sdp/v3 v3.0.0-20200719093237-2c3d108a7436 h1:W0iNErWKvSAyJBNVx+qQoyFrWOFVgS6f/WEME/D3EZc= github.com/aler9/sdp/v3 v3.0.0-20200719093237-2c3d108a7436/go.mod h1:OnlEK3QI7YtM+ShZWtGajmOHLZ3bjU80AcIS5e34i1U= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= diff --git a/source.go b/source.go index fd6b8a98..e6fff906 100644 --- a/source.go +++ b/source.go @@ -290,7 +290,7 @@ func (s *source) runUdp(terminate chan struct{}, conn *gortsplib.ConnClient) boo tcpConnDone := make(chan error) go func() { - tcpConnDone <- conn.LoopUDP(s.confp.sourceUrl) + tcpConnDone <- conn.LoopUdp(s.confp.sourceUrl) }() var ret bool