Rollback to v1

codecs/av1_packet.go

@@ -4,7 +4,7 @@
 package codecs
 
 import (
-	"github.com/pion/rtp/v2/pkg/obu"
+	"github.com/pion/rtp/pkg/obu"
 )
 
 const (

codecs/av1_packet_test.go

@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/pion/rtp/v2/pkg/obu"
+	"github.com/pion/rtp/pkg/obu"
 )
 
 func TestAV1_Marshal(t *testing.T) {

codecs/h264_packet.go

@@ -268,9 +268,18 @@ func (p *H264Packet) Unmarshal(payload []byte) ([]byte, error) {
 	return nil, fmt.Errorf("%w: %d", errUnhandledNALUType, naluType)
 }
 
-// H264PartitionHeadChecker is obsolete
+// H264PartitionHeadChecker checks H264 partition head.
+//
+// Deprecated: replaced by H264Packet.IsPartitionHead()
 type H264PartitionHeadChecker struct{}
 
+// IsPartitionHead checks if this is the head of a packetized nalu stream.
+//
+// Deprecated: replaced by H264Packet.IsPartitionHead()
+func (*H264PartitionHeadChecker) IsPartitionHead(packet []byte) bool {
+	return (&H264Packet{}).IsPartitionHead(packet)
+}
+
 // IsPartitionHead checks if this is the head of a packetized nalu stream.
 func (*H264Packet) IsPartitionHead(payload []byte) bool {
 	if len(payload) < 2 {

codecs/opus_packet.go

@@ -36,5 +36,14 @@ func (p *OpusPacket) Unmarshal(packet []byte) ([]byte, error) {
 	return packet, nil
 }
 
-// OpusPartitionHeadChecker is obsolete
+// OpusPartitionHeadChecker checks Opus partition head.
+//
+// Deprecated: replaced by OpusPacket.IsPartitionHead()
 type OpusPartitionHeadChecker struct{}
+
+// IsPartitionHead checks whether if this is a head of the Opus partition.
+//
+// Deprecated: replaced by OpusPacket.IsPartitionHead()
+func (*OpusPartitionHeadChecker) IsPartitionHead(packet []byte) bool {
+	return (&OpusPacket{}).IsPartitionHead(packet)
+}

codecs/vp8_packet.go

@@ -210,9 +210,18 @@ func (p *VP8Packet) Unmarshal(payload []byte) ([]byte, error) {
 	return p.Payload, nil
 }
 
-// VP8PartitionHeadChecker is obsolete
+// VP8PartitionHeadChecker checks VP8 partition head
+//
+// Deprecated: replaced by VP8Packet.IsPartitionHead()
 type VP8PartitionHeadChecker struct{}
 
+// IsPartitionHead checks whether if this is a head of the VP8 partition.
+//
+// Deprecated: replaced by VP8Packet.IsPartitionHead()
+func (*VP8PartitionHeadChecker) IsPartitionHead(packet []byte) bool {
+	return (&VP8Packet{}).IsPartitionHead(packet)
+}
+
 // IsPartitionHead checks whether if this is a head of the VP8 partition
 func (*VP8Packet) IsPartitionHead(payload []byte) bool {
 	if len(payload) < 1 {

codecs/vp9_packet.go

@@ -396,9 +396,18 @@ func (p *VP9Packet) parseSSData(packet []byte, pos int) (int, error) {
 	return pos, nil
 }
 
-// VP9PartitionHeadChecker is obsolete
+// VP9PartitionHeadChecker checks VP9 partition head.
+//
+// Deprecated: replaced by VP9Packet.IsPartitionHead()
 type VP9PartitionHeadChecker struct{}
 
+// IsPartitionHead checks whether if this is a head of the VP9 partition.
+//
+// Deprecated: replaced by VP9Packet.IsPartitionHead()
+func (*VP9PartitionHeadChecker) IsPartitionHead(packet []byte) bool {
+	return (&VP9Packet{}).IsPartitionHead(packet)
+}
+
 // IsPartitionHead checks whether if this is a head of the VP9 partition
 func (*VP9Packet) IsPartitionHead(payload []byte) bool {
 	if len(payload) < 1 {

go.mod

@@ -1,5 +1,5 @@
-module github.com/pion/rtp/v2
+module github.com/pion/rtp
 
-go 1.13
+go 1.19
 
 require github.com/pion/randutil v0.1.0

packet.go

@@ -16,11 +16,13 @@ type Extension struct {
 }
 
 // Header represents an RTP packet header
+// NOTE: PayloadOffset is populated by Marshal/Unmarshal and should not be modified
 type Header struct {
 	Version          uint8
 	Padding          bool
 	Extension        bool
 	Marker           bool
+	PayloadOffset    int
 	PayloadType      uint8
 	SequenceNumber   uint16
 	Timestamp        uint32
@@ -31,8 +33,10 @@ type Header struct {
 }
 
 // Packet represents an RTP Packet
+// NOTE: Raw is populated by Marshal/Unmarshal and should not be modified
 type Packet struct {
 	Header
+	Raw         []byte
 	Payload     []byte
 	PaddingSize byte
 }
@@ -78,10 +82,9 @@ func (p Packet) String() string {
 }
 
 // Unmarshal parses the passed byte slice and stores the result in the Header.
-// It returns the number of bytes read n and any error.
-func (h *Header) Unmarshal(buf []byte) (n int, err error) { //nolint:gocognit
+func (h *Header) Unmarshal(buf []byte) error { //nolint:gocognit
 	if len(buf) < headerLength {
-		return 0, fmt.Errorf("%w: %d < %d", errHeaderSizeInsufficient, len(buf), headerLength)
+		return fmt.Errorf("%w: %d < %d", errHeaderSizeInsufficient, len(buf), headerLength)
 	}
 
 	/*
@@ -109,10 +112,9 @@ func (h *Header) Unmarshal(buf []byte) (n int, err error) { //nolint:gocognit
 		h.CSRC = h.CSRC[:nCSRC]
 	}
 
-	n = csrcOffset + (nCSRC * csrcLength)
+	n := csrcOffset + (nCSRC * csrcLength)
 	if len(buf) < n {
-		return n, fmt.Errorf("size %d < %d: %w", len(buf), n,
-			errHeaderSizeInsufficient)
+		return fmt.Errorf("size %d < %d: %w", len(buf), n, errHeaderSizeInsufficient)
 	}
 
 	h.Marker = (buf[1] >> markerShift & markerMask) > 0
@@ -133,7 +135,7 @@ func (h *Header) Unmarshal(buf []byte) (n int, err error) { //nolint:gocognit
 
 	if h.Extension {
 		if expected := n + 4; len(buf) < expected {
-			return n, fmt.Errorf("size %d < %d: %w",
+			return fmt.Errorf("size %d < %d: %w",
 				len(buf), expected,
 				errHeaderSizeInsufficientForExtension,
 			)
@@ -145,7 +147,7 @@ func (h *Header) Unmarshal(buf []byte) (n int, err error) { //nolint:gocognit
 		n += 2
 
 		if expected := n + extensionLength; len(buf) < expected {
-			return n, fmt.Errorf("size %d < %d: %w",
+			return fmt.Errorf("size %d < %d: %w",
 				len(buf), expected,
 				errHeaderSizeInsufficientForExtension,
 			)
@@ -196,33 +198,38 @@ func (h *Header) Unmarshal(buf []byte) (n int, err error) { //nolint:gocognit
 
 		default: // RFC3550 Extension
 			if len(buf) < n+extensionLength {
-				return n, fmt.Errorf("%w: %d < %d",
-					errHeaderSizeInsufficientForExtension, len(buf), n+extensionLength)
+				return fmt.Errorf("%w: %d < %d", errHeaderSizeInsufficientForExtension, len(buf), n+extensionLength)
 			}
 
 			extension := Extension{id: 0, payload: buf[n : n+extensionLength]}
 			h.Extensions = append(h.Extensions, extension)
 			n += len(h.Extensions[0].payload)
 		}
 	}
-	return n, nil
+
+	h.PayloadOffset = n
+
+	return nil
 }
 
 // Unmarshal parses the passed byte slice and stores the result in the Packet.
 func (p *Packet) Unmarshal(buf []byte) error {
-	n, err := p.Header.Unmarshal(buf)
-	if err != nil {
+	if err := p.Header.Unmarshal(buf); err != nil {
 		return err
 	}
+
 	end := len(buf)
 	if p.Header.Padding {
 		p.PaddingSize = buf[end-1]
 		end -= int(p.PaddingSize)
 	}
-	if end < n {
+	if end < p.PayloadOffset {
 		return errTooSmall
 	}
-	p.Payload = buf[n:end]
+
+	p.Payload = buf[p.PayloadOffset:end]
+	p.Raw = buf
+
 	return nil
 }
 
@@ -234,6 +241,7 @@ func (h Header) Marshal() (buf []byte, err error) {
 	if err != nil {
 		return nil, err
 	}
+
 	return buf[:n], nil
 }
 
@@ -331,6 +339,8 @@ func (h Header) MarshalTo(buf []byte) (n int, err error) {
 		}
 	}
 
+	h.PayloadOffset = n
+
 	return n, nil
 }
 
@@ -472,7 +482,8 @@ func (p Packet) Marshal() (buf []byte, err error) {
 }
 
 // MarshalTo serializes the packet and writes to the buffer.
-func (p Packet) MarshalTo(buf []byte) (n int, err error) {
+func (p *Packet) MarshalTo(buf []byte) (n int, err error) {
+	p.Header.Padding = p.PaddingSize != 0
 	n, err = p.Header.MarshalTo(buf)
 	if err != nil {
 		return 0, err
@@ -484,6 +495,7 @@ func (p Packet) MarshalTo(buf []byte) (n int, err error) {
 	}
 
 	m := copy(buf[n:], p.Payload)
+	p.Raw = buf[:n+m]
 	if p.Header.Padding {
 		buf[n+m+int(p.PaddingSize-1)] = p.PaddingSize
 	}