From 083e7cc86046019d1d3a97981b8b3ded216fbc65 Mon Sep 17 00:00:00 2001 From: David Zhao Date: Mon, 28 Jun 2021 15:49:17 -0700 Subject: [PATCH] Reduce default PLI throttle values, ion-sfu resync fix --- config-sample.yaml | 6 +++--- go.mod | 2 +- go.sum | 4 ++-- pkg/config/config.go | 6 +++--- version/version.go | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config-sample.yaml b/config-sample.yaml index dd7ce5868..2bb656890 100644 --- a/config-sample.yaml +++ b/config-sample.yaml @@ -40,9 +40,9 @@ rtc: # # producer. Increasing these times can lead to longer black screens when participants join, # # while reducing them can lead to higher producer bitrates. # pli_throttle: -# low_quality: 1s -# mid_quality: 2s -# high_quality: 3s +# low_quality: 500ms +# mid_quality: 1s +# high_quality: 1s # API key / secret pairs. diff --git a/go.mod b/go.mod index 345271afe..7c6dceb97 100644 --- a/go.mod +++ b/go.mod @@ -46,4 +46,4 @@ require ( replace github.com/pion/webrtc/v3 => github.com/livekit/pion-webrtc/v3 v3.0.30 -replace github.com/pion/ion-sfu => github.com/livekit/ion-sfu v1.10.7-0.20210625234943-c2fcf7981b1a +replace github.com/pion/ion-sfu => github.com/livekit/ion-sfu v1.10.7-0.20210628224111-3d32c23cc702 diff --git a/go.sum b/go.sum index 153fd2e8e..37abcca3c 100644 --- a/go.sum +++ b/go.sum @@ -230,8 +230,8 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/lithammer/shortuuid/v3 v3.0.6 h1:pr15YQyvhiSX/qPxncFtqk+v4xLEpOZObbsY/mKrcvA= github.com/lithammer/shortuuid/v3 v3.0.6/go.mod h1:vMk8ke37EmiewwolSO1NLW8vP4ZaKlRuDIi8tWWmAts= -github.com/livekit/ion-sfu v1.10.7-0.20210625234943-c2fcf7981b1a h1:umZJ3i6CUqO8hDsWVKJSdICIMkACKvVJ0ihXegFBBV0= -github.com/livekit/ion-sfu v1.10.7-0.20210625234943-c2fcf7981b1a/go.mod h1:Wx6b4qGUjvSo1kGl+/fHl0ZF48g2IJOjzUFg0yCo9qY= +github.com/livekit/ion-sfu v1.10.7-0.20210628224111-3d32c23cc702 h1:KFZY+ZboMrJlbEGEuRi928PmaQk9x1Op1RhLD4w7oVM= +github.com/livekit/ion-sfu v1.10.7-0.20210628224111-3d32c23cc702/go.mod h1:Wx6b4qGUjvSo1kGl+/fHl0ZF48g2IJOjzUFg0yCo9qY= github.com/livekit/pion-webrtc/v3 v3.0.30 h1:2RomVfztLegWIePXcyPFJDiF5pbT64aIX4RtpXdDksU= github.com/livekit/pion-webrtc/v3 v3.0.30/go.mod h1:XFQeLYBf++bWWA0sJqh6zF1ouWluosxwTOMOoTZGaD0= github.com/livekit/protocol v0.5.4 h1:OFOOahFXGOusgd8X1Ucnl8H/sxa3DzwSrnmKNIUOu/0= diff --git a/pkg/config/config.go b/pkg/config/config.go index 610ae2bf0..10c8e84b3 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -94,9 +94,9 @@ func NewConfig(confString string) (*Config, error) { MaxBitrate: 3 * 1024 * 1024, // 3 mbps PacketBufferSize: 500, PLIThrottle: PLIThrottleConfig{ - LowQuality: time.Second, - MidQuality: time.Second * 2, - HighQuality: time.Second * 3, + LowQuality: 500 * time.Millisecond, + MidQuality: time.Second, + HighQuality: time.Second, }, }, Audio: AudioConfig{ diff --git a/version/version.go b/version/version.go index 92878fdb1..da256244a 100644 --- a/version/version.go +++ b/version/version.go @@ -1,3 +1,3 @@ package version -const Version = "0.9.14" +const Version = "0.9.15-SNAPSHOT"