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

Use only layer 0 for SVC codecs. (#4224)

Browse Source 
GetOrCreateBuffer was using passed in layer when creating a new buffer.
But, it should always use layer 0 only for SVC.
This commit is contained in:
Raja Subramanian
2026-01-07 18:57:21 +05:30
committed by GitHub
parent 4ec0f8f4ce
commit 0a7dd40b35
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sfu/receiver_base.go
+9 -8
View File
@@ -633,7 +633,7 @@ func (r *ReceiverBase) GetLayeredBitrate() ([]int32, Bitrates) {
func (r *ReceiverBase) SendPLI(layer int32, force bool) {
// SVC-TODO : should send LRR (Layer Refresh Request) instead of PLI
buff := r.getBuffer(layer)
buff, _ := r.getBuffer(layer)
if buff == nil {
return
}
@@ -641,14 +641,14 @@ func (r *ReceiverBase) SendPLI(layer int32, force bool) {
buff.SendPLI(force)
}
func (r *ReceiverBase) getBuffer(layer int32) buffer.BufferProvider {
func (r *ReceiverBase) getBuffer(layer int32) (buffer.BufferProvider, int32) {
r.bufferMu.RLock()
defer r.bufferMu.RUnlock()
return r.getBufferLocked(layer)
}
func (r *ReceiverBase) getBufferLocked(layer int32) buffer.BufferProvider {
func (r *ReceiverBase) getBufferLocked(layer int32) (buffer.BufferProvider, int32) {
// for svc codecs, use layer = 0 always.
// spatial layers are in-built and handled by single buffer
if r.videoLayerMode == livekit.VideoLayer_MULTIPLE_SPATIAL_LAYERS_PER_STREAM {
@@ -656,10 +656,10 @@ func (r *ReceiverBase) getBufferLocked(layer int32) buffer.BufferProvider {
}
if layer < 0 || int(layer) >= len(r.buffers) {
return nil
return nil, layer
}
return r.buffers[layer]
return r.buffers[layer], layer
}
func (r *ReceiverBase) GetOrCreateBuffer(
@@ -673,7 +673,8 @@ func (r *ReceiverBase) GetOrCreateBuffer(
return nil, false
}
if buff := r.getBufferLocked(layer); buff != nil {
var buff buffer.BufferProvider
if buff, layer = r.getBufferLocked(layer); buff != nil {
r.bufferMu.Unlock()
return buff, false
}
@@ -794,7 +795,7 @@ func (r *ReceiverBase) ClearAllBuffers(reason string) {
}
func (r *ReceiverBase) ReadRTP(buf []byte, layer uint8, esn uint64) (int, error) {
b := r.getBuffer(int32(layer))
b, _ := r.getBuffer(int32(layer))
if b == nil {
return 0, bucket.ErrPacketMismatch
}
@@ -1064,7 +1065,7 @@ func (r *ReceiverBase) GetRedReceiver() TrackReceiver {
}
func (r *ReceiverBase) GetTemporalLayerFpsForSpatial(layer int32) []float32 {
b := r.getBuffer(layer)
b, _ := r.getBuffer(layer)
if b == nil {
return nil
}