diff --git a/pkg/rtc/participant.go b/pkg/rtc/participant.go index 754b165c9..661ee1aef 100644 --- a/pkg/rtc/participant.go +++ b/pkg/rtc/participant.go @@ -158,8 +158,6 @@ type ParticipantParams struct { ForwardStats *sfu.ForwardStats DisableSenderReportPassThrough bool MetricConfig metric.MetricConfig - UseSendSideBWEInterceptor bool - UseSendSideBWE bool UseOneShotSignallingMode bool EnableMetrics bool } @@ -1569,8 +1567,6 @@ func (p *ParticipantImpl) setupTransportManager() error { PublisherHandler: pth, SubscriberHandler: sth, DataChannelStats: p.dataChannelStats, - UseSendSideBWEInterceptor: p.params.UseSendSideBWEInterceptor, - UseSendSideBWE: p.params.UseSendSideBWE, UseOneShotSignallingMode: p.params.UseOneShotSignallingMode, } if p.params.SyncStreams && p.params.PlayoutDelay.GetEnabled() && p.params.ClientInfo.isFirefox() { diff --git a/pkg/rtc/transport.go b/pkg/rtc/transport.go index f8ec01065..2b7fd26ca 100644 --- a/pkg/rtc/transport.go +++ b/pkg/rtc/transport.go @@ -259,8 +259,6 @@ type TransportParams struct { IsSendSide bool AllowPlayoutDelay bool DataChannelMaxBufferedAmount uint64 - UseSendSideBWEInterceptor bool - UseSendSideBWE bool UseOneShotSignallingMode bool } @@ -359,7 +357,7 @@ func newPeerConnection(params TransportParams, onBandwidthEstimator func(estimat ir := &interceptor.Registry{} if params.IsSendSide { se.DetachDataChannels() - if (params.CongestionControlConfig.UseSendSideBWEInterceptor || params.UseSendSideBWEInterceptor) && (!params.CongestionControlConfig.UseSendSideBWE && !params.UseSendSideBWE) { + if params.CongestionControlConfig.UseSendSideBWEInterceptor && !params.CongestionControlConfig.UseSendSideBWE { params.Logger.Infow("using send side BWE - interceptor") gf, err := cc.NewInterceptor(func() (cc.BandwidthEstimator, error) { return gcc.NewSendSideBWE( @@ -456,7 +454,7 @@ func NewPCTransport(params TransportParams) (*PCTransport, error) { lastNegotiate: time.Now(), } if params.IsSendSide { - if params.CongestionControlConfig.UseSendSideBWE || params.UseSendSideBWE { + if params.CongestionControlConfig.UseSendSideBWE { params.Logger.Infow("using send side BWE") t.bwe = sendsidebwe.NewSendSideBWE(sendsidebwe.SendSideBWEParams{ Config: params.CongestionControlConfig.SendSideBWE, diff --git a/pkg/rtc/transportmanager.go b/pkg/rtc/transportmanager.go index 9e611634d..d899df373 100644 --- a/pkg/rtc/transportmanager.go +++ b/pkg/rtc/transportmanager.go @@ -103,8 +103,6 @@ type TransportManagerParams struct { PublisherHandler transport.Handler SubscriberHandler transport.Handler DataChannelStats *telemetry.BytesTrackStats - UseSendSideBWEInterceptor bool - UseSendSideBWE bool UseOneShotSignallingMode bool } @@ -184,8 +182,6 @@ func NewTransportManager(params TransportManagerParams) (*TransportManager, erro DataChannelMaxBufferedAmount: params.DataChannelMaxBufferedAmount, Transport: livekit.SignalTarget_SUBSCRIBER, Handler: TransportManagerTransportHandler{params.SubscriberHandler, t, lgr}, - UseSendSideBWEInterceptor: params.UseSendSideBWEInterceptor, - UseSendSideBWE: params.UseSendSideBWE, }) if err != nil { return nil, err diff --git a/pkg/sfu/downtrack.go b/pkg/sfu/downtrack.go index 1d03122eb..501c3c732 100644 --- a/pkg/sfu/downtrack.go +++ b/pkg/sfu/downtrack.go @@ -1032,7 +1032,6 @@ func (d *DownTrack) WritePaddingRTP( bytesSent += hdrSize + payloadSize } - // STREAM_ALLOCATOR-TODO: change this to pull this counter from stream allocator so that counter can be updated in pacer callback return bytesSent }