dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-03-30 13:25:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use sens side bwe config directly. (#3241)

Browse Source
This commit is contained in:
Raja Subramanian
2024-12-10 10:01:44 +05:30
committed by GitHub
parent dc6fe3aae5
commit d0f7eaeadb
4 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/rtc/participant.go
View File

@@ -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() {

6
pkg/rtc/transport.go
View File

@@ -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,

4
pkg/rtc/transportmanager.go
View File

@@ -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

1
pkg/sfu/downtrack.go
View File

@@ -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
}