Skip to content

[pull] main from livekit:main #498

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
pull merged 1 commit into from
Sep 29, 2026
Merged

[pull] main from livekit:main #498

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
6 changes: 6 additions & 0 deletions .changeset/purple-dancers-relax.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"github.com/livekit/protocol": patch
"@livekit/protocol": patch
---

Data track extension ID collision: intermediate step.
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 @@ -82,7 +82,7 @@ func TestPacket(t *testing.T) {

expectedRawPacket := []byte{
0x14, 0x00, 0x0d, 0x05, 0x1a, 0x0a, 0x27, 0x0f,
0xde, 0xad, 0xbe, 0xef, 0x00, 0x04, 0x01, 0x10,
0xde, 0xad, 0xbe, 0xef, 0x00, 0x04, 0xff, 0x10,
0x74, 0x65, 0x73, 0x74, 0x5f, 0x70, 0x61, 0x72,
0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74,
0xff, 0xfe, 0xfd, 0xfc,
Expand Down Expand Up @@ -129,7 +129,7 @@ func TestPacket(t *testing.T) {

expectedRawPacket := []byte{
0x14, 0x00, 0x0d, 0x05, 0x1a, 0x0a, 0x27, 0x0f,
0xde, 0xad, 0xbe, 0xef, 0x00, 0x03, 0x01, 0x0b,
0xde, 0xad, 0xbe, 0xef, 0x00, 0x03, 0xff, 0x0b,
0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70,
0x61, 0x6e, 0x74, 0x00, 0xff, 0xfe, 0xfd, 0xfc,
}
Expand Down Expand Up @@ -175,7 +175,7 @@ func TestPacket(t *testing.T) {

expectedRawPacket := []byte{
0x14, 0x00, 0x0d, 0x05, 0x1a, 0x0a, 0x27, 0x0f,
0xde, 0xad, 0xbe, 0xef, 0x00, 0x03, 0x01, 0x0b,
0xde, 0xad, 0xbe, 0xef, 0x00, 0x03, 0xff, 0x0b,
0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70,
0x61, 0x6e, 0x74, 0x00, 0xff, 0xfe, 0xfd, 0xfc,
}
Expand All @@ -192,7 +192,7 @@ func TestPacket(t *testing.T) {

expectedRawPacket = []byte{
0x14, 0x00, 0x0d, 0x05, 0x1a, 0x0a, 0x27, 0x0f,
0xde, 0xad, 0xbe, 0xef, 0x00, 0x04, 0x01, 0x10,
0xde, 0xad, 0xbe, 0xef, 0x00, 0x04, 0xff, 0x10,
0x74, 0x65, 0x73, 0x74, 0x5f, 0x70, 0x61, 0x72,
0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74,
0xff, 0xfe, 0xfd, 0xfc,
Expand Down
18 changes: 10 additions & 8 deletions livekit/livekit_internal.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 13 additions & 9 deletions livekit/livekit_models.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion protobufs/livekit_internal.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ message NodeStats {

// forward metrics
uint32 forward_latency = 48;
uint32 forward_jitter = 49;
uint32 forward_jitter = 49 [deprecated = true];

repeated NodeStatsRate rates = 50;

Expand Down
3 changes: 2 additions & 1 deletion protobufs/livekit_models.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,8 @@ message DataTrackSchemaId {

enum DataTrackExtensionID {
DTEI_INVALID = 0;
DTEI_PARTICIPANT_SID = 1;
DTEI_PARTICIPANT_SID_LOW = 1;
DTEI_PARTICIPANT_SID = 255;
}

message DataTrackExtensionParticipantSid {
Expand Down
Loading