From 3fc4ca64659a2c49effef7b63020fc4863424960 Mon Sep 17 00:00:00 2001 From: aler9 <46489434+aler9@users.noreply.github.com> Date: Fri, 1 Apr 2022 12:04:21 +0200 Subject: [PATCH] update gortsplib; downgrade pion/rtp to v1 --- go.mod | 4 ++-- go.sum | 8 ++++---- internal/core/hls_muxer.go | 2 +- internal/core/hls_source_test.go | 2 +- internal/core/reader.go | 2 +- internal/core/rtmp_conn.go | 2 +- internal/core/rtsp_server_test.go | 2 +- internal/core/rtsp_session.go | 2 +- internal/core/rtsp_source.go | 2 +- internal/core/rtsp_source_test.go | 2 +- internal/core/stream.go | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index d10f025a..7fbbd32c 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( code.cloudfoundry.org/bytefmt v0.0.0-20211005130812-5bb3c17173e5 - github.com/aler9/gortsplib v0.0.0-20220324142719-7d9c882cc95b + github.com/aler9/gortsplib v0.0.0-20220401091943-cec5326ccfed github.com/asticode/go-astits v1.10.0 github.com/fsnotify/fsnotify v1.4.9 github.com/gin-gonic/gin v1.7.2 @@ -12,7 +12,7 @@ require ( github.com/grafov/m3u8 v0.11.1 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 github.com/notedit/rtmp v0.0.2 - github.com/pion/rtp/v2 v2.0.0-20220302185659-b3d10fc096b0 + github.com/pion/rtp v1.7.9 github.com/stretchr/testify v1.7.0 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad gopkg.in/alecthomas/kingpin.v2 v2.2.6 diff --git a/go.sum b/go.sum index 4c29aee0..6a420fd2 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,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-20220324142719-7d9c882cc95b h1:tUbz82mIgMWTVI0pKZGHoL//c+y0VVGIMPHdYeAyvdc= -github.com/aler9/gortsplib v0.0.0-20220324142719-7d9c882cc95b/go.mod h1:4HE78w95Rqw1B2T90CHwtA4xBPPCRZ7/G8ds8ZdWcFk= +github.com/aler9/gortsplib v0.0.0-20220401091943-cec5326ccfed h1:lA/dMUwmQcBCeuFRYkPr3qnGPKgrFdGC0RZzB8tRKXw= +github.com/aler9/gortsplib v0.0.0-20220401091943-cec5326ccfed/go.mod h1:4mWq8mM6v8KrSQG4sEdnvM6+ZVKPPgKtf75TYR+jsKQ= 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= @@ -84,8 +84,8 @@ github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= github.com/pion/rtcp v1.2.9 h1:1ujStwg++IOLIEoOiIQ2s+qBuJ1VN81KW+9pMPsif+U= github.com/pion/rtcp v1.2.9/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo= -github.com/pion/rtp/v2 v2.0.0-20220302185659-b3d10fc096b0 h1:zyOGxHutZ6IhksQSMtwf3OFXB29W5R18yFQWOQJYWjU= -github.com/pion/rtp/v2 v2.0.0-20220302185659-b3d10fc096b0/go.mod h1:Vj+rrFbJCT3yxqE/VSwaOo9DQ2pMKGPxuE7hplGOlOs= +github.com/pion/rtp v1.7.9 h1:17W5Mt2IM3MVfOh7yRfzXbbKXYzBZxV8eG4KKAy+0bg= +github.com/pion/rtp v1.7.9/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= github.com/pion/sdp/v3 v3.0.2 h1:UNnSPVaMM+Pdu/mR9UvAyyo6zkdYbKeuOooCwZvTl/g= github.com/pion/sdp/v3 v3.0.2/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk= github.com/pkg/profile v1.4.0/go.mod h1:NWz/XGvpEW1FyYQ7fCx4dqYBLlfTcE+A9FLAkNKqjFE= diff --git a/internal/core/hls_muxer.go b/internal/core/hls_muxer.go index e520d622..51719026 100644 --- a/internal/core/hls_muxer.go +++ b/internal/core/hls_muxer.go @@ -17,7 +17,7 @@ import ( "github.com/aler9/gortsplib/pkg/ringbuffer" "github.com/aler9/gortsplib/pkg/rtpaac" "github.com/aler9/gortsplib/pkg/rtph264" - "github.com/pion/rtp/v2" + "github.com/pion/rtp" "github.com/aler9/rtsp-simple-server/internal/conf" "github.com/aler9/rtsp-simple-server/internal/hls" diff --git a/internal/core/hls_source_test.go b/internal/core/hls_source_test.go index 65603fb4..18bff390 100644 --- a/internal/core/hls_source_test.go +++ b/internal/core/hls_source_test.go @@ -13,7 +13,7 @@ import ( "github.com/aler9/gortsplib/pkg/h264" "github.com/asticode/go-astits" "github.com/gin-gonic/gin" - "github.com/pion/rtp/v2" + "github.com/pion/rtp" "github.com/stretchr/testify/require" ) diff --git a/internal/core/reader.go b/internal/core/reader.go index ef800554..2f632aff 100644 --- a/internal/core/reader.go +++ b/internal/core/reader.go @@ -1,7 +1,7 @@ package core import ( - "github.com/pion/rtp/v2" + "github.com/pion/rtp" ) // reader is an entity that can read a stream. diff --git a/internal/core/rtmp_conn.go b/internal/core/rtmp_conn.go index 62e53be8..b9d55bea 100644 --- a/internal/core/rtmp_conn.go +++ b/internal/core/rtmp_conn.go @@ -16,7 +16,7 @@ import ( "github.com/aler9/gortsplib/pkg/rtpaac" "github.com/aler9/gortsplib/pkg/rtph264" "github.com/notedit/rtmp/av" - "github.com/pion/rtp/v2" + "github.com/pion/rtp" "github.com/aler9/rtsp-simple-server/internal/conf" "github.com/aler9/rtsp-simple-server/internal/externalcmd" diff --git a/internal/core/rtsp_server_test.go b/internal/core/rtsp_server_test.go index 3131ba75..d899dd6a 100644 --- a/internal/core/rtsp_server_test.go +++ b/internal/core/rtsp_server_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/aler9/gortsplib" - "github.com/pion/rtp/v2" + "github.com/pion/rtp" "github.com/stretchr/testify/require" ) diff --git a/internal/core/rtsp_session.go b/internal/core/rtsp_session.go index 2e2b137c..939ec3c5 100644 --- a/internal/core/rtsp_session.go +++ b/internal/core/rtsp_session.go @@ -9,7 +9,7 @@ import ( "github.com/aler9/gortsplib" "github.com/aler9/gortsplib/pkg/base" - "github.com/pion/rtp/v2" + "github.com/pion/rtp" "github.com/aler9/rtsp-simple-server/internal/conf" "github.com/aler9/rtsp-simple-server/internal/externalcmd" diff --git a/internal/core/rtsp_source.go b/internal/core/rtsp_source.go index deda85d9..06f36cfb 100644 --- a/internal/core/rtsp_source.go +++ b/internal/core/rtsp_source.go @@ -14,7 +14,7 @@ import ( "github.com/aler9/gortsplib/pkg/base" "github.com/aler9/gortsplib/pkg/h264" "github.com/aler9/gortsplib/pkg/rtph264" - "github.com/pion/rtp/v2" + "github.com/pion/rtp" "github.com/aler9/rtsp-simple-server/internal/conf" "github.com/aler9/rtsp-simple-server/internal/logger" diff --git a/internal/core/rtsp_source_test.go b/internal/core/rtsp_source_test.go index f4ea80bb..dd590939 100644 --- a/internal/core/rtsp_source_test.go +++ b/internal/core/rtsp_source_test.go @@ -10,7 +10,7 @@ import ( "github.com/aler9/gortsplib/pkg/auth" "github.com/aler9/gortsplib/pkg/base" "github.com/aler9/gortsplib/pkg/rtph264" - "github.com/pion/rtp/v2" + "github.com/pion/rtp" "github.com/stretchr/testify/require" ) diff --git a/internal/core/stream.go b/internal/core/stream.go index 8e5920f3..036ee072 100644 --- a/internal/core/stream.go +++ b/internal/core/stream.go @@ -4,7 +4,7 @@ import ( "sync" "github.com/aler9/gortsplib" - "github.com/pion/rtp/v2" + "github.com/pion/rtp" ) type streamNonRTSPReadersMap struct {