Use Go 1.21 built-in max function

Signed-off-by: Xiaobo Liu <[email protected]>

Author: cppcoffee

pkg/flexfec/flexfec_encoder_03.go

@@ -141,7 +141,7 @@ func (flex *FlexEncoder03) encodeFlexFecPacket(fecPacketIndex uint32, mediaBaseS
 	// Find the maximum payload size among all media packets
 	maxPayloadSize := 0
 	for mediaPackets.HasNext() {
-		maxPayloadSize = maxInt(maxPayloadSize, mediaPackets.Next().MarshalSize()-BaseRTPHeaderSize)
+		maxPayloadSize = max(maxPayloadSize, mediaPackets.Next().MarshalSize()-BaseRTPHeaderSize)
 	}
 	mediaPackets.Reset()
 
@@ -239,11 +239,3 @@ func (flex *FlexEncoder03) encodeFlexFecPacket(fecPacketIndex uint32, mediaBaseS
 
 	return packet, true
 }
-
-func maxInt(a, b int) int {
-	if a > b {
-		return a
-	}
-
-	return b
-}

pkg/gcc/gcc.go

@@ -6,16 +6,8 @@ package gcc
 
 import "time"
 
-func maxInt(a, b int) int {
-	if a > b {
-		return a
-	}
-
-	return b
-}
-
 func clampInt(b, minVal, maxVal int) int {
-	return maxInt(minVal, min(maxVal, b))
+	return max(minVal, min(maxVal, b))
 }
 
 func clampDuration(d, minVal, maxVal time.Duration) time.Duration {

pkg/gcc/gcc_test.go

@@ -11,35 +11,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestMaxInt(t *testing.T) {
-	tests := []struct {
-		expected int
-		a, b     int
-	}{
-		{
-			expected: 100,
-			a:        0,
-			b:        100,
-		},
-		{
-			expected: 10,
-			a:        10,
-			b:        10,
-		},
-		{
-			expected: 10,
-			a:        10,
-			b:        1,
-		},
-	}
-	for i, tt := range tests {
-		tt := tt
-		t.Run(fmt.Sprintf("%v", i), func(t *testing.T) {
-			assert.Equal(t, tt.expected, maxInt(tt.a, tt.b))
-		})
-	}
-}
-
 func TestClamp(t *testing.T) {
 	tests := []struct {
 		expected int

pkg/twcc/arrival_time_map.go

@@ -182,9 +182,9 @@ func (m *packetArrivalTimeMap) adjustToSize(newSize int) {
 		}
 		m.reallocate(newCapacity)
 	}
-	if m.capacity() > maxInt(minCapacity, newSize*4) {
+	if m.capacity() > max(minCapacity, newSize*4) {
 		newCapacity := m.capacity()
-		for newCapacity >= 2*maxInt(newSize, minCapacity) {
+		for newCapacity >= 2*max(newSize, minCapacity) {
 			newCapacity /= 2
 		}
 		m.reallocate(newCapacity)

pkg/twcc/twcc.go

@@ -134,7 +134,7 @@ func (r *Recorder) maybeBuildFeedbackPacket(beginSeqNumInclusive, endSeqNumExclu
 			// It should be possible to add seq to this new packet.
 			// If the difference between seq and beginSeqNumInclusive is too large, discard
 			// reporting too old missing packets.
-			baseSequenceNumber := max64(beginSeqNumInclusive, seq-maxMissingSequenceNumbers)
+			baseSequenceNumber := max(beginSeqNumInclusive, seq-maxMissingSequenceNumbers)
 
 			// baseSequenceNumber is the expected first sequence number. This is known,
 			// but we may not have actually received it, so the base time should be the time
@@ -347,19 +347,3 @@ func (c *chunk) reset() {
 	c.hasLargeDelta = false
 	c.hasDifferentTypes = false
 }
-
-func maxInt(a, b int) int {
-	if a > b {
-		return a
-	}
-
-	return b
-}
-
-func max64(a, b int64) int64 {
-	if a > b {
-		return a
-	}
-
-	return b
-}