From 344e75a9bde2aaf447f814eeeed2c9ed8c274272 Mon Sep 17 00:00:00 2001 From: aler9 <46489434+aler9@users.noreply.github.com> Date: Sat, 29 May 2021 19:12:26 +0200 Subject: [PATCH] update gortsplib --- go.mod | 2 +- go.sum | 4 ++-- main_rtspreadpub_test.go | 18 +++++++++++++----- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index aa938335..3e3b8acf 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ 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-20210520174241-87f1b1e13105 + github.com/aler9/gortsplib v0.0.0-20210529171058-150c03a05e2e github.com/asticode/go-astits v0.0.0-00010101000000-000000000000 github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.4.9 diff --git a/go.sum b/go.sum index adc7e9d8..503680f4 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,8 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2c github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/aler9/go-astits v0.0.0-20210423195926-582b09ed7c04 h1:CXgQLsU4uxWAmsXNOjGLbj0A+0IlRcpZpMgI13fmVwo= github.com/aler9/go-astits v0.0.0-20210423195926-582b09ed7c04/go.mod h1:DkOWmBNQpnr9mv24KfZjq4JawCFX1FCqjLVGvO0DygQ= -github.com/aler9/gortsplib v0.0.0-20210520174241-87f1b1e13105 h1:1VtRfPuVzowHkZ5MUEdxFbUjNoZNsBnT1xX6fO+Pp1c= -github.com/aler9/gortsplib v0.0.0-20210520174241-87f1b1e13105/go.mod h1:zVCg+TQX445hh1pC5QgAuuBvvXZMWLY1XYz626dGFqY= +github.com/aler9/gortsplib v0.0.0-20210529171058-150c03a05e2e h1:q7EQNqew/CIbzU7XJeHJxY1HIH4Zgeh1X+yCCnrzdw8= +github.com/aler9/gortsplib v0.0.0-20210529171058-150c03a05e2e/go.mod h1:zVCg+TQX445hh1pC5QgAuuBvvXZMWLY1XYz626dGFqY= github.com/aler9/rtmp v0.0.0-20210403095203-3be4a5535927 h1:95mXJ5fUCYpBRdSOnLAQAdJHHKxxxJrVCiaqDi965YQ= github.com/aler9/rtmp v0.0.0-20210403095203-3be4a5535927/go.mod h1:vzuE21rowz+lT1NGsWbreIvYulgBpCGnQyeTyFblUHc= github.com/asticode/go-astikit v0.20.0 h1:+7N+J4E4lWx2QOkRdOf6DafWJMv6O4RRfgClwQokrH8= diff --git a/main_rtspreadpub_test.go b/main_rtspreadpub_test.go index 56cf5758..bac4d124 100644 --- a/main_rtspreadpub_test.go +++ b/main_rtspreadpub_test.go @@ -17,6 +17,14 @@ import ( "github.com/stretchr/testify/require" ) +func mustParseURL(s string) *base.URL { + u, err := base.ParseURL(s) + if err != nil { + panic(err) + } + return u +} + func TestClientRTSPPublishRead(t *testing.T) { for _, ca := range []struct { encrypted bool @@ -638,7 +646,7 @@ func TestClientRTSPAdditionalInfos(t *testing.T) { ssrcs[i] = th.SSRC } - res, err := conn.Play() + res, err := conn.Play(nil) if err != nil { return nil, nil, err } @@ -886,7 +894,7 @@ wait err = base.Request{ Method: base.Describe, - URL: base.MustParseURL("rtsp://localhost:8554/ondemand"), + URL: mustParseURL("rtsp://localhost:8554/ondemand"), Header: base.Header{ "CSeq": base.HeaderValue{"1"}, }, @@ -928,7 +936,7 @@ wait err = base.Request{ Method: base.Describe, - URL: base.MustParseURL("rtsp://localhost:8554/ondemand"), + URL: mustParseURL("rtsp://localhost:8554/ondemand"), Header: base.Header{ "CSeq": base.HeaderValue{"1"}, }, @@ -942,7 +950,7 @@ wait err = base.Request{ Method: base.Setup, - URL: base.MustParseURL("rtsp://localhost:8554/ondemand/trackID=0"), + URL: mustParseURL("rtsp://localhost:8554/ondemand/trackID=0"), Header: base.Header{ "CSeq": base.HeaderValue{"2"}, "Transport": headers.Transport{ @@ -995,7 +1003,7 @@ wait err = base.Request{ Method: base.Setup, - URL: base.MustParseURL("rtsp://localhost:8554/ondemand/trackID=0"), + URL: mustParseURL("rtsp://localhost:8554/ondemand/trackID=0"), Header: base.Header{ "CSeq": base.HeaderValue{"1"}, "Transport": headers.Transport{