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

avoid race condition on downtrack.Codec (#3032)

Browse Source
This commit is contained in:
cnderrauber
2024-09-22 06:27:26 +00:00
committed by GitHub
parent 8428d5e62b
commit eed925fddf
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/rtc/subscriptionmanager.go
View File

@@ -693,7 +693,7 @@ func (m *SubscriptionManager) handleSubscribedTrackClose(s *trackSubscription, i
context.Background(),
m.params.Participant.ID(),
s.trackID,
subTrack.DownTrack().Codec().MimeType,
dt.Codec().MimeType,
stats,
)
}

15
pkg/sfu/downtrack.go
View File

@@ -246,6 +246,7 @@ type DownTrack struct {
upstreamCodecs []webrtc.RTPCodecParameters
codec webrtc.RTPCodecCapability
clockRate uint32
// payload types for red codec only
isRED bool
@@ -361,6 +362,7 @@ func NewDownTrack(params DowntrackParams) (*DownTrack, error) {
upstreamCodecs: codecs,
kind: kind,
codec: codecs[0].RTPCodecCapability,
clockRate: codecs[0].ClockRate,
pacer: params.Pacer,
maxLayerNotifierCh: make(chan string, 1),
keyFrameRequesterCh: make(chan struct{}, 1),
@@ -368,7 +370,6 @@ func NewDownTrack(params DowntrackParams) (*DownTrack, error) {
}
d.bindState.Store(bindStateUnbound)
d.params.Logger = params.Logger.WithValues(
"mime", codecs[0].MimeType,
"subscriberID", d.SubscriberID(),
)
d.forwarder = NewForwarder(
@@ -514,7 +515,7 @@ func (d *DownTrack) Bind(t webrtc.TrackLocalContext) (webrtc.RTPCodecParameters,
"primaryPT", d.primaryPT,
)
}
d.params.Logger.Debugw("DownTrack.Bind",
d.params.Logger.Infow("DownTrack.Bind",
logFields...,
)
@@ -538,7 +539,7 @@ func (d *DownTrack) Bind(t webrtc.TrackLocalContext) (webrtc.RTPCodecParameters,
d.setBindStateLocked(bindStateBound)
d.bindLock.Unlock()
d.forwarder.DetermineCodec(d.codec, d.params.Receiver.HeaderExtensions())
d.forwarder.DetermineCodec(codec.RTPCodecCapability, d.params.Receiver.HeaderExtensions())
d.params.Logger.Debugw("downtrack bound")
}
@@ -676,7 +677,11 @@ func (d *DownTrack) ClearStreamAllocatorReportInterval() {
func (d *DownTrack) ID() string { return string(d.id) }
// Codec returns current track codec capability
func (d *DownTrack) Codec() webrtc.RTPCodecCapability { return d.codec }
func (d *DownTrack) Codec() webrtc.RTPCodecCapability {
d.bindLock.Lock()
defer d.bindLock.Unlock()
return d.codec
}
// StreamID is the group this track belongs too. This must be unique
func (d *DownTrack) StreamID() string { return d.params.StreamID }
@@ -1759,7 +1764,7 @@ func (d *DownTrack) handleRTCP(bytes []byte) {
d.playoutDelay.OnSeqAcked(uint16(r.LastSequenceNumber))
// screen share track has inaccuracy jitter due to its low frame rate and bursty traffic
if d.params.Source != livekit.TrackSource_SCREEN_SHARE {
jitterMs := uint64(r.Jitter*1e3) / uint64(d.codec.ClockRate)
jitterMs := uint64(r.Jitter*1e3) / uint64(d.clockRate)
d.playoutDelay.SetJitter(uint32(jitterMs))
}
}