diff --git a/datatrack/datatracktest/testutils.go b/datatrack/datatracktest/testutils.go index 86a59838a..ea29b5fa5 100644 --- a/datatrack/datatracktest/testutils.go +++ b/datatrack/datatracktest/testutils.go @@ -20,7 +20,6 @@ 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 { @@ -59,7 +58,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(livekit.DataTrackExtensionID_DTEI_PARTICIPANT_SID); err == nil { + if ext, err := extParticipantSid.Marshal(); err == nil { packet.AddExtension(ext) } } diff --git a/datatrack/extension_participant_sid.go b/datatrack/extension_participant_sid.go index 074055222..acac8384e 100644 --- a/datatrack/extension_participant_sid.go +++ b/datatrack/extension_participant_sid.go @@ -36,11 +36,11 @@ func (e *ExtensionParticipantSid) ParticipantID() livekit.ParticipantID { return e.participantID } -func (e *ExtensionParticipantSid) Marshal(extID livekit.DataTrackExtensionID) (Extension, error) { +func (e *ExtensionParticipantSid) Marshal() (Extension, error) { data := make([]byte, len(e.participantID)) copy(data, e.participantID) return Extension{ - id: uint8(extID), + id: uint8(livekit.DataTrackExtensionID_DTEI_PARTICIPANT_SID), data: data, }, nil } diff --git a/datatrack/extension_participant_sid_test.go b/datatrack/extension_participant_sid_test.go index 5fe168dcc..b2a58d04c 100644 --- a/datatrack/extension_participant_sid_test.go +++ b/datatrack/extension_participant_sid_test.go @@ -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(livekit.DataTrackExtensionID_DTEI_PARTICIPANT_SID) + ext, err := extParticipantSid.Marshal() require.NoError(t, err) require.Equal(t, expectedExt, ext) diff --git a/datatrack/packet_test.go b/datatrack/packet_test.go index a0f1efd3a..2f6faded0 100644 --- a/datatrack/packet_test.go +++ b/datatrack/packet_test.go @@ -73,7 +73,7 @@ func TestPacket(t *testing.T) { Payload: payload, } if extParticipantSid, err := NewExtensionParticipantSid("test_participant"); err == nil { - if ext, err := extParticipantSid.Marshal(livekit.DataTrackExtensionID_DTEI_PARTICIPANT_SID); err == nil { + if ext, err := extParticipantSid.Marshal(); err == nil { packet.AddExtension(ext) } } @@ -120,7 +120,7 @@ func TestPacket(t *testing.T) { Payload: payload, } if extParticipantSid, err := NewExtensionParticipantSid("participant"); err == nil { - if ext, err := extParticipantSid.Marshal(livekit.DataTrackExtensionID_DTEI_PARTICIPANT_SID); err == nil { + if ext, err := extParticipantSid.Marshal(); err == nil { packet.AddExtension(ext) } } @@ -166,7 +166,7 @@ func TestPacket(t *testing.T) { Payload: payload, } if extParticipantSid, err := NewExtensionParticipantSid("participant"); err == nil { - if ext, err := extParticipantSid.Marshal(livekit.DataTrackExtensionID_DTEI_PARTICIPANT_SID); err == nil { + if ext, err := extParticipantSid.Marshal(); err == nil { packet.AddExtension(ext) } } @@ -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(livekit.DataTrackExtensionID_DTEI_PARTICIPANT_SID); err == nil { + if ext, err := extParticipantSid.Marshal(); err == nil { packet.AddExtension(ext) } }