fix encoding of RTP packets with padding

this fixes a SIGSEGV with GStreamer
2025-10-04 06:46:42 +08:00 · 2022-03-08 12:47:53 +01:00
parent 94aaa6719d
commit e12b22ae77
38 changed files with 52 additions and 36 deletions
--- a/client.go
+++ b/client.go
@@ -22,7 +22,7 @@ import (
 	"time"

 	"github.com/pion/rtcp"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"

 	"github.com/aler9/gortsplib/pkg/auth"
 	"github.com/aler9/gortsplib/pkg/base"
@@ -765,6 +765,10 @@ func (c *Client) runReader() {
 							return
 						}

+						// remove padding
+						pkt.Header.Padding = false
+						pkt.PaddingSize = 0
+
 						c.tracks[trackID].rtcpReceiver.ProcessPacketRTP(now, pkt)
 						c.OnPacketRTP(trackID, pkt)
 					} else {
--- a/client_publish_test.go
+++ b/client_publish_test.go
@@ -10,7 +10,7 @@ import (
 	"time"

 	"github.com/pion/rtcp"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 	"github.com/stretchr/testify/require"

 	"github.com/aler9/gortsplib/pkg/base"
--- a/client_read_test.go
+++ b/client_read_test.go
@@ -12,7 +12,7 @@ import (
 	"time"

 	"github.com/pion/rtcp"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/net/ipv4"

--- a/clientudpl.go
+++ b/clientudpl.go
@@ -183,6 +183,10 @@ func (u *clientUDPListener) processPlayRTP(now time.Time, payload []byte) {
 		return
 	}

+	// remove padding
+	pkt.Header.Padding = false
+	pkt.PaddingSize = 0
+
 	u.c.tracks[u.trackID].rtcpReceiver.ProcessPacketRTP(now, pkt)
 	u.c.OnPacketRTP(u.trackID, pkt)
 }
--- a/examples/client-publish-aac/main.go
+++ b/examples/client-publish-aac/main.go
@@ -5,7 +5,7 @@ import (
 	"net"

 	"github.com/aler9/gortsplib"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 )

 // This example shows how to
--- a/examples/client-publish-h264/main.go
+++ b/examples/client-publish-h264/main.go
@@ -6,7 +6,7 @@ import (

 	"github.com/aler9/gortsplib"
 	"github.com/aler9/gortsplib/pkg/rtph264"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 )

 // This example shows how to
--- a/examples/client-publish-options/main.go
+++ b/examples/client-publish-options/main.go
@@ -7,7 +7,7 @@ import (

 	"github.com/aler9/gortsplib"
 	"github.com/aler9/gortsplib/pkg/rtph264"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 )

 // This example shows how to
--- a/examples/client-publish-opus/main.go
+++ b/examples/client-publish-opus/main.go
@@ -5,7 +5,7 @@ import (
 	"net"

 	"github.com/aler9/gortsplib"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 )

 // This example shows how to
--- a/examples/client-publish-pause/main.go
+++ b/examples/client-publish-pause/main.go
@@ -7,7 +7,7 @@ import (

 	"github.com/aler9/gortsplib"
 	"github.com/aler9/gortsplib/pkg/rtph264"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 )

 // This example shows how to
--- a/examples/client-read-aac/main.go
+++ b/examples/client-read-aac/main.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aler9/gortsplib"
 	"github.com/aler9/gortsplib/pkg/base"
 	"github.com/aler9/gortsplib/pkg/rtpaac"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 )

 // This example shows how to
--- a/examples/client-read-h264-convert-to-jpeg/main.go
+++ b/examples/client-read-h264-convert-to-jpeg/main.go
@@ -11,7 +11,7 @@ import (
 	"github.com/aler9/gortsplib"
 	"github.com/aler9/gortsplib/pkg/base"
 	"github.com/aler9/gortsplib/pkg/rtph264"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 )

 // This example shows how to
--- a/examples/client-read-h264-save-to-disk/main.go
+++ b/examples/client-read-h264-save-to-disk/main.go
@@ -4,7 +4,7 @@ import (
 	"github.com/aler9/gortsplib"
 	"github.com/aler9/gortsplib/pkg/base"
 	"github.com/aler9/gortsplib/pkg/rtph264"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 )

 // This example shows how to
--- a/examples/client-read-h264/main.go
+++ b/examples/client-read-h264/main.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aler9/gortsplib"
 	"github.com/aler9/gortsplib/pkg/base"
 	"github.com/aler9/gortsplib/pkg/rtph264"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 )

 // This example shows how to
--- a/examples/client-read-options/main.go
+++ b/examples/client-read-options/main.go
@@ -6,7 +6,7 @@ import (

 	"github.com/aler9/gortsplib"
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 )

 // This example shows how to
--- a/examples/client-read-partial/main.go
+++ b/examples/client-read-partial/main.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aler9/gortsplib"
 	"github.com/aler9/gortsplib/pkg/base"
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 )

 // This example shows how to
--- a/examples/client-read-pause/main.go
+++ b/examples/client-read-pause/main.go
@@ -6,7 +6,7 @@ import (

 	"github.com/aler9/gortsplib"
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 )

 // This example shows how to
--- a/examples/client-read-republish/main.go
+++ b/examples/client-read-republish/main.go
@@ -5,7 +5,7 @@ import (

 	"github.com/aler9/gortsplib"
 	"github.com/aler9/gortsplib/pkg/base"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 )

 // This example shows how to
--- a/examples/client-read/main.go
+++ b/examples/client-read/main.go
@@ -5,7 +5,7 @@ import (

 	"github.com/aler9/gortsplib"
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 )

 // This example shows how to connect to a RTSP server
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/asticode/go-astits v1.10.0
 	github.com/icza/bitio v1.0.0
 	github.com/pion/rtcp v1.2.9
