pimhwang
/
mediamtx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update gortsplib (#2138)

pull/2139/head
Alessandro Ros 3 years ago committed by GitHub
parent
556392d2ee
commit
1bfc08cca2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      go.mod
  2. 4
      go.sum
  3. 2
      internal/core/rtsp_conn.go
  4. 4
      internal/core/rtsp_session.go
  5. 4
      internal/core/rtsp_source_test.go

2
go.mod
Unescape View File

@ -7,7 +7,7 @@ require (
github.com/abema/go-mp4 v0.11.0 github.com/abema/go-mp4 v0.11.0
github.com/alecthomas/kong v0.8.0 github.com/alecthomas/kong v0.8.0
github.com/bluenviron/gohlslib v0.3.1-0.20230730162911-eb9f86511072 github.com/bluenviron/gohlslib v0.3.1-0.20230730162911-eb9f86511072
github.com/bluenviron/gortsplib/v3 v3.9.1-0.20230730204034-8b8b52e689d9 github.com/bluenviron/gortsplib/v3 v3.9.1-0.20230801115353-f296099f26d5
github.com/bluenviron/mediacommon v0.7.1-0.20230730144331-10b74a4f6eda github.com/bluenviron/mediacommon v0.7.1-0.20230730144331-10b74a4f6eda
github.com/datarhei/gosrt v0.5.3 github.com/datarhei/gosrt v0.5.3
github.com/fsnotify/fsnotify v1.6.0 github.com/fsnotify/fsnotify v1.6.0

4
go.sum
Unescape View File

@ -16,8 +16,8 @@ github.com/benburkert/openpgp v0.0.0-20160410205803-c2471f86866c h1:8XZeJrs4+ZYh
github.com/benburkert/openpgp v0.0.0-20160410205803-c2471f86866c/go.mod h1:x1vxHcL/9AVzuk5HOloOEPrtJY0MaalYr78afXZ+pWI= github.com/benburkert/openpgp v0.0.0-20160410205803-c2471f86866c/go.mod h1:x1vxHcL/9AVzuk5HOloOEPrtJY0MaalYr78afXZ+pWI=
github.com/bluenviron/gohlslib v0.3.1-0.20230730162911-eb9f86511072 h1:pAbC7frXsTMxP7Ck3E50hl7oFeSeD2dgc2lWjmHXztQ= github.com/bluenviron/gohlslib v0.3.1-0.20230730162911-eb9f86511072 h1:pAbC7frXsTMxP7Ck3E50hl7oFeSeD2dgc2lWjmHXztQ=
github.com/bluenviron/gohlslib v0.3.1-0.20230730162911-eb9f86511072/go.mod h1:rK4b161qErs82QqvBEl84vpi2xhdZBUT0yubXuytZ7E= github.com/bluenviron/gohlslib v0.3.1-0.20230730162911-eb9f86511072/go.mod h1:rK4b161qErs82QqvBEl84vpi2xhdZBUT0yubXuytZ7E=
github.com/bluenviron/gortsplib/v3 v3.9.1-0.20230730204034-8b8b52e689d9 h1:QBdUlT/taEG0b8dxguJ6GYT7r6vJFRhvwlhs1LGWYlQ= github.com/bluenviron/gortsplib/v3 v3.9.1-0.20230801115353-f296099f26d5 h1:d50XiZLfcoTWfPU/FWSk0hN8qWrqv6hqp02vBZQFnJk=
github.com/bluenviron/gortsplib/v3 v3.9.1-0.20230730204034-8b8b52e689d9/go.mod h1:vBmCYjtox2pXWSvU+r9ROpEbwSOhh5lVWd+t9Sj8glc= github.com/bluenviron/gortsplib/v3 v3.9.1-0.20230801115353-f296099f26d5/go.mod h1:reIJG1PKHiUwNa8NZQAyUmprtR8jeGZEnzU958rDgH4=
github.com/bluenviron/mediacommon v0.7.1-0.20230730144331-10b74a4f6eda h1:+ungCWRNDjsy/CVL1l/UjAj4vYL4+NIJQoJJWbR3Xw8= github.com/bluenviron/mediacommon v0.7.1-0.20230730144331-10b74a4f6eda h1:+ungCWRNDjsy/CVL1l/UjAj4vYL4+NIJQoJJWbR3Xw8=
github.com/bluenviron/mediacommon v0.7.1-0.20230730144331-10b74a4f6eda/go.mod h1:tfk0qGPhqnOxVCrElu8ct3LKQn6Cj4Tpu3zbbJBTKj4= github.com/bluenviron/mediacommon v0.7.1-0.20230730144331-10b74a4f6eda/go.mod h1:tfk0qGPhqnOxVCrElu8ct3LKQn6Cj4Tpu3zbbJBTKj4=
github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=

2
internal/core/rtsp_conn.go
Unescape View File

@ -138,7 +138,7 @@ func (c *rtspConn) onDescribe(ctx *gortsplib.ServerHandlerOnDescribeCtx,
if c.authNonce == "" { if c.authNonce == "" {
var err error var err error
c.authNonce, err = auth.GenerateNonce() c.authNonce, err = auth.GenerateNonce2()
if err != nil { if err != nil {
return &base.Response{ return &base.Response{
StatusCode: base.StatusInternalServerError, StatusCode: base.StatusInternalServerError,

4
internal/core/rtsp_session.go
Unescape View File

@ -123,7 +123,7 @@ func (s *rtspSession) onAnnounce(c *rtspConn, ctx *gortsplib.ServerHandlerOnAnno
if c.authNonce == "" { if c.authNonce == "" {
var err error var err error
c.authNonce, err = auth.GenerateNonce() c.authNonce, err = auth.GenerateNonce2()
if err != nil { if err != nil {
return &base.Response{ return &base.Response{
StatusCode: base.StatusInternalServerError, StatusCode: base.StatusInternalServerError,
@ -208,7 +208,7 @@ func (s *rtspSession) onSetup(c *rtspConn, ctx *gortsplib.ServerHandlerOnSetupCt
if c.authNonce == "" { if c.authNonce == "" {
var err error var err error
c.authNonce, err = auth.GenerateNonce() c.authNonce, err = auth.GenerateNonce2()
if err != nil { if err != nil {
return &base.Response{ return &base.Response{
StatusCode: base.StatusInternalServerError, StatusCode: base.StatusInternalServerError,

4
internal/core/rtsp_source_test.go
Unescape View File

@ -44,7 +44,7 @@ func TestRTSPSource(t *testing.T) {
medi := testMediaH264 medi := testMediaH264
stream := gortsplib.NewServerStream(media.Medias{medi}) stream := gortsplib.NewServerStream(media.Medias{medi})
nonce, err := auth.GenerateNonce() nonce, err := auth.GenerateNonce2()
require.NoError(t, err) require.NoError(t, err)
s := gortsplib.Server{ s := gortsplib.Server{
@ -170,7 +170,7 @@ func TestRTSPSource(t *testing.T) {
func TestRTSPSourceNoPassword(t *testing.T) { func TestRTSPSourceNoPassword(t *testing.T) {
stream := gortsplib.NewServerStream(media.Medias{testMediaH264}) stream := gortsplib.NewServerStream(media.Medias{testMediaH264})
nonce, err := auth.GenerateNonce() nonce, err := auth.GenerateNonce2()
require.NoError(t, err) require.NoError(t, err)
done := make(chan struct{}) done := make(chan struct{})

Write Preview
Loading…
Cancel
Save