Expose extension fields

jerry-tao · jerry-tao · commit 6be9623c166e · 2023-09-07T23:39:03.000+08:00
diff --git a/packet.go b/packet.go
@@ -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
@@ -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
 			}
@@ -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
 			}
@@ -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)
 		}
 	}
 
@@ -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
@@ -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
@@ -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
 	}
 
@@ -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
 }
 
@@ -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
 }
@@ -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
@@ -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
 		}
@@ -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
diff --git a/packet_test.go b/packet_test.go
@@ -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")
 	}
 }
@@ -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{
diff --git a/packetizer_test.go b/packetizer_test.go
@@ -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},
 				},
 			},
 		},

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ import (`
`11`	`11`
`12`	`12`	`// Extension RTP Header extension`
`13`	`13`	`type Extension struct {`
`14`		`- id uint8`
`15`		`- payload []byte`
	`14`	`+ ID uint8`
	`15`	`+ Payload []byte`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`// Header represents an RTP packet header`
`@@ -175,7 +175,7 @@ func (h *Header) Unmarshal(buf []byte) (n int, err error) { //nolint:gocognit`
`175`	`175`	`break`
`176`	`176`	`}`
`177`	`177`
`178`		`- extension := Extension{id: extid, payload: buf[n : n+payloadLen]}`
	`178`	`+ extension := Extension{ID: extid, Payload: buf[n : n+payloadLen]}`
`179`	`179`	`h.Extensions = append(h.Extensions, extension)`
`180`	`180`	`n += payloadLen`
`181`	`181`	`}`
`@@ -195,7 +195,7 @@ func (h *Header) Unmarshal(buf []byte) (n int, err error) { //nolint:gocognit`
`195`	`195`	`payloadLen := int(buf[n])`
`196`	`196`	`n++`
`197`	`197`
`198`		`- extension := Extension{id: extid, payload: buf[n : n+payloadLen]}`
	`198`	`+ extension := Extension{ID: extid, Payload: buf[n : n+payloadLen]}`
`199`	`199`	`h.Extensions = append(h.Extensions, extension)`
`200`	`200`	`n += payloadLen`
`201`	`201`	`}`
`@@ -206,9 +206,9 @@ func (h *Header) Unmarshal(buf []byte) (n int, err error) { //nolint:gocognit`
`206`	`206`	`errHeaderSizeInsufficientForExtension, len(buf), n+extensionLength)`
`207`	`207`	`}`
`208`	`208`
`209`		`- extension := Extension{id: 0, payload: buf[n : n+extensionLength]}`
	`209`	`+ extension := Extension{ID: 0, Payload: buf[n : n+extensionLength]}`
`210`	`210`	`h.Extensions = append(h.Extensions, extension)`
`211`		`- n += len(h.Extensions[0].payload)`
	`211`	`+ n += len(h.Extensions[0].Payload)`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`
`@@ -307,26 +307,26 @@ func (h Header) MarshalTo(buf []byte) (n int, err error) {`
`307`	`307`	`// RFC 8285 RTP One Byte Header Extension`
`308`	`308`	`case extensionProfileOneByte:`
`309`	`309`	`for _, extension := range h.Extensions {`
`310`		`- buf[n] = extension.id<<4 \| (uint8(len(extension.payload)) - 1)`
	`310`	`+ buf[n] = extension.ID<<4 \| (uint8(len(extension.Payload)) - 1)`
`311`	`311`	`n++`
`312`		`- n += copy(buf[n:], extension.payload)`
	`312`	`+ n += copy(buf[n:], extension.Payload)`
`313`	`313`	`}`
`314`	`314`	`// RFC 8285 RTP Two Byte Header Extension`
`315`	`315`	`case extensionProfileTwoByte:`
`316`	`316`	`for _, extension := range h.Extensions {`
`317`		`- buf[n] = extension.id`
	`317`	`+ buf[n] = extension.ID`
`318`	`318`	`n++`
`319`		`- buf[n] = uint8(len(extension.payload))`
	`319`	`+ buf[n] = uint8(len(extension.Payload))`
`320`	`320`	`n++`
`321`		`- n += copy(buf[n:], extension.payload)`
	`321`	`+ n += copy(buf[n:], extension.Payload)`
`322`	`322`	`}`
`323`	`323`	`default: // RFC3550 Extension`
`324`		`- extlen := len(h.Extensions[0].payload)`
	`324`	`+ extlen := len(h.Extensions[0].Payload)`
`325`	`325`	`if extlen%4 != 0 {`
`326`	`326`	`// the payload must be in 32-bit words.`
`327`	`327`	`return 0, io.ErrShortBuffer`
`328`	`328`	`}`
`329`		`- n += copy(buf[n:], h.Extensions[0].payload)`
	`329`	`+ n += copy(buf[n:], h.Extensions[0].Payload)`
`330`	`330`	`}`
`331`	`331`
`332`	`332`	`// calculate extensions size and round to 4 bytes boundaries`
`@@ -357,15 +357,15 @@ func (h Header) MarshalSize() int {`
`357`	`357`	`// RFC 8285 RTP One Byte Header Extension`
`358`	`358`	`case extensionProfileOneByte:`
`359`	`359`	`for _, extension := range h.Extensions {`
`360`		`- extSize += 1 + len(extension.payload)`
	`360`	`+ extSize += 1 + len(extension.Payload)`
`361`	`361`	`}`
`362`	`362`	`// RFC 8285 RTP Two Byte Header Extension`
`363`	`363`	`case extensionProfileTwoByte:`
`364`	`364`	`for _, extension := range h.Extensions {`
`365`		`- extSize += 2 + len(extension.payload)`
	`365`	`+ extSize += 2 + len(extension.Payload)`
`366`	`366`	`}`
`367`	`367`	`default:`
`368`		`- extSize += len(h.Extensions[0].payload)`
	`368`	`+ extSize += len(h.Extensions[0].Payload)`
`369`	`369`	`}`
`370`	`370`
`371`	`371`	`// extensions size must have 4 bytes boundaries`
`@@ -403,12 +403,12 @@ func (h *Header) SetExtension(id uint8, payload []byte) error { //nolint:gocogni`
`403`	`403`
`404`	`404`	`// Update existing if it exists else add new extension`
`405`	`405`	`for i, extension := range h.Extensions {`
`406`		`- if extension.id == id {`
`407`		`- h.Extensions[i].payload = payload`
	`406`	`+ if extension.ID == id {`
	`407`	`+ h.Extensions[i].Payload = payload`
`408`	`408`	`return nil`
`409`	`409`	`}`
`410`	`410`	`}`
`411`		`- h.Extensions = append(h.Extensions, Extension{id: id, payload: payload})`
	`411`	`+ h.Extensions = append(h.Extensions, Extension{ID: id, Payload: payload})`
`412`	`412`	`return nil`
`413`	`413`	`}`
`414`	`414`
`@@ -422,7 +422,7 @@ func (h *Header) SetExtension(id uint8, payload []byte) error { //nolint:gocogni`
`422`	`422`	`h.ExtensionProfile = extensionProfileTwoByte`
`423`	`423`	`}`
`424`	`424`
`425`		`- h.Extensions = append(h.Extensions, Extension{id: id, payload: payload})`
	`425`	`+ h.Extensions = append(h.Extensions, Extension{ID: id, Payload: payload})`
`426`	`426`	`return nil`
`427`	`427`	`}`
`428`	`428`
`@@ -438,7 +438,7 @@ func (h *Header) GetExtensionIDs() []uint8 {`
`438`	`438`
`439`	`439`	`ids := make([]uint8, 0, len(h.Extensions))`
`440`	`440`	`for _, extension := range h.Extensions {`
`441`		`- ids = append(ids, extension.id)`
	`441`	`+ ids = append(ids, extension.ID)`
`442`	`442`	`}`
`443`	`443`	`return ids`
`444`	`444`	`}`
`@@ -449,8 +449,8 @@ func (h *Header) GetExtension(id uint8) []byte {`
`449`	`449`	`return nil`
`450`	`450`	`}`
`451`	`451`	`for _, extension := range h.Extensions {`
`452`		`- if extension.id == id {`
`453`		`- return extension.payload`
	`452`	`+ if extension.ID == id {`
	`453`	`+ return extension.Payload`
`454`	`454`	`}`
`455`	`455`	`}`
`456`	`456`	`return nil`
`@@ -462,7 +462,7 @@ func (h *Header) DelExtension(id uint8) error {`
`462`	`462`	`return errHeaderExtensionsNotEnabled`
`463`	`463`	`}`
`464`	`464`	`for i, extension := range h.Extensions {`
`465`		`- if extension.id == id {`
	`465`	`+ if extension.ID == id {`
`466`	`466`	`h.Extensions = append(h.Extensions[:i], h.Extensions[i+1:]...)`
`467`	`467`	`return nil`
`468`	`468`	`}`
`@@ -531,9 +531,9 @@ func (h Header) Clone() Header {`
`531`	`531`	`ext := make([]Extension, len(h.Extensions))`
`532`	`532`	`for i, e := range h.Extensions {`
`533`	`533`	`ext[i] = e`
`534`		`- if e.payload != nil {`
`535`		`- ext[i].payload = make([]byte, len(e.payload))`
`536`		`- copy(ext[i].payload, e.payload)`
	`534`	`+ if e.Payload != nil {`
	`535`	`+ ext[i].Payload = make([]byte, len(e.Payload))`
	`536`	`+ copy(ext[i].Payload, e.Payload)`
`537`	`537`	`}`
`538`	`538`	`}`
`539`	`539`	`clone.Extensions = ext`