-	github.com/pion/rtp v1.7.4
+	github.com/pion/rtp/v2 v2.0.0-20220302185659-b3d10fc096b0
 	github.com/pion/sdp/v3 v3.0.2
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/net v0.0.0-20210610132358-84b48f89b13b
--- a/go.sum
+++ b/go.sum
@@ -12,8 +12,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 v1.7.4 h1:4dMbjb1SuynU5OpA3kz1zHK+u+eOCQjW3MAeVHf1ODA=
-github.com/pion/rtp v1.7.4/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
+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/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=
--- a/pkg/rtcpreceiver/rtcpreceiver.go
+++ b/pkg/rtcpreceiver/rtcpreceiver.go
@@ -7,7 +7,7 @@ import (
 	"time"

 	"github.com/pion/rtcp"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 )

 func randUint32() uint32 {
--- a/pkg/rtcpreceiver/rtcpreceiver_test.go
+++ b/pkg/rtcpreceiver/rtcpreceiver_test.go
@@ -5,7 +5,7 @@ import (
 	"time"

 	"github.com/pion/rtcp"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 	"github.com/stretchr/testify/require"
 )

--- a/pkg/rtcpsender/rtcpsender.go
+++ b/pkg/rtcpsender/rtcpsender.go
@@ -6,7 +6,7 @@ import (
 	"time"

 	"github.com/pion/rtcp"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 )

 // RTCPSender is a utility to generate RTCP sender reports.
--- a/pkg/rtcpsender/rtcpsender_test.go
+++ b/pkg/rtcpsender/rtcpsender_test.go
@@ -5,7 +5,7 @@ import (
 	"time"

 	"github.com/pion/rtcp"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 	"github.com/stretchr/testify/require"
 )

--- a/pkg/rtpaac/decoder.go
+++ b/pkg/rtpaac/decoder.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"

-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"

 	"github.com/aler9/gortsplib/pkg/rtptimedec"
 )
--- a/pkg/rtpaac/encoder.go
+++ b/pkg/rtpaac/encoder.go
@@ -5,7 +5,7 @@ import (
 	"encoding/binary"
 	"time"

-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 )

 const (
--- a/pkg/rtpaac/rtpaac_test.go
+++ b/pkg/rtpaac/rtpaac_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"

-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 	"github.com/stretchr/testify/require"
 )

--- a/pkg/rtph264/decoder.go
+++ b/pkg/rtph264/decoder.go
@@ -8,7 +8,7 @@ import (
 	"net"
 	"time"

-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"

 	"github.com/aler9/gortsplib/pkg/h264"
 	"github.com/aler9/gortsplib/pkg/rtptimedec"
--- a/pkg/rtph264/encoder.go
+++ b/pkg/rtph264/encoder.go
@@ -5,7 +5,7 @@ import (
 	"encoding/binary"
 	"time"

-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 )

 const (
--- a/pkg/rtph264/rtph264_test.go
+++ b/pkg/rtph264/rtph264_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"

-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 	"github.com/stretchr/testify/require"
 )

--- a/rtppacketmultibuffer.go
+++ b/rtppacketmultibuffer.go
@@ -1,7 +1,7 @@
 package gortsplib

 import (
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 )

 type rtpPacketMultiBuffer struct {
--- a/server_publish_test.go
+++ b/server_publish_test.go
@@ -9,7 +9,7 @@ import (
 	"time"

 	"github.com/pion/rtcp"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 	psdp "github.com/pion/sdp/v3"
 	"github.com/stretchr/testify/require"

--- a/server_read_test.go
+++ b/server_read_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"

-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"
 	psdp "github.com/pion/sdp/v3"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/net/ipv4"
--- a/serverconn.go
+++ b/serverconn.go
@@ -256,6 +256,10 @@ func (sc *ServerConn) readFuncTCP(readRequest chan readReq) error {
 					return
 				}

+				// remove padding
+				pkt.Header.Padding = false
+				pkt.PaddingSize = 0
+
 				if h, ok := sc.s.Handler.(ServerHandlerOnPacketRTP); ok {
 					h.OnPacketRTP(&ServerHandlerOnPacketRTPCtx{
 						Session: sc.session,
--- a/serverhandler.go
+++ b/serverhandler.go
@@ -2,7 +2,7 @@ package gortsplib

 import (
 	"github.com/pion/rtcp"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"

 	"github.com/aler9/gortsplib/pkg/base"
 )
--- a/serversession.go
+++ b/serversession.go
@@ -12,7 +12,7 @@ import (
 	"time"

 	"github.com/pion/rtcp"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"

 	"github.com/aler9/gortsplib/pkg/base"
 	"github.com/aler9/gortsplib/pkg/headers"
--- a/serverstream.go
+++ b/serverstream.go
@@ -6,7 +6,7 @@ import (
 	"time"

 	"github.com/pion/rtcp"
-	"github.com/pion/rtp"
+	"github.com/pion/rtp/v2"

 	"github.com/aler9/gortsplib/pkg/liberrors"
 )
--- a/serverudpl.go
+++ b/serverudpl.go
@@ -203,6 +203,10 @@ func (u *serverUDPListener) processRTP(clientData *clientData, payload []byte) {
 		return
 	}

+	// remove padding
+	pkt.Header.Padding = false
+	pkt.PaddingSize = 0
+
 	now := time.Now()
 	atomic.StoreInt64(clientData.ss.udpLastFrameTime, now.Unix())
 	clientData.ss.announcedTracks[clientData.trackID].rtcpReceiver.ProcessPacketRTP(now, pkt)