Merge remote-tracking branch 'origin/master' into raja_pc

pkg/rtc/signalling/signalhandler.go

@@ -55,6 +55,7 @@ func (s *signalhandler) HandleMessage(msg proto.Message) error {
 	}
 	s.params.Participant.UpdateLastSeenSignal()
 
+	s.params.Logger.Debugw("handling signal request", "request", logger.Proto(req))
 	switch msg := req.GetMessage().(type) {
 	case *livekit.SignalRequest_Offer:
 		s.params.Participant.HandleOffer(protosignalling.FromProtoSessionDescription(msg.Offer))

pkg/rtc/signalling/signallerasync.go

@@ -101,6 +101,8 @@ func (s *signallerAsync) WriteMessage(msg proto.Message) error {
 			}
 			return err
 		}
+	} else {
+		s.params.Logger.Debugw("sent signal response", "response", logger.Proto(msg))
 	}
 	return nil
 }

pkg/rtc/subscribedtrack.go

@@ -121,6 +121,7 @@ func (t *SubscribedTrack) Bound(err error) {
 			if t.params.AdaptiveStream {
 				// remove `disabled` flag to force a visibility update
 				t.settings.Disabled = false
+				t.logger.Debugw("enabling subscriber track settings on bind", "settings", logger.Proto(t.settings))
 			}
 		} else {
 			if t.params.AdaptiveStream {
@@ -128,6 +129,7 @@ func (t *SubscribedTrack) Bound(err error) {
 			} else {
 				t.settings = &livekit.UpdateTrackSettings{Quality: livekit.VideoQuality_HIGH}
 			}
+			t.logger.Debugw("initializing subscriber track settings on bind", "settings", logger.Proto(t.settings))
 		}
 		t.settingsLock.Unlock()
 		t.applySettings()
@@ -215,12 +217,14 @@ func (t *SubscribedTrack) SetPublisherMuted(muted bool) {
 func (t *SubscribedTrack) UpdateSubscriberSettings(settings *livekit.UpdateTrackSettings, isImmediate bool) {
 	t.settingsLock.Lock()
 	if proto.Equal(t.settings, settings) {
+		t.logger.Debugw("skipping subscriber track settings", "settings", logger.Proto(t.settings))
 		t.settingsLock.Unlock()
 		return
 	}
 
 	isImmediate = isImmediate || (!settings.Disabled && settings.Disabled != t.isMutedLocked())
 	t.settings = utils.CloneProto(settings)
+	t.logger.Debugw("saving subscriber track settings", "settings", logger.Proto(t.settings))
 	t.settingsLock.Unlock()
 
 	if isImmediate {
@@ -242,7 +246,6 @@ func (t *SubscribedTrack) applySettings() {
 		return
 	}
 
-	t.logger.Debugw("updating subscriber track settings", "settings", logger.Proto(t.settings))
 	t.settingsVersion = t.versionGenerator.Next()
 	settingsVersion := t.settingsVersion
 	t.settingsLock.Unlock()
@@ -271,6 +274,7 @@ func (t *SubscribedTrack) applySettings() {
 		return
 	}
 
+	t.logger.Debugw("applying subscriber track settings", "settings", logger.Proto(t.settings))
 	if t.settings.Disabled {
 		dt.Mute(true)
 		t.settingsLock.Unlock()

pkg/service/rtcservice.go

@@ -474,6 +474,9 @@ func (s *RTCService) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 					signalStats.ResolveRoom(m.RoomMoved.GetRoom())
 					signalStats.ResolveParticipant(m.RoomMoved.GetParticipant())
 					pLogger.Debugw("sending room moved", "roomMoved", m)
+
+				default:
+					pLogger.Debugw("sending signal response", "response", m)
 				}
 
 				if count, err := sigConn.WriteResponse(res); err != nil {
@@ -532,6 +535,8 @@ func (s *RTCService) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			pLogger.Debugw("received offer", "offer", m)
 		case *livekit.SignalRequest_Answer:
 			pLogger.Debugw("received answer", "answer", m)
+		default:
+			pLogger.Debugw("received signal request", "request", m)
 		}
 
 		if err := cr.RequestSink.WriteMessage(req); err != nil {