Rollback pion/rtp to v0

Sean-Der · Sean-Der · commit cffa6afc3426 · 2021-08-02T18:05:45.000-04:00
Resolves pion#1908
diff --git a/examples/rtp-forwarder/main.go b/examples/rtp-forwarder/main.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/pion/interceptor"
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 	"github.com/pion/webrtc/v3"
 	"github.com/pion/webrtc/v3/examples/internal/signal"
 )
diff --git a/examples/swap-tracks/main.go b/examples/swap-tracks/main.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 	"github.com/pion/webrtc/v3"
 	"github.com/pion/webrtc/v3/examples/internal/signal"
 )
diff --git a/go.mod b/go.mod
@@ -8,14 +8,14 @@ require (
 	github.com/pion/datachannel v1.4.21
 	github.com/pion/dtls/v2 v2.0.9
 	github.com/pion/ice/v2 v2.1.10
-	github.com/pion/interceptor v0.0.14
+	github.com/pion/interceptor v0.0.15
 	github.com/pion/logging v0.2.2
 	github.com/pion/randutil v0.1.0
 	github.com/pion/rtcp v1.2.6
-	github.com/pion/rtp/v2 v2.0.0
+	github.com/pion/rtp v1.7.0
 	github.com/pion/sctp v1.7.12
 	github.com/pion/sdp/v3 v3.0.4
-	github.com/pion/srtp/v2 v2.0.3
+	github.com/pion/srtp/v2 v2.0.5
 	github.com/pion/transport v0.12.3
 	github.com/sclevine/agouti v3.0.0+incompatible
 	github.com/stretchr/testify v1.7.0
diff --git a/go.sum b/go.sum
@@ -43,8 +43,8 @@ github.com/pion/dtls/v2 v2.0.9 h1:7Ow+V++YSZQMYzggI0P9vLJz/hUFcffsfGMfT/Qy+u8=
 github.com/pion/dtls/v2 v2.0.9/go.mod h1:O0Wr7si/Zj5/EBFlDzDd6UtVxx25CE1r7XM7BQKYQho=
 github.com/pion/ice/v2 v2.1.10 h1:Jt/BfUsaP+Dr6E5rbsy+w7w1JtHyFN0w2DkgfWq7Fko=
 github.com/pion/ice/v2 v2.1.10/go.mod h1:kV4EODVD5ux2z8XncbLHIOtcXKtYXVgLVCeVqnpoeP0=
-github.com/pion/interceptor v0.0.14 h1:gZqh9DMqE+UAnct37CfvAJj7KyYpKaFe9JkYOKMrHFU=
-github.com/pion/interceptor v0.0.14/go.mod h1:brot6Cq/5/C8oQM+NwftyvCNZWYtIVRucQ67+adgA7g=
+github.com/pion/interceptor v0.0.15 h1:pQFkBUL8akUHiGoFr+pM94Q/15x7sLFh0K3Nj+DCC6s=
+github.com/pion/interceptor v0.0.15/go.mod h1:pg3J253eGi5bqyKzA74+ej5Y19ez2jkWANVnF+Z9Dfk=
 github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
 github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
 github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw=
@@ -53,15 +53,15 @@ 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.6 h1:1zvwBbyd0TeEuuWftrd/4d++m+/kZSeiguxU61LFWpo=
 github.com/pion/rtcp v1.2.6/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0=
-github.com/pion/rtp/v2 v2.0.0 h1:8s4xPETm04IugKZaykpJnJ8LAGDLOQpsIpRXMzgM6Ow=
-github.com/pion/rtp/v2 v2.0.0/go.mod h1:Vj+rrFbJCT3yxqE/VSwaOo9DQ2pMKGPxuE7hplGOlOs=
+github.com/pion/rtp v1.7.0 h1:UTiTgxegU97lq6oDCyBOMjR8+iZr68KN0+rBzWYEWg0=
+github.com/pion/rtp v1.7.0/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
 github.com/pion/sctp v1.7.10/go.mod h1:EhpTUQu1/lcK3xI+eriS6/96fWetHGCvBi9MSsnaBN0=
 github.com/pion/sctp v1.7.12 h1:GsatLufywVruXbZZT1CKg+Jr8ZTkwiPnmUC/oO9+uuY=
 github.com/pion/sctp v1.7.12/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
 github.com/pion/sdp/v3 v3.0.4 h1:2Kf+dgrzJflNCSw3TV5v2VLeI0s/qkzy2r5jlR0wzf8=
 github.com/pion/sdp/v3 v3.0.4/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk=
-github.com/pion/srtp/v2 v2.0.3 h1:MUnSpDGPezbthRMTcjYouIrOIIvDqFZwAmLs1agcrcE=
-github.com/pion/srtp/v2 v2.0.3/go.mod h1:2WNQl3ijuEAkDYfTpW8BXkfOey8zIYsoqemr6cYmdVw=
+github.com/pion/srtp/v2 v2.0.5 h1:ks3wcTvIUE/GHndO3FAvROQ9opy0uLELpwHJaQ1yqhQ=
+github.com/pion/srtp/v2 v2.0.5/go.mod h1:8k6AJlal740mrZ6WYxc4Dg6qDqqhxoRG2GSjlUhDF0A=
 github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg=
 github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA=
 github.com/pion/transport v0.10.1/go.mod h1:PBis1stIILMiis0PewDw91WJeLJkyIMcEk+DwKOzf4A=
diff --git a/interceptor.go b/interceptor.go
@@ -8,7 +8,7 @@ import (
 	"github.com/pion/interceptor"
 	"github.com/pion/interceptor/pkg/nack"
 	"github.com/pion/interceptor/pkg/report"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 // RegisterDefaultInterceptors will register some useful interceptors.
diff --git a/interceptor_test.go b/interceptor_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/pion/interceptor"
 	mock_interceptor "github.com/pion/interceptor/pkg/mock"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 	"github.com/pion/transport/test"
 	"github.com/pion/webrtc/v3/pkg/media"
 	"github.com/stretchr/testify/assert"
diff --git a/mediaengine.go b/mediaengine.go
@@ -9,8 +9,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/pion/rtp/v2"
-	"github.com/pion/rtp/v2/codecs"
+	"github.com/pion/rtp"
+	"github.com/pion/rtp/codecs"
 	"github.com/pion/sdp/v3"
 	"github.com/pion/webrtc/v3/internal/fmtp"
 )
diff --git a/peerconnection_go_test.go b/peerconnection_go_test.go
@@ -19,7 +19,7 @@ import (
 	"time"
 
 	"github.com/pion/ice/v2"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 	"github.com/pion/transport/test"
 	"github.com/pion/transport/vnet"
 	"github.com/pion/webrtc/v3/internal/util"
diff --git a/peerconnection_media_test.go b/peerconnection_media_test.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/pion/randutil"
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 	"github.com/pion/transport/test"
 	"github.com/pion/webrtc/v3/pkg/media"
 	"github.com/stretchr/testify/assert"
diff --git a/pkg/media/h264writer/h264writer.go b/pkg/media/h264writer/h264writer.go
@@ -7,8 +7,8 @@ import (
 	"io"
 	"os"
 
-	"github.com/pion/rtp/v2"
-	"github.com/pion/rtp/v2/codecs"
+	"github.com/pion/rtp"
+	"github.com/pion/rtp/codecs"
 )
 
 type (
diff --git a/pkg/media/h264writer/h264writer_test.go b/pkg/media/h264writer/h264writer_test.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/media/ivfwriter/ivfwriter.go b/pkg/media/ivfwriter/ivfwriter.go
@@ -7,8 +7,8 @@ import (
 	"io"
 	"os"
 
-	"github.com/pion/rtp/v2"
-	"github.com/pion/rtp/v2/codecs"
+	"github.com/pion/rtp"
+	"github.com/pion/rtp/codecs"
 )
 
 var (
diff --git a/pkg/media/ivfwriter/ivfwriter_test.go b/pkg/media/ivfwriter/ivfwriter_test.go
@@ -5,8 +5,8 @@ import (
 	"io"
 	"testing"
 
-	"github.com/pion/rtp/v2"
-	"github.com/pion/rtp/v2/codecs"
+	"github.com/pion/rtp"
+	"github.com/pion/rtp/codecs"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/media/media.go b/pkg/media/media.go
@@ -4,7 +4,7 @@ package media
 import (
 	"time"
 
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 // A Sample contains encoded media and timing information
diff --git a/pkg/media/oggwriter/oggwriter.go b/pkg/media/oggwriter/oggwriter.go
@@ -8,8 +8,8 @@ import (
 	"os"
 
 	"github.com/pion/randutil"
-	"github.com/pion/rtp/v2"
-	"github.com/pion/rtp/v2/codecs"
+	"github.com/pion/rtp"
+	"github.com/pion/rtp/codecs"
 )
 
 const (
diff --git a/pkg/media/oggwriter/oggwriter_test.go b/pkg/media/oggwriter/oggwriter_test.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/media/samplebuilder/samplebuilder.go b/pkg/media/samplebuilder/samplebuilder.go
@@ -5,7 +5,7 @@ import (
 	"math"
 	"time"
 
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 	"github.com/pion/webrtc/v3/pkg/media"
 )
 
diff --git a/pkg/media/samplebuilder/samplebuilder_test.go b/pkg/media/samplebuilder/samplebuilder_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 	"github.com/pion/webrtc/v3/pkg/media"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/rtpsender.go b/rtpsender.go
@@ -10,7 +10,7 @@ import (
 	"github.com/pion/interceptor"
 	"github.com/pion/randutil"
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 // RTPSender allows an application to control how a given Track is encoded and transmitted to a remote peer
diff --git a/rtptransceiver.go b/rtptransceiver.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 // RTPTransceiver represents a combination of an RTPSender and an RTPReceiver that share a common mid.
diff --git a/srtp_writer_future.go b/srtp_writer_future.go
@@ -7,7 +7,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 	"github.com/pion/srtp/v2"
 )
 
diff --git a/track_local.go b/track_local.go
@@ -1,6 +1,6 @@
 package webrtc
 
-import "github.com/pion/rtp/v2"
+import "github.com/pion/rtp"
 
 // TrackLocalWriter is the Writer for outbound RTP Packets
 type TrackLocalWriter interface {
diff --git a/track_local_static.go b/track_local_static.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 	"github.com/pion/webrtc/v3/internal/util"
 	"github.com/pion/webrtc/v3/pkg/media"
 )
diff --git a/track_local_static_test.go b/track_local_static_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 	"github.com/pion/transport/test"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/track_remote.go b/track_remote.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/pion/interceptor"
-	"github.com/pion/rtp/v2"
+	"github.com/pion/rtp"
 )
 
 // TrackRemote represents a single inbound source of media

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`
`11`	`11`	`"github.com/pion/interceptor"`
`12`	`12`	`"github.com/pion/rtcp"`
`13`		`- "github.com/pion/rtp/v2"`
	`13`	`+ "github.com/pion/rtp"`
`14`	`14`	`"github.com/pion/webrtc/v3"`
`15`	`15`	`"github.com/pion/webrtc/v3/examples/internal/signal"`
`16`	`16`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"github.com/pion/interceptor"`
`9`	`9`	`"github.com/pion/interceptor/pkg/nack"`
`10`	`10`	`"github.com/pion/interceptor/pkg/report"`
`11`		`- "github.com/pion/rtp/v2"`
	`11`	`+ "github.com/pion/rtp"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// RegisterDefaultInterceptors will register some useful interceptors.`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`	`"io"`
`8`	`8`	`"os"`
`9`	`9`
`10`		`- "github.com/pion/rtp/v2"`
`11`		`- "github.com/pion/rtp/v2/codecs"`
	`10`	`+ "github.com/pion/rtp"`
	`11`	`+ "github.com/pion/rtp/codecs"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`type (`