Apply go modernize suggestions

peerconnection.go

@@ -13,6 +13,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"slices"
 	"strconv"
 	"strings"
 	"sync"
@@ -1695,10 +1696,8 @@ func (pc *PeerConnection) handleIncomingSSRC(rtpStream io.Reader, ssrc SSRC) err
 		if track.fecSsrc != nil && ssrc == *track.fecSsrc {
 			return nil
 		}
-		for _, trackSsrc := range track.ssrcs {
+		if slices.Contains(track.ssrcs, ssrc) {
-			if ssrc == trackSsrc {
+			return nil
-				return nil
-			}
 		}
 	}
 

pkg/media/h264reader/h264reader.go

@@ -65,12 +65,8 @@ func (reader *H264Reader) read(numToRead int) (data []byte, e error) {
 		}
 		reader.readBuffer = append(reader.readBuffer, reader.tmpReadBuf[0:n]...)
 	}
-	var numShouldRead int
+
-	if numToRead <= len(reader.readBuffer) {
+	numShouldRead := min(numToRead, len(reader.readBuffer))
-		numShouldRead = numToRead
-	} else {
-		numShouldRead = len(reader.readBuffer)
-	}
 	data = reader.readBuffer[0:numShouldRead]
 	reader.readBuffer = reader.readBuffer[numShouldRead:]
 

pkg/media/h265reader/h265reader.go

@@ -72,12 +72,8 @@ func (reader *H265Reader) read(numToRead int) (data []byte, e error) {
 		}
 		reader.readBuffer = append(reader.readBuffer, reader.tmpReadBuf[0:n]...)
 	}
-	var numShouldRead int
+
-	if numToRead <= len(reader.readBuffer) {
+	numShouldRead := min(numToRead, len(reader.readBuffer))
-		numShouldRead = numToRead
-	} else {
-		numShouldRead = len(reader.readBuffer)
-	}
 	data = reader.readBuffer[0:numShouldRead]
 	reader.readBuffer = reader.readBuffer[numShouldRead:]
 

pkg/media/samplebuilder/samplebuilder_test.go

@@ -6,6 +6,7 @@ package samplebuilder
 import (
 	"fmt"
 	"runtime"
+	"slices"
 	"sync/atomic"
 	"testing"
 	"time"
@@ -52,13 +53,7 @@ func (f *fakeDepacketizer) IsPartitionHead(payload []byte) bool {
 		return true
 	}
 
-	for _, b := range f.headBytes {
+	return slices.Contains(f.headBytes, payload[0])
-		if payload[0] == b {
-			return true
-		}
-	}
-
-	return false
 }
 
 func (f *fakeDepacketizer) IsPartitionTail(marker bool, _ []byte) bool {

rtptransceiverdirection.go

@@ -3,6 +3,8 @@
 
 package webrtc
 
+import "slices"
+
 // RTPTransceiverDirection indicates the direction of the RTPTransceiver.
 type RTPTransceiverDirection int
 
@@ -84,10 +86,8 @@ func haveRTPTransceiverDirectionIntersection(
 	needle []RTPTransceiverDirection,
 ) bool {
 	for _, n := range needle {
-		for _, h := range haystack {
+		if slices.Contains(haystack, n) {
-			if n == h {
+			return true
-				return true
-			}
 		}
 	}
 

sdp.go

@@ -11,6 +11,7 @@ import (
 	"fmt"
 	"net/url"
 	"regexp"
+	"slices"
 	"strconv"
 	"strings"
 	"sync/atomic"
@@ -35,10 +36,8 @@ type trackDetails struct {
 
 func trackDetailsForSSRC(trackDetails []trackDetails, ssrc SSRC) *trackDetails {
 	for i := range trackDetails {
-		for j := range trackDetails[i].ssrcs {
+		if slices.Contains(trackDetails[i].ssrcs, ssrc) {
-			if trackDetails[i].ssrcs[j] == ssrc {
+			return &trackDetails[i]
-				return &trackDetails[i]
-			}
 		}
 	}
 
@@ -51,10 +50,8 @@ func trackDetailsForRID(trackDetails []trackDetails, mid, rid string) *trackDeta
 			continue
 		}
 
-		for j := range trackDetails[i].rids {
+		if slices.Contains(trackDetails[i].rids, rid) {
-			if trackDetails[i].rids[j] == rid {
+			return &trackDetails[i]
-				return &trackDetails[i]
-			}
 		}
 	}
 
@@ -64,13 +61,7 @@ func trackDetailsForRID(trackDetails []trackDetails, mid, rid string) *trackDeta
 func filterTrackWithSSRC(incomingTracks []trackDetails, ssrc SSRC) []trackDetails {
 	filtered := []trackDetails{}
 	doesTrackHaveSSRC := func(t trackDetails) bool {
-		for i := range t.ssrcs {
+		return slices.Contains(t.ssrcs, ssrc)
-			if t.ssrcs[i] == ssrc {
-				return true
-			}
-		}
-
-		return false
 	}
 
 	for i := range incomingTracks {
@@ -268,10 +259,7 @@ func trackDetailsFromSDP(
 }
 
 func trackDetailsToRTPReceiveParameters(trackDetails *trackDetails) RTPReceiveParameters {
-	encodingSize := len(trackDetails.ssrcs)
+	encodingSize := max(len(trackDetails.rids), len(trackDetails.ssrcs))
-	if len(trackDetails.rids) >= encodingSize {
-		encodingSize = len(trackDetails.rids)
-	}
 
 	encodings := make([]RTPDecodingParameters, encodingSize)
 	for i := range encodings {
@@ -693,13 +681,7 @@ func bundleMatchFromRemote(matchBundleGroup *string) func(mid string) bool {
 	bundleTags := strings.Split(*matchBundleGroup, " ")
 
 	return func(midValue string) bool {
-		for _, tag := range bundleTags {
+		return slices.Contains(bundleTags, midValue)
-			if tag == midValue {
-				return true
-			}
-		}
-
-		return false
 	}
 }