Skip to content

Pass extension ID to Marshal during the compatbility phase. #1826

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

Merged
boks1971 merged 1 commit into from
Sep 29, 2026
Merged

Pass extension ID to Marshal during the compatbility phase. #1826

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
3 changes: 2 additions & 1 deletion datatrack/datatracktest/testutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"time"

"github.com/livekit/protocol/datatrack"
"github.com/livekit/protocol/livekit"
)

func GenerateRawDataPackets(handle uint16, seqNum uint16, frameNum uint16, numFrames int, frameSize int, frameDuration time.Duration) [][]byte {
Expand Down Expand Up @@ -58,7 +59,7 @@ func GenerateRawDataPackets(handle uint16, seqNum uint16, frameNum uint16, numFr
Payload: payload,
}
if extParticipantSid, err := datatrack.NewExtensionParticipantSid("test_participant"); err == nil {
if ext, err := extParticipantSid.Marshal(); err == nil {
if ext, err := extParticipantSid.Marshal(livekit.DataTrackExtensionID_DTEI_PARTICIPANT_SID); err == nil {
packet.AddExtension(ext)
}
}
Expand Down
4 changes: 2 additions & 2 deletions datatrack/extension_participant_sid.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ func (e *ExtensionParticipantSid) ParticipantID() livekit.ParticipantID {
return e.participantID
}

func (e *ExtensionParticipantSid) Marshal() (Extension, error) {
func (e *ExtensionParticipantSid) Marshal(extID livekit.DataTrackExtensionID) (Extension, error) {
data := make([]byte, len(e.participantID))
copy(data, e.participantID)
return Extension{
id: uint8(livekit.DataTrackExtensionID_DTEI_PARTICIPANT_SID),
id: uint8(extID),
data: data,
}, nil
}
Expand Down
2 changes: 1 addition & 1 deletion datatrack/extension_participant_sid_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestExtensionParticipantSid(t *testing.T) {
id: uint8(livekit.DataTrackExtensionID_DTEI_PARTICIPANT_SID),
data: []byte{'t', 'e', 's', 't'},
}
ext, err := extParticipantSid.Marshal()
ext, err := extParticipantSid.Marshal(livekit.DataTrackExtensionID_DTEI_PARTICIPANT_SID)
require.NoError(t, err)
require.Equal(t, expectedExt, ext)

Expand Down
8 changes: 4 additions & 4 deletions datatrack/packet_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func TestPacket(t *testing.T) {
Payload: payload,
}
if extParticipantSid, err := NewExtensionParticipantSid("test_participant"); err == nil {
if ext, err := extParticipantSid.Marshal(); err == nil {
if ext, err := extParticipantSid.Marshal(livekit.DataTrackExtensionID_DTEI_PARTICIPANT_SID); err == nil {
packet.AddExtension(ext)
}
}
Expand Down Expand Up @@ -120,7 +120,7 @@ func TestPacket(t *testing.T) {
Payload: payload,
}
if extParticipantSid, err := NewExtensionParticipantSid("participant"); err == nil {
if ext, err := extParticipantSid.Marshal(); err == nil {
if ext, err := extParticipantSid.Marshal(livekit.DataTrackExtensionID_DTEI_PARTICIPANT_SID); err == nil {
packet.AddExtension(ext)
}
}
Expand Down Expand Up @@ -166,7 +166,7 @@ func TestPacket(t *testing.T) {
Payload: payload,
}
if extParticipantSid, err := NewExtensionParticipantSid("participant"); err == nil {
if ext, err := extParticipantSid.Marshal(); err == nil {
if ext, err := extParticipantSid.Marshal(livekit.DataTrackExtensionID_DTEI_PARTICIPANT_SID); err == nil {
packet.AddExtension(ext)
}
}
Expand All @@ -183,7 +183,7 @@ func TestPacket(t *testing.T) {

// replace existing extension ID and ensure that marshalled packet is updated
if extParticipantSid, err := NewExtensionParticipantSid("test_participant"); err == nil {
if ext, err := extParticipantSid.Marshal(); err == nil {
if ext, err := extParticipantSid.Marshal(livekit.DataTrackExtensionID_DTEI_PARTICIPANT_SID); err == nil {
packet.AddExtension(ext)
}
}
Expand Down
Loading