From 96a3f3e9a715c8416c6d2ed1dfa8137450e22ba4 Mon Sep 17 00:00:00 2001
From: Raja Subramanian <raja.gobi@tutanota.com>
Date: Wed, 1 Dec 2021 19:15:06 +0530
Subject: [PATCH] Minor clean up (#221)

---
 pkg/rtc/participant.go | 24 ++++++++++--------------
 pkg/sfu/forwarder.go   | 12 +++---------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/pkg/rtc/participant.go b/pkg/rtc/participant.go
index 655ee7bf5..f5ff3f771 100644
--- a/pkg/rtc/participant.go
+++ b/pkg/rtc/participant.go
@@ -1320,21 +1320,17 @@ func (p *ParticipantImpl) onStreamedTracksChange(update *sfu.StreamedTracksUpdat
 	}
 
 	streamedTracksUpdate := &livekit.StreamedTracksUpdate{}
-	if len(update.Paused) != 0 {
-		for _, streamedTrack := range update.Paused {
-			streamedTracksUpdate.Paused = append(streamedTracksUpdate.Paused, &livekit.StreamedTrack{
-				ParticipantSid: streamedTrack.ParticipantSid,
-				TrackSid:       streamedTrack.TrackSid,
-			})
-		}
+	for _, streamedTrack := range update.Paused {
+		streamedTracksUpdate.Paused = append(streamedTracksUpdate.Paused, &livekit.StreamedTrack{
+			ParticipantSid: streamedTrack.ParticipantSid,
+			TrackSid:       streamedTrack.TrackSid,
+		})
 	}
-	if len(update.Resumed) != 0 {
-		for _, streamedTrack := range update.Resumed {
-			streamedTracksUpdate.Resumed = append(streamedTracksUpdate.Resumed, &livekit.StreamedTrack{
-				ParticipantSid: streamedTrack.ParticipantSid,
-				TrackSid:       streamedTrack.TrackSid,
-			})
-		}
+	for _, streamedTrack := range update.Resumed {
+		streamedTracksUpdate.Resumed = append(streamedTracksUpdate.Resumed, &livekit.StreamedTrack{
+			ParticipantSid: streamedTrack.ParticipantSid,
+			TrackSid:       streamedTrack.TrackSid,
+		})
 	}
 
 	return p.writeMessage(&livekit.SignalResponse{
diff --git a/pkg/sfu/forwarder.go b/pkg/sfu/forwarder.go
index e696667cc..c3a3e2101 100644
--- a/pkg/sfu/forwarder.go
+++ b/pkg/sfu/forwarder.go
@@ -203,24 +203,18 @@ func (f *Forwarder) disable() {
 }
 
 func (f *Forwarder) getOptimalBandwidthNeeded(brs [3][4]int64) int64 {
-	optimalBandwidthNeeded := int64(0)
+	// LK-TODO for temporal preference, traverse the bitrates array the other way
 	for i := f.maxSpatialLayer; i >= 0; i-- {
 		for j := f.maxTemporalLayer; j >= 0; j-- {
 			if brs[i][j] == 0 {
 				continue
 			}
-			if optimalBandwidthNeeded == 0 {
-				optimalBandwidthNeeded = brs[i][j]
-				break
-			}
-		}
 
-		if optimalBandwidthNeeded != 0 {
-			break
+			return brs[i][j]
 		}
 	}
 
-	return optimalBandwidthNeeded
+	return 0
 }
 
 func (f *Forwarder) allocate(availableChannelCapacity int64, canPause bool, brs [3][4]int64) (result VideoAllocationResult) {