From 6b54f14dfe11900beb06af7ab9fbc76f1f77d35b Mon Sep 17 00:00:00 2001 From: Juliusz Chroboczek Date: Tue, 1 Feb 2022 15:20:43 +0100 Subject: [PATCH 1/3] Display correct maxBitrate in statistics. --- rtpconn/rtpstats.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rtpconn/rtpstats.go b/rtpconn/rtpstats.go index d10f57f..0fcde0d 100644 --- a/rtpconn/rtpstats.go +++ b/rtpconn/rtpstats.go @@ -56,6 +56,7 @@ func (c *webClient) GetStats() *stats.Client { tid := layer.tid maxTid := layer.maxTid rate, _ := t.rate.Estimate() + maxRate, _, _ := t.GetMaxBitrate() rtt := rtptime.ToDuration(t.getRTT(), rtptime.JiffiesPerSec) loss, jitter := t.stats.Get(jiffies) @@ -67,7 +68,7 @@ func (c *webClient) GetStats() *stats.Client { Sid: &sid, MaxSid: &maxSid, Bitrate: uint64(rate) * 8, - MaxBitrate: t.maxBitrate.Get(jiffies), + MaxBitrate: maxRate, Loss: float64(loss) / 256.0, Rtt: stats.Duration(rtt), Jitter: stats.Duration(j), From dc501044673b559167d99bf2de81318f0800fc7b Mon Sep 17 00:00:00 2001 From: Juliusz Chroboczek Date: Tue, 1 Feb 2022 20:15:17 +0100 Subject: [PATCH 2/3] Update pion/webrtc to v3.1.19. This fixes an issue with non-simulcast tracks being discarded when bundled with simulcast tracks. --- go.mod | 5 ++--- go.sum | 16 ++++++---------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index ab569c9..2acdd55 100644 --- a/go.mod +++ b/go.mod @@ -7,13 +7,12 @@ require ( github.com/gorilla/websocket v1.4.2 github.com/jech/cert v0.0.0-20210819231831-aca735647728 github.com/jech/samplebuilder v0.0.0-20220125212352-4553ed6f9a6c - github.com/pion/ice/v2 v2.1.19 - github.com/pion/interceptor v0.1.7 // indirect + github.com/pion/ice/v2 v2.1.20 github.com/pion/rtcp v1.2.9 github.com/pion/rtp v1.7.4 github.com/pion/sdp/v3 v3.0.4 github.com/pion/turn/v2 v2.0.6 - github.com/pion/webrtc/v3 v3.1.17 + github.com/pion/webrtc/v3 v3.1.19 golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 diff --git a/go.sum b/go.sum index e7c0f44..cf01d07 100644 --- a/go.sum +++ b/go.sum @@ -49,15 +49,12 @@ github.com/pion/datachannel v1.4.21/go.mod h1:oiNyP4gHx2DIwRzX/MFyH0Rz/Gz05OgBla github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E= github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ= github.com/pion/dtls/v2 v2.0.9/go.mod h1:O0Wr7si/Zj5/EBFlDzDd6UtVxx25CE1r7XM7BQKYQho= -github.com/pion/dtls/v2 v2.0.13/go.mod h1:OaE7eTM+ppaUhJ99OTO4aHl9uY6vPrT1gPY27uNTxRY= -github.com/pion/dtls/v2 v2.1.0 h1:g6gtKVNLp6URDkv9OijFJl16kqGHzVzZG+Fa4A38GTY= -github.com/pion/dtls/v2 v2.1.0/go.mod h1:qG3gA7ZPZemBqpEFqRKyURYdKEwFZQCGb7gv9T3ON3Y= +github.com/pion/dtls/v2 v2.1.1 h1:+ak8AXk2Hw0xjBTwC3ZwTmg72nLckNs3kpIugs4R594= +github.com/pion/dtls/v2 v2.1.1/go.mod h1:qG3gA7ZPZemBqpEFqRKyURYdKEwFZQCGb7gv9T3ON3Y= github.com/pion/ice/v2 v2.1.12/go.mod h1:ovgYHUmwYLlRvcCLI67PnQ5YGe+upXZbGgllBDG/ktU= -github.com/pion/ice/v2 v2.1.18/go.mod h1:9jDr0iIUg8P6+0Jq8QJ/eFSkX3JnsPd293TjCdkfpTs= -github.com/pion/ice/v2 v2.1.19 h1:z7iVx/fHlqvPILUbvcj1xjuz/6eVKgEFOM8h1AuLbF8= -github.com/pion/ice/v2 v2.1.19/go.mod h1:E5frMpIJ3zzcQiRo+XyT7z1IiAsGc1hDURcVJQUzGWA= +github.com/pion/ice/v2 v2.1.20 h1:xpxXyX5b4WjCh/D905gzBeW/hbJxMEPx2ptVfrhVE6M= +github.com/pion/ice/v2 v2.1.20/go.mod h1:hEAldRzBhTtAfvlU1V/2/nLCMvveQWFKPNCop+63/Iw= github.com/pion/interceptor v0.1.0/go.mod h1:j5NIl3tJJPB3u8+Z2Xz8MZs/VV6rc+If9mXEKNuFmEM= -github.com/pion/interceptor v0.1.6/go.mod h1:Lh3JSl/cbJ2wP8I3ccrjh1K/deRGRn3UlSPuOTiHb6U= github.com/pion/interceptor v0.1.7 h1:HThW0tIIKT9RRoDWGURe8rlZVOx0fJHxBHpA0ej0+bo= github.com/pion/interceptor v0.1.7/go.mod h1:Lh3JSl/cbJ2wP8I3ccrjh1K/deRGRn3UlSPuOTiHb6U= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= @@ -96,8 +93,8 @@ github.com/pion/turn/v2 v2.0.6/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkp github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= github.com/pion/webrtc/v3 v3.1.0/go.mod h1:t51XSam1k56eYLuO1Ubxjs3pDBfGYxkGBFhYf55Mn/s= -github.com/pion/webrtc/v3 v3.1.17 h1:6V4Yf5wnvJZKs86401EcpsKmB5Px5pfF1ICXdPIRsC0= -github.com/pion/webrtc/v3 v3.1.17/go.mod h1:kHunUx6HPCbCvGy/HdWQNwtT9LJ2XMS/sBmLwB1A4rs= +github.com/pion/webrtc/v3 v3.1.19 h1:a4mrYskJE9LLUEogSnYVBna0Plg+fwwGLkDraz1WSwI= +github.com/pion/webrtc/v3 v3.1.19/go.mod h1:JRlX2EANa0bbyNzbqhkSiio+tT284fgco03Xw+aS/4Q= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -112,7 +109,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce h1:Roh6XWxHFKrPgC/EQhVubSAGQ6Ozk6IdxHSzt1mR0EI= golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= From 6634b7c1e8862d07e42a87973eb9e6099bdbdeef Mon Sep 17 00:00:00 2001 From: Juliusz Chroboczek Date: Tue, 1 Feb 2022 20:18:44 +0100 Subject: [PATCH 3/3] Update CHANGES for 0.4.4. --- CHANGES | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 374abc9..57af2c1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,11 @@ -27 January 2021: Galène 0.4.3 +1 February 2022: Galene 0.4.4 + + * Update dependencies. Pion WebRTC v3.1.19 fixes a bug that could cause + audio tracks to be discarded under some circumstances. + * Fix a bug that could cause user statuses (raisehand) to be discarded. + * Fix incorrect maxRate value in statistics display. + +27 January 2022: Galène 0.4.3 * Fix a locking issue that could cause a deadlock when massive numbers of clients join at the same time.