Unexport types that are for internal use only

Author: mengelbart

gcc/delay_rate_controller.go

@@ -9,7 +9,7 @@ import (
 	"github.com/pion/logging"
 )
 
-type DelayRateController struct {
+type delayRateController struct {
 	log         logging.LeveledLogger
 	aga         *arrivalGroupAccumulator
 	last        arrivalGroup
@@ -20,8 +20,8 @@ type DelayRateController struct {
 	samples     int
 }
 
-func NewDelayRateController(initialRate int, logger logging.LeveledLogger) *DelayRateController {
-	return &DelayRateController{
+func newDelayRateController(initialRate int, logger logging.LeveledLogger) *delayRateController {
+	return &delayRateController{
 		log:         logger,
 		aga:         newArrivalGroupAccumulator(),
 		last:        []Acknowledgment{},
@@ -33,7 +33,7 @@ func NewDelayRateController(initialRate int, logger logging.LeveledLogger) *Dela
 	}
 }
 
-func (c *DelayRateController) OnPacketAcked(ack Acknowledgment) {
+func (c *delayRateController) onPacketAcked(ack Acknowledgment) {
 	next := c.aga.onPacketAcked(ack)
 	if next == nil {
 		return
@@ -74,7 +74,7 @@ func (c *DelayRateController) OnPacketAcked(ack Acknowledgment) {
 	)
 }
 
-func (c *DelayRateController) Update(ts time.Time, lastDeliveryRate int, rtt time.Duration) int {
+func (c *delayRateController) update(ts time.Time, lastDeliveryRate int, rtt time.Duration) int {
 	return c.rc.update(ts, c.latestUsage, lastDeliveryRate, rtt)
 }
 

gcc/loss_rate_controller.go

@@ -3,7 +3,7 @@
 
 package gcc
 
-type LossRateController struct {
+type lossRateController struct {
 	bitrate  int
 	min, max float64
 
@@ -12,8 +12,8 @@ type LossRateController struct {
 	lostSinceLastUpdate    int
 }
 
-func NewLossRateController(initialRate, minRate, maxRate int) *LossRateController {
-	return &LossRateController{
+func newLossRateController(initialRate, minRate, maxRate int) *lossRateController {
+	return &lossRateController{
 		bitrate:                initialRate,
 		min:                    float64(minRate),
 		max:                    float64(maxRate),
@@ -23,17 +23,17 @@ func NewLossRateController(initialRate, minRate, maxRate int) *LossRateControlle
 	}
 }
 
-func (l *LossRateController) OnPacketAcked() {
+func (l *lossRateController) onPacketAcked() {
 	l.packetsSinceLastUpdate++
 	l.arrivedSinceLastUpdate++
 }
 
-func (l *LossRateController) OnPacketLost() {
+func (l *lossRateController) onPacketLost() {
 	l.packetsSinceLastUpdate++
 	l.lostSinceLastUpdate++
 }
 
-func (l *LossRateController) Update(lastDeliveryRate int) int {
+func (l *lossRateController) update(lastDeliveryRate int) int {
 	lossRate := float64(l.lostSinceLastUpdate) / float64(l.packetsSinceLastUpdate)
 	var target float64
 	if lossRate > 0.1 {

gcc/loss_rate_controller_test.go

@@ -76,14 +76,14 @@ func TestLossRateController(t *testing.T) {
 	}
 	for i, tc := range cases {
 		t.Run(fmt.Sprintf("%v", i), func(t *testing.T) {
-			lrc := NewLossRateController(tc.init, tc.min, tc.max)
+			lrc := newLossRateController(tc.init, tc.min, tc.max)
 			for i := 0; i < tc.acked; i++ {
-				lrc.OnPacketAcked()
+				lrc.onPacketAcked()
 			}
 			for i := 0; i < tc.lost; i++ {
-				lrc.OnPacketLost()
+				lrc.onPacketLost()
 			}
-			assert.Equal(t, tc.expectedRate, lrc.Update(tc.deliveredRate))
+			assert.Equal(t, tc.expectedRate, lrc.update(tc.deliveredRate))
 		})
 	}
 }

gcc/send_side_bwe.go

@@ -22,8 +22,8 @@ func Logger(l logging.LeveledLogger) Option {
 type SendSideController struct {
 	log          logging.LeveledLogger
 	dre          *deliveryRateEstimator
-	lbc          *LossRateController
-	drc          *DelayRateController
+	lbc          *lossRateController
+	drc          *delayRateController
 	rate         int
 	highestAcked uint64
 }
@@ -32,8 +32,8 @@ func NewSendSideController(initialRate, minRate, maxRate int, opts ...Option) (*
 	ssc := &SendSideController{
 		log:  logging.NewDefaultLoggerFactory().NewLogger("bwe_send_side_controller"),
 		dre:  newDeliveryRateEstimator(time.Second),
-		lbc:  NewLossRateController(initialRate, minRate, maxRate),
-		drc:  NewDelayRateController(initialRate, logging.NewDefaultLoggerFactory().NewLogger("bwe_delay_rate_controller")),
+		lbc:  newLossRateController(initialRate, minRate, maxRate),
+		drc:  newDelayRateController(initialRate, logging.NewDefaultLoggerFactory().NewLogger("bwe_delay_rate_controller")),
 		rate: initialRate,
 	}
 	for _, opt := range opts {
@@ -57,19 +57,19 @@ func (c *SendSideController) OnAcks(arrival time.Time, rtt time.Duration, acks [
 			if ack.SeqNr > c.highestAcked {
 				c.highestAcked = ack.SeqNr
 			}
-			c.lbc.OnPacketAcked()
+			c.lbc.onPacketAcked()
 			if !ack.Arrival.IsZero() {
 				c.dre.OnPacketAcked(ack.Arrival, int(ack.Size))
-				c.drc.OnPacketAcked(ack)
+				c.drc.onPacketAcked(ack)
 			}
 		} else {
-			c.lbc.OnPacketLost()
+			c.lbc.onPacketLost()
 		}
 	}
 
 	delivered := c.dre.GetRate()
-	lossTarget := c.lbc.Update(delivered)
-	delayTarget := c.drc.Update(arrival, delivered, rtt)
+	lossTarget := c.lbc.update(delivered)
+	delayTarget := c.drc.update(arrival, delivered, rtt)
 	c.rate = min(lossTarget, delayTarget)
 	c.log.Tracef("rtt=%v, delivered=%v, lossTarget=%v, delayTarget=%v, target=%v", rtt.Nanoseconds(), delivered, lossTarget, delayTarget, c.rate)
 	return c.rate