Skip to content

Export header extensions #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Export header extensions #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions packet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (

// Extension RTP Header extension
type Extension struct {
id uint8
payload []byte
ID uint8
Payload []byte
}

// Header represents an RTP packet header
Expand Down Expand Up @@ -175,7 +175,7 @@ func (h *Header) Unmarshal(buf []byte) (n int, err error) { //nolint:gocognit
break
}

extension := Extension{id: extid, payload: buf[n : n+payloadLen]}
extension := Extension{ID: extid, Payload: buf[n : n+payloadLen]}
h.Extensions = append(h.Extensions, extension)
n += payloadLen
}
Expand All @@ -195,7 +195,7 @@ func (h *Header) Unmarshal(buf []byte) (n int, err error) { //nolint:gocognit
payloadLen := int(buf[n])
n++

extension := Extension{id: extid, payload: buf[n : n+payloadLen]}
extension := Extension{ID: extid, Payload: buf[n : n+payloadLen]}
h.Extensions = append(h.Extensions, extension)
n += payloadLen
}
Expand All @@ -206,9 +206,9 @@ func (h *Header) Unmarshal(buf []byte) (n int, err error) { //nolint:gocognit
errHeaderSizeInsufficientForExtension, len(buf), n+extensionLength)
}

extension := Extension{id: 0, payload: buf[n : n+extensionLength]}
extension := Extension{ID: 0, Payload: buf[n : n+extensionLength]}
h.Extensions = append(h.Extensions, extension)
n += len(h.Extensions[0].payload)
n += len(h.Extensions[0].Payload)
}
}

Expand Down Expand Up @@ -307,26 +307,26 @@ func (h Header) MarshalTo(buf []byte) (n int, err error) {
// RFC 8285 RTP One Byte Header Extension
case extensionProfileOneByte:
for _, extension := range h.Extensions {
buf[n] = extension.id<<4 | (uint8(len(extension.payload)) - 1)
buf[n] = extension.ID<<4 | (uint8(len(extension.Payload)) - 1)
n++
n += copy(buf[n:], extension.payload)
n += copy(buf[n:], extension.Payload)
}
// RFC 8285 RTP Two Byte Header Extension
case extensionProfileTwoByte:
for _, extension := range h.Extensions {
buf[n] = extension.id
buf[n] = extension.ID
n++
buf[n] = uint8(len(extension.payload))
buf[n] = uint8(len(extension.Payload))
n++
n += copy(buf[n:], extension.payload)
n += copy(buf[n:], extension.Payload)
}
default: // RFC3550 Extension
extlen := len(h.Extensions[0].payload)
extlen := len(h.Extensions[0].Payload)
if extlen%4 != 0 {
// the payload must be in 32-bit words.
return 0, io.ErrShortBuffer
}
n += copy(buf[n:], h.Extensions[0].payload)
n += copy(buf[n:], h.Extensions[0].Payload)
}

// calculate extensions size and round to 4 bytes boundaries
Expand Down Expand Up @@ -357,15 +357,15 @@ func (h Header) MarshalSize() int {
// RFC 8285 RTP One Byte Header Extension
case extensionProfileOneByte:
for _, extension := range h.Extensions {
extSize += 1 + len(extension.payload)
extSize += 1 + len(extension.Payload)
}
// RFC 8285 RTP Two Byte Header Extension
case extensionProfileTwoByte:
for _, extension := range h.Extensions {
extSize += 2 + len(extension.payload)
extSize += 2 + len(extension.Payload)
}
default:
extSize += len(h.Extensions[0].payload)
extSize += len(h.Extensions[0].Payload)
}

// extensions size must have 4 bytes boundaries
Expand Down Expand Up @@ -403,12 +403,12 @@ func (h *Header) SetExtension(id uint8, payload []byte) error { //nolint:gocogni

// Update existing if it exists else add new extension
for i, extension := range h.Extensions {
if extension.id == id {
h.Extensions[i].payload = payload
if extension.ID == id {
h.Extensions[i].Payload = payload
return nil
}
}
h.Extensions = append(h.Extensions, Extension{id: id, payload: payload})
h.Extensions = append(h.Extensions, Extension{ID: id, Payload: payload})
return nil
}

Expand All @@ -422,7 +422,7 @@ func (h *Header) SetExtension(id uint8, payload []byte) error { //nolint:gocogni
h.ExtensionProfile = extensionProfileTwoByte
}

h.Extensions = append(h.Extensions, Extension{id: id, payload: payload})
h.Extensions = append(h.Extensions, Extension{ID: id, Payload: payload})
return nil
}

Expand All @@ -438,7 +438,7 @@ func (h *Header) GetExtensionIDs() []uint8 {

ids := make([]uint8, 0, len(h.Extensions))
for _, extension := range h.Extensions {
ids = append(ids, extension.id)
ids = append(ids, extension.ID)
}
return ids
}
Expand All @@ -449,8 +449,8 @@ func (h *Header) GetExtension(id uint8) []byte {
return nil
}
for _, extension := range h.Extensions {
if extension.id == id {
return extension.payload
if extension.ID == id {
return extension.Payload
}
}
return nil
Expand All @@ -462,7 +462,7 @@ func (h *Header) DelExtension(id uint8) error {
return errHeaderExtensionsNotEnabled
}
for i, extension := range h.Extensions {
if extension.id == id {
if extension.ID == id {
h.Extensions = append(h.Extensions[:i], h.Extensions[i+1:]...)
return nil
}
Expand Down Expand Up @@ -531,9 +531,9 @@ func (h Header) Clone() Header {
ext := make([]Extension, len(h.Extensions))
for i, e := range h.Extensions {
ext[i] = e
if e.payload != nil {
ext[i].payload = make([]byte, len(e.payload))
copy(ext[i].payload, e.payload)
if e.Payload != nil {
ext[i].Payload = make([]byte, len(e.Payload))
copy(ext[i].Payload, e.Payload)
}
}
clone.Extensions = ext
Expand Down
8 changes: 4 additions & 4 deletions packet_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1372,8 +1372,8 @@ func TestCloneHeader(t *testing.T) {
if len(clone.CSRC) == len(h.CSRC) {
t.Errorf("Expected CSRC to be unchanged")
}
h.Extensions[0].payload[0] = 0x1F
if clone.Extensions[0].payload[0] == 0x1F {
h.Extensions[0].Payload[0] = 0x1F
if clone.Extensions[0].Payload[0] == 0x1F {
t.Errorf("Expected Extensions to be unchanged")
}
}
Expand Down Expand Up @@ -1453,8 +1453,8 @@ func BenchmarkUnmarshal(b *testing.B) {
CSRC: []uint32{1, 2},
ExtensionProfile: extensionProfileTwoByte,
Extensions: []Extension{
{id: 1, payload: []byte{3, 4}},
{id: 2, payload: []byte{5, 6}},
{ID: 1, Payload: []byte{3, 4}},
{ID: 2, Payload: []byte{5, 6}},
},
},
Payload: []byte{
Expand Down
4 changes: 2 additions & 2 deletions packetizer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ func TestPacketizer_AbsSendTime(t *testing.T) {
ExtensionProfile: 0xBEDE,
Extensions: []Extension{
{
id: 1,
payload: []byte{0x40, 0, 0},
ID: 1,
Payload: []byte{0x40, 0, 0},
},
},
},
Expand Down