dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-03-30 07:00:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address another panic. (#3274)

Browse Source 
* Address another panic.

If receiver is not resolved yet, prevent race of access dummy receiver.

* reset callback only if there is receiver

* missed return
This commit is contained in:
Raja Subramanian
2024-12-20 00:17:06 +05:30
committed by GitHub
parent 3251156bd3
commit 36338bab5c
1 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
pkg/rtc/wrappedreceiver.go
View File

@@ -41,6 +41,8 @@ type WrappedReceiverParams struct {
}
type WrappedReceiver struct {
lock sync.Mutex
sfu.TrackReceiver
params WrappedReceiverParams
receivers []sfu.TrackReceiver
@@ -91,33 +93,44 @@ func (r *WrappedReceiver) StreamID() string {
// DetermineReceiver determines the receiver of negotiated codec and return ready state of the receiver
func (r *WrappedReceiver) DetermineReceiver(codec webrtc.RTPCodecCapability) bool {
r.lock.Lock()
r.determinedCodec = codec
var trackReceiver sfu.TrackReceiver
for _, receiver := range r.receivers {
if c := receiver.Codec(); strings.EqualFold(c.MimeType, codec.MimeType) {
r.TrackReceiver = receiver
trackReceiver = receiver
break
} else if strings.EqualFold(c.MimeType, sfu.MimeTypeAudioRed) && strings.EqualFold(codec.MimeType, webrtc.MimeTypeOpus) {
// audio opus/red can match opus only
r.TrackReceiver = receiver.GetPrimaryReceiverForRed()
trackReceiver = receiver.GetPrimaryReceiverForRed()
break
} else if strings.EqualFold(c.MimeType, webrtc.MimeTypeOpus) && strings.EqualFold(codec.MimeType, sfu.MimeTypeAudioRed) {
r.TrackReceiver = receiver.GetRedReceiver()
trackReceiver = receiver.GetRedReceiver()
break
}
}
if r.TrackReceiver == nil {
if trackReceiver == nil {
r.params.Logger.Errorw("can't determine receiver for codec", nil, "codec", codec.MimeType)
if len(r.receivers) > 0 {
r.TrackReceiver = r.receivers[0]
trackReceiver = r.receivers[0]
}
}
if r.TrackReceiver != nil {
for _, f := range r.onReadyCallbacks {
r.TrackReceiver.AddOnReady(f)
}
r.onReadyCallbacks = nil
r.TrackReceiver = trackReceiver
if d, ok := r.TrackReceiver.(*DummyReceiver); ok {
var onReadyCallbacks []func()
if trackReceiver != nil {
onReadyCallbacks = r.onReadyCallbacks
r.onReadyCallbacks = nil
}
r.lock.Unlock()
if trackReceiver != nil {
for _, f := range onReadyCallbacks {
trackReceiver.AddOnReady(f)
}
if d, ok := trackReceiver.(*DummyReceiver); ok {
return d.IsReady()
}
return true
@@ -130,17 +143,26 @@ func (r *WrappedReceiver) Codecs() []webrtc.RTPCodecParameters {
}
func (r *WrappedReceiver) DeleteDownTrack(participantID livekit.ParticipantID) {
if r.TrackReceiver != nil {
r.TrackReceiver.DeleteDownTrack(participantID)
r.lock.Lock()
trackReceiver := r.TrackReceiver
r.lock.Unlock()
if trackReceiver != nil {
trackReceiver.DeleteDownTrack(participantID)
}
}
func (r *WrappedReceiver) AddOnReady(f func()) {
if r.TrackReceiver != nil {
r.TrackReceiver.AddOnReady(f)
} else {
r.lock.Lock()
trackReceiver := r.TrackReceiver
if trackReceiver == nil {
r.onReadyCallbacks = append(r.onReadyCallbacks, f)
r.lock.Unlock()
return
}
r.lock.Unlock()
trackReceiver.AddOnReady(f)
}
// --------------------------------------------