Update pions/rtcp to v1.1.0

Update module and use new compound packet API
pion · Mar 7, 2019 · 1470af3 · 1470af3
1 parent 678a09e
commit 1470af3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/go.mod b/go.mod
@@ -1,7 +1,7 @@
 module github.com/pions/srtp
 
 require (
-	github.com/pions/rtcp v1.0.0
+	github.com/pions/rtcp v1.1.0
 	github.com/pions/rtp v1.0.1
 	github.com/pkg/errors v0.8.1
 	github.com/stretchr/testify v1.3.0

diff --git a/go.sum b/go.sum
@@ -1,7 +1,7 @@
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/pions/rtcp v1.0.0 h1:kYGe6RegZ63yVDkqXaru1+kHZAqHEufP3zfRAGKPycI=
-github.com/pions/rtcp v1.0.0/go.mod h1:Q5twXlqiz775Yn37X0cl4lAsfSk8EiHgeNkte59jBY4=
+github.com/pions/rtcp v1.1.0 h1:WJarRpNaGE7aScgTXARaNIObMhIbftcbiPuhhqvDtl4=
+github.com/pions/rtcp v1.1.0/go.mod h1:Q5twXlqiz775Yn37X0cl4lAsfSk8EiHgeNkte59jBY4=
 github.com/pions/rtp v1.0.1 h1:NJyBplPVXSkW+nL/4m8ofF1XvgNIEhoyUnlTontmOCo=
 github.com/pions/rtp v1.0.1/go.mod h1:GDIt4UYlSz7za4vfaLqihGJJ+yLvgPshnqrF/lm3vcM=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=

diff --git a/session_srtcp.go b/session_srtcp.go
@@ -102,22 +102,17 @@ func (s *SessionSRTCP) decrypt(buf []byte) error {
 		return err
 	}
 
-	compoundPacket := rtcp.NewReader(bytes.NewReader(decrypted))
+	compoundPacket := rtcp.NewDecoder(bytes.NewReader(decrypted))
 	for {
-		_, rawrtcp, err := compoundPacket.ReadPacket()
+
+		report, err := compoundPacket.DecodePacket()
 		if err != nil {
 			if err == io.EOF {
 				return nil
 			}
 			return err
 		}
 
-		var report rtcp.Packet
-		report, _, err = rtcp.Unmarshal(rawrtcp)
-		if err != nil {
-			return err
-		}
-
 		for _, ssrc := range report.DestinationSSRC() {
 			r, isNew := s.session.getOrCreateReadStream(ssrc, s, newReadStreamSRTCP)
 			if r == nil {