From ce316115fafd345832141a1cb42ed394252a1551 Mon Sep 17 00:00:00 2001 From: aler9 <46489434+aler9@users.noreply.github.com> Date: Sun, 21 Mar 2021 11:22:49 +0100 Subject: [PATCH] update gortsplib --- go.mod | 4 ++-- go.sum | 4 ++-- internal/clientrtsp/client.go | 7 +++++-- main_clientrtsp_test.go | 4 ++-- main_sourcertsp_test.go | 4 ++-- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index c1aadc00..dc619d1c 100644 --- a/go.mod +++ b/go.mod @@ -5,11 +5,11 @@ go 1.15 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-20210320202503-3defa7074839 + github.com/aler9/gortsplib v0.0.0-20210321101935-437b4cc87e5e github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.4.9 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 - github.com/notedit/rtmp v0.0.0 + github.com/notedit/rtmp v0.0.2 github.com/pion/rtp v1.6.2 github.com/stretchr/testify v1.6.1 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad diff --git a/go.sum b/go.sum index 8578715e..2f78317b 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-20210320202503-3defa7074839 h1:o9h0vJiX/65HrYoOKuEGhfY8ZWrzrkaB2Pp5KUvUNL8= -github.com/aler9/gortsplib v0.0.0-20210320202503-3defa7074839/go.mod h1:aj4kDzanb3JZ46sFywWShcsnqqXTLE/3PNjwDhQZGM0= +github.com/aler9/gortsplib v0.0.0-20210321101935-437b4cc87e5e h1:z2vLKNQPL46LEVR7hzkh6p1m54r/dGJeVdfz8NKeRnE= +github.com/aler9/gortsplib v0.0.0-20210321101935-437b4cc87e5e/go.mod h1:6YS0c1vRrFFYj4gjKbgB8ntd/o1XqK/c0KaHX/PtnhU= github.com/aler9/rtmp v0.0.0-20210309202041-2d7177b7300d h1:LAX8pNvYpGgFpKdbPpEZWjNkHbmyvjMrT3vO7s7aaKU= github.com/aler9/rtmp v0.0.0-20210309202041-2d7177b7300d/go.mod h1:vzuE21rowz+lT1NGsWbreIvYulgBpCGnQyeTyFblUHc= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= diff --git a/internal/clientrtsp/client.go b/internal/clientrtsp/client.go index 5954ea4a..75817871 100644 --- a/internal/clientrtsp/client.go +++ b/internal/clientrtsp/client.go @@ -14,6 +14,7 @@ import ( "github.com/aler9/gortsplib/pkg/auth" "github.com/aler9/gortsplib/pkg/base" "github.com/aler9/gortsplib/pkg/headers" + "github.com/aler9/gortsplib/pkg/liberrors" "github.com/pion/rtp" "github.com/aler9/rtsp-simple-server/internal/client" @@ -436,8 +437,10 @@ func (c *Client) run() { case err := <-readDone: c.conn.Close() - if err != io.EOF && err != gortsplib.ErrServerTeardown && err != errTerminated { - c.log(logger.Info, "ERR: %s", err) + if err != io.EOF && err != errTerminated { + if _, ok := err.(liberrors.ErrServerTeardown); !ok { + c.log(logger.Info, "ERR: %s", err) + } } switch c.conn.State() { diff --git a/main_clientrtsp_test.go b/main_clientrtsp_test.go index 5715e17d..40117fb2 100644 --- a/main_clientrtsp_test.go +++ b/main_clientrtsp_test.go @@ -867,7 +867,7 @@ wait v := headers.TransportModePlay return &v }(), - InterleavedIds: &[2]int{0, 1}, + InterleavedIDs: &[2]int{0, 1}, }.Write(), }, }.Write(bconn.Writer) @@ -919,7 +919,7 @@ wait v := headers.TransportModePlay return &v }(), - InterleavedIds: &[2]int{0, 1}, + InterleavedIDs: &[2]int{0, 1}, }.Write(), }, }.Write(bconn.Writer) diff --git a/main_sourcertsp_test.go b/main_sourcertsp_test.go index c47ec040..ef43b636 100644 --- a/main_sourcertsp_test.go +++ b/main_sourcertsp_test.go @@ -186,7 +186,7 @@ func TestSourceRTSPRTPInfo(t *testing.T) { return &v }(), ClientPorts: th.ClientPorts, - InterleavedIds: &[2]int{0, 1}, + InterleavedIDs: &[2]int{0, 1}, }.Write(), }, }.Write(bconn.Writer) @@ -209,7 +209,7 @@ func TestSourceRTSPRTPInfo(t *testing.T) { return &v }(), ClientPorts: th.ClientPorts, - InterleavedIds: &[2]int{2, 3}, + InterleavedIDs: &[2]int{2, 3}, }.Write(), }, }.Write(bconn.Writer)