Deduplicate unwrapper

internal/sequencenumber/unwrapper_test.go

@@ -83,6 +83,14 @@ func TestUnwrapper(t *testing.T) {
 			input:    []uint16{32767, 0},
 			expected: []int64{32767, 0},
 		},
+		{
+			input:    []uint16{0, 1, 4, 3, 2, 5},
+			expected: []int64{0, 1, 4, 3, 2, 5},
+		},
+		{
+			input:    []uint16{65534, 0, 1, 65535, 4, 3, 2, 5},
+			expected: []int64{65534, 65536, 65537, 65535, 65540, 65539, 65538, 65541},
+		},
 		{
 			input: []uint16{
 				0, 32767, 32768, 32769, 32770,

pkg/rfc8888/stream_log.go

@@ -6,14 +6,15 @@ package rfc8888
 import (
 	"time"
 
+	"github.com/pion/interceptor/internal/sequencenumber"
 	"github.com/pion/rtcp"
 )
 
 const maxReportsPerReportBlock = 16384
 
 type streamLog struct {
 	ssrc                       uint32
-	sequence                   unwrapper
+	sequence                   sequencenumber.Unwrapper
 	init                       bool
 	nextSequenceNumberToReport int64 // next to report
 	lastSequenceNumberReceived int64 // highest received
@@ -23,7 +24,7 @@ type streamLog struct {
 func newStreamLog(ssrc uint32) *streamLog {
 	return &streamLog{
 		ssrc:                       ssrc,
-		sequence:                   unwrapper{},
+		sequence:                   sequencenumber.Unwrapper{},
 		init:                       false,
 		nextSequenceNumberToReport: 0,
 		lastSequenceNumberReceived: 0,
@@ -32,7 +33,7 @@ func newStreamLog(ssrc uint32) *streamLog {
 }
 
 func (l *streamLog) add(ts time.Time, sequenceNumber uint16, ecn uint8) {
-	unwrappedSequenceNumber := l.sequence.unwrap(sequenceNumber)
+	unwrappedSequenceNumber := l.sequence.Unwrap(sequenceNumber)
 	if !l.init {
 		l.init = true
 		l.nextSequenceNumberToReport = unwrappedSequenceNumber