Skip to content

[pull] master from livekit:master #904

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 2 commits into from
Sep 19, 2025
Merged

[pull] master from livekit:master #904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7f9287
Avoid matching on empty track id. (#3937)
boks1971 Sep 19, 2025
b07e7a3
Use difference in key frame counter to stop seeder. (#3936)
boks1971 Sep 19, 2025
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
30 changes: 18 additions & 12 deletions pkg/rtc/mediatrack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,30 +232,36 @@ func (t *MediaTrack) ClearSubscriberNodes() {
}

func (t *MediaTrack) HasSignalCid(cid string) bool {
ti := t.MediaTrackReceiver.TrackInfoClone()
for _, c := range ti.Codecs {
if c.Cid == cid {
return true
if cid != "" {
ti := t.MediaTrackReceiver.TrackInfoClone()
for _, c := range ti.Codecs {
if c.Cid == cid {
return true
}
}
}
return false
}

func (t *MediaTrack) HasSdpCid(cid string) bool {
ti := t.MediaTrackReceiver.TrackInfoClone()
for _, c := range ti.Codecs {
if c.Cid == cid || c.SdpCid == cid {
return true
if cid != "" {
ti := t.MediaTrackReceiver.TrackInfoClone()
for _, c := range ti.Codecs {
if c.Cid == cid || c.SdpCid == cid {
return true
}
}
}
return false
}

func (t *MediaTrack) GetMimeTypeForSdpCid(cid string) mime.MimeType {
ti := t.MediaTrackReceiver.TrackInfoClone()
for _, c := range ti.Codecs {
if c.Cid == cid || c.SdpCid == cid {
return mime.NormalizeMimeType(c.MimeType)
if cid != "" {
ti := t.MediaTrackReceiver.TrackInfoClone()
for _, c := range ti.Codecs {
if c.Cid == cid || c.SdpCid == cid {
return mime.NormalizeMimeType(c.MimeType)
}
}
}
return mime.MimeTypeUnknown
Expand Down
15 changes: 10 additions & 5 deletions pkg/sfu/buffer/buffer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1343,6 +1343,14 @@ func (b *Buffer) seedKeyFrame(keyFrameSeederGeneration int32) {
ticker := time.NewTicker(time.Second)
defer ticker.Stop()

initialCount := uint32(0)
b.RLock()
rtpStats := b.rtpStats
b.RUnlock()
if rtpStats != nil {
initialCount, _ = rtpStats.KeyFrame()
}

for {
if b.closed.Load() || b.keyFrameSeederGeneration.Load() != keyFrameSeederGeneration {
return
Expand All @@ -1354,15 +1362,12 @@ func (b *Buffer) seedKeyFrame(keyFrameSeederGeneration int32) {
return

case <-ticker.C:
b.RLock()
rtpStats := b.rtpStats
b.RUnlock()

if rtpStats != nil {
cnt, last := rtpStats.KeyFrame()
if cnt > 0 {
if cnt > initialCount {
b.logger.Debugw(
"stopping key frame seeder: received key frame",
"keyFrameCountInitial", initialCount,
"keyFrameCount", cnt,
"lastKeyFrame", last,
)
Expand Down
Loading