dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-05-25 14:15:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix ssrc messed up when generating trackinfo (#1014)

Browse Source
This commit is contained in:
cnderrauber
2022-09-16 18:29:44 +08:00
committed by GitHub
parent a421ab8d2b
commit 7ad123e4a6
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/rtc/mediatrackreceiver.go
+22 -6
View File
@@ -568,9 +568,17 @@ func (t *MediaTrackReceiver) TrackInfo(generateLayer bool) *livekit.TrackInfo {
ci.Layers = append(ci.Layers, proto.Clone(layer).(*livekit.VideoLayer))
// if origin layer has ssrc, don't override it
if layerIdx < len(originLayers) && originLayers[layerIdx].Ssrc != 0 {
ci.Layers[layerIdx].Ssrc = originLayers[layerIdx].Ssrc
} else if int(layer.Quality) < len(receiver.layerSSRCs) {
ssrcFound := false
for _, l := range originLayers {
if l.Quality == ci.Layers[layerIdx].Quality {
if l.Ssrc != 0 {
ci.Layers[layerIdx].Ssrc = l.Ssrc
ssrcFound = true
}
break
}
}
if !ssrcFound && int(layer.Quality) < len(receiver.layerSSRCs) {
ci.Layers[layerIdx].Ssrc = receiver.layerSSRCs[layer.Quality]
}
}
@@ -592,9 +600,17 @@ func (t *MediaTrackReceiver) TrackInfo(generateLayer bool) *livekit.TrackInfo {
ti.Layers = append(ti.Layers, proto.Clone(layer).(*livekit.VideoLayer))
// if origin layer has ssrc, don't override it
if layerIdx < len(originLayers) && originLayers[layerIdx].Ssrc != 0 {
ti.Layers[layerIdx].Ssrc = originLayers[layerIdx].Ssrc
} else if int(layer.Quality) < len(receiver.layerSSRCs) {
ssrcFound := false
for _, l := range originLayers {
if l.Quality == ti.Layers[layerIdx].Quality {
if l.Ssrc != 0 {
ti.Layers[layerIdx].Ssrc = l.Ssrc
ssrcFound = true
}
break
}
}
if !ssrcFound && int(layer.Quality) < len(receiver.layerSSRCs) {
ti.Layers[layerIdx].Ssrc = receiver.layerSSRCs[layer.Quality]
}
}