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

Change state to JOINED before sending JoinResponse (#674)

Browse Source 
* Send room metadata as long as participant is not disconnected

* Change state to JOINED before sending join response
This commit is contained in:
Raja Subramanian
2022-05-09 13:28:56 +05:30
committed by GitHub
parent 081b97142f
commit 16407ea180
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/rtc/participant.go
View File

@@ -502,9 +502,6 @@ func (p *ParticipantImpl) HandleOffer(sdp webrtc.SessionDescription) (answer web
}
}
if p.State() == livekit.ParticipantInfo_JOINING {
p.updateState(livekit.ParticipantInfo_JOINED)
}
prometheus.ServiceOperationCounter.WithLabelValues("answer", "success", "").Add(1)
return

4
pkg/rtc/participant_signal.go
View File

@@ -37,6 +37,10 @@ func (p *ParticipantImpl) SendJoinResponse(
iceServers []*livekit.ICEServer,
region string,
) error {
if p.State() == livekit.ParticipantInfo_JOINING {
p.updateState(livekit.ParticipantInfo_JOINED)
}
// send Join response
return p.writeMessage(&livekit.SignalResponse{
Message: &livekit.SignalResponse_Join{

4
pkg/sfu/streamtrackermanager.go
View File

@@ -290,7 +290,7 @@ func (s *StreamTrackerManager) addAvailableLayer(layer int32) {
layers := s.availableLayers
s.lock.Unlock()
s.logger.Debugw("available layers changed - layer seen", "layers", layers)
s.logger.Debugw("available layers changed - layer seen", "added", layer, "layers", layers)
if s.onAvailableLayersChanged != nil {
s.onAvailableLayersChanged(layers)
@@ -309,7 +309,7 @@ func (s *StreamTrackerManager) removeAvailableLayer(layer int32) {
s.availableLayers = newLayers
s.lock.Unlock()
s.logger.Debugw("available layers changed - layer gone", "layers", newLayers)
s.logger.Debugw("available layers changed - layer gone", "removed", layer, "layers", newLayers)
// need to immediately switch off unavailable layers
if s.onAvailableLayersChanged != nil {