From 7d7787590c9ee5799d1d581b6947bc1941f12aef Mon Sep 17 00:00:00 2001 From: David Zhao Date: Fri, 11 Dec 2020 20:15:04 -0800 Subject: [PATCH] updated server to webrtc v3 (untested) --- go.mod | 16 +- go.sum | 393 +++++++++++++++++++------------ pkg/rtc/config.go | 15 -- pkg/rtc/forwarder.go | 124 ++++++---- pkg/rtc/mediaengine.go | 161 ++++++------- pkg/rtc/mediaengine_test.go | 65 ------ pkg/rtc/participant.go | 215 +++++++++++++---- pkg/rtc/receiver.go | 109 ++------- pkg/rtc/room.go | 8 +- pkg/rtc/track.go | 120 ++++++---- pkg/sfu/README.md | 2 +- pkg/sfu/buffer.go | 454 ------------------------------------ pkg/sfu/downtrack.go | 273 ++++++++++++++++++++++ pkg/sfu/errors.go | 5 +- pkg/sfu/helpers.go | 54 +++-- pkg/sfu/helpers_test.go | 129 ---------- pkg/sfu/nacklist.go | 49 ++++ pkg/sfu/packetqueue.go | 124 ---------- pkg/sfu/packetqueue_test.go | 147 ------------ 19 files changed, 1019 insertions(+), 1444 deletions(-) delete mode 100644 pkg/rtc/mediaengine_test.go delete mode 100644 pkg/sfu/buffer.go create mode 100644 pkg/sfu/downtrack.go delete mode 100644 pkg/sfu/helpers_test.go create mode 100644 pkg/sfu/nacklist.go delete mode 100644 pkg/sfu/packetqueue.go delete mode 100644 pkg/sfu/packetqueue_test.go diff --git a/go.mod b/go.mod index 2e7a1f2ab..292751cef 100644 --- a/go.mod +++ b/go.mod @@ -9,24 +9,26 @@ require ( github.com/google/wire v0.4.0 github.com/gorilla/websocket v1.4.2 github.com/lithammer/shortuuid/v3 v3.0.4 - github.com/lucas-clemente/quic-go v0.19.1 // indirect + github.com/lunixbochs/vtclean v1.0.0 // indirect github.com/manifoldco/promptui v0.8.0 - github.com/pion/ice/v2 v2.0.10 // indirect + github.com/pion/interceptor v0.0.5 + github.com/pion/ion-log v1.0.0 + github.com/pion/ion-sfu v1.6.3 github.com/pion/randutil v0.1.0 - github.com/pion/rtcp v1.2.4 + github.com/pion/rtcp v1.2.6 github.com/pion/rtp v1.6.1 github.com/pion/sdp/v3 v3.0.3 github.com/pion/stun v0.3.5 - github.com/pion/webrtc/v3 v3.0.0-beta.12 + github.com/pion/webrtc/v3 v3.0.0-beta.15.0.20201209023348-63401a8837fb github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.6.1 github.com/twitchtv/twirp v7.1.0+incompatible github.com/urfave/cli/v2 v2.2.0 github.com/urfave/negroni v1.0.0 go.uber.org/zap v1.16.0 - golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9 // indirect - golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect - golang.org/x/sys v0.0.0-20201113233024-12cec1faf1ba // indirect + golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9 // indirect + golang.org/x/net v0.0.0-20201207224615-747e23833adb // indirect + golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d // indirect golang.org/x/tools v0.0.0-20200815165600-90abf76919f3 // indirect google.golang.org/protobuf v1.25.0 gopkg.in/yaml.v2 v2.3.0 diff --git a/go.sum b/go.sum index 0a2985b61..7f64c176b 100644 --- a/go.sum +++ b/go.sum @@ -1,21 +1,32 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo= -dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU= -dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= -dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= -dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= -git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= -github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/bep/debounce v1.2.0/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= -github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8= @@ -23,38 +34,47 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= -github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/gammazero/deque v0.0.0-20201010052221-3932da5530cc h1:F7BbnLACph7UYiz9ZHi6npcROwKaZUyviDjsNERsoMM= github.com/gammazero/deque v0.0.0-20201010052221-3932da5530cc/go.mod h1:IlBLfYXnuw9sspy1XS6ctu5exGb6WHGKQsyo4s7bOEA= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= -github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= @@ -66,16 +86,16 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -83,279 +103,334 @@ github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/wire v0.4.0 h1:kXcsA/rIGzJImVqPdhfnr6q0xsS9gU0515q1EPpJ9fE= github.com/google/wire v0.4.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU= -github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= -github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= +github.com/improbable-eng/grpc-web v0.13.0/go.mod h1:6hRR09jOEG81ADP5wCQju1z71g6OL4eEvELdran/3cs= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a h1:FaWFmfWdAUKbSCtOU2QjDaorUexogfaMgbipgYATUMU= github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a/go.mod h1:UJSiEoRfvx3hP73CvoARgeLjaIOjybY9vj8PUPPFGeU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lithammer/shortuuid/v3 v3.0.4 h1:uj4xhotfY92Y1Oa6n6HUiFn87CdoEHYUlTy0+IgbLrs= github.com/lithammer/shortuuid/v3 v3.0.4/go.mod h1:RviRjexKqIzx/7r1peoAITm6m7gnif/h+0zmolKJjzw= -github.com/lucas-clemente/quic-go v0.18.0 h1:JhQDdqxdwdmGdKsKgXi1+coHRoGhvU6z0rNzOJqZ/4o= -github.com/lucas-clemente/quic-go v0.18.0/go.mod h1:yXttHsSNxQi8AWijC/vLP+OJczXqzHSOcJrM5ITUlCg= -github.com/lucas-clemente/quic-go v0.19.1 h1:J9TkQJGJVOR3UmGhd4zdVYwKSA0EoXbLRf15uQJ6gT4= -github.com/lucas-clemente/quic-go v0.19.1/go.mod h1:ZUygOqIoai0ASXXLJ92LTnKdbqh9MHCLTX6Nr1jUrK0= +github.com/lucsky/cuid v1.0.2/go.mod h1:QaaJqckboimOmhRSJXSx/+IT+VTfxfPGSo/6mfgUfmE= github.com/lunixbochs/vtclean v0.0.0-20180621232353-2d01aacdc34a/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= github.com/lunixbochs/vtclean v1.0.0 h1:xu2sLAri4lGiovBDQKxl5mrXyESr3gUr5m5SM5+LVb8= github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= -github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/manifoldco/promptui v0.8.0 h1:R95mMF+McvXZQ7j1g8ucVZE1gLP3Sv6j9vlF9kyRqQo= github.com/manifoldco/promptui v0.8.0/go.mod h1:n4zTdgP0vr0S3w7/O/g98U+e0gwLScEXGwov2nIKuGQ= -github.com/marten-seemann/qpack v0.2.0/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= -github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= -github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc= -github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs= -github.com/marten-seemann/qtls-go1-15 v0.1.0 h1:i/YPXVxz8q9umso/5y474CNcHmTpA+5DH+mFPjx6PZg= -github.com/marten-seemann/qtls-go1-15 v0.1.0/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I= -github.com/marten-seemann/qtls-go1-15 v0.1.1 h1:LIH6K34bPVttyXnUWixk0bzH6/N07VxbSabxn5A5gZQ= -github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I= github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= -github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= -github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= +github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pion/datachannel v1.4.21 h1:3ZvhNyfmxsAqltQrApLPQMhSFNA+aT87RqyCq4OXmf0= github.com/pion/datachannel v1.4.21/go.mod h1:oiNyP4gHx2DIwRzX/MFyH0Rz/Gz05OgBlayAI2hAWjg= -github.com/pion/dtls/v2 v2.0.3 h1:3qQ0s4+TXD00rsllL8g8KQcxAs+Y/Z6oz618RXX6p14= -github.com/pion/dtls/v2 v2.0.3/go.mod h1:TUjyL8bf8LH95h81Xj7kATmzMRt29F/4lxpIPj2Xe4Y= -github.com/pion/ice/v2 v2.0.9 h1:oHbiN6Q9tgb8Gfu3I4cbr5mHRE1uqiuFABQ8CbWjIyk= -github.com/pion/ice/v2 v2.0.9/go.mod h1:NK+o39ynb+N1YSj9fPgWs3vjVcrsWw0KCr/311MqVq8= -github.com/pion/ice/v2 v2.0.10 h1:MrT9JfH41YwB6kLm5ZJLaPillBM4MEjPZa3hWDBLGxo= -github.com/pion/ice/v2 v2.0.10/go.mod h1:Sqdo0oy3ZkaOCsK7Ai9ksLpJkREG03R3fHMJ0PXmHO8= +github.com/pion/dtls/v2 v2.0.4 h1:WuUcqi6oYMu/noNTz92QrF1DaFj4eXbhQ6dzaaAwOiI= +github.com/pion/dtls/v2 v2.0.4/go.mod h1:qAkFscX0ZHoI1E07RfYPoRw3manThveu+mlTDdOxoGI= +github.com/pion/ice/v2 v2.0.13 h1:lVe7g86tQ0vKdH430hQR/t7zV1oeXbK75130TUArrnw= +github.com/pion/ice/v2 v2.0.13/go.mod h1:mZlypgoynMn2ayhGsjrPY/G/WiRiYO8WCPC6gUeg1RA= +github.com/pion/interceptor v0.0.5 h1:BOwlubM1lntji3eNaVrhW1Qk3u1UoemrhM4mbv24XGM= +github.com/pion/interceptor v0.0.5/go.mod h1:lPVrf5xfosI989ZcmgPS4WwwRhd+XAyTFaYI2wHf7nU= +github.com/pion/ion-log v1.0.0 h1:2lJLImCmfCWCR38hLWsjQfBWe6NFz/htbqiYHwvOP/Q= +github.com/pion/ion-log v1.0.0/go.mod h1:jwcla9KoB9bB/4FxYDSRJPcPYSLp5XiUUMnOLaqwl4E= +github.com/pion/ion-sfu v1.6.3 h1:qK0nn57I2DDsylszNZPjbroF8V1MI8nE4wsDePf/s9U= +github.com/pion/ion-sfu v1.6.3/go.mod h1:xHrwxirzClAvn056es4grzQq0BactA7esDBsQuRf7k8= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= github.com/pion/mdns v0.0.4 h1:O4vvVqr4DGX63vzmO6Fw9vpy3lfztVWHGCQfyw0ZLSY= github.com/pion/mdns v0.0.4/go.mod h1:R1sL0p50l42S5lJs91oNdUL58nm0QHrhxnSegr++qC0= -github.com/pion/quic v0.1.4 h1:bNz9sCJjlM3GqMdq7Fne57FiWfdyiJ++yHVbuqeoD3Y= -github.com/pion/quic v0.1.4/go.mod h1:dBhNvkLoQqRwfi6h3Vqj3IcPLgiW7rkZxBbRdp7Vzvk= github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= github.com/pion/rtcp v1.2.4 h1:NT3H5LkUGgaEapvp0HGik+a+CpflRF7KTD7H+o7OWIM= github.com/pion/rtcp v1.2.4/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0= +github.com/pion/rtcp v1.2.6 h1:1zvwBbyd0TeEuuWftrd/4d++m+/kZSeiguxU61LFWpo= +github.com/pion/rtcp v1.2.6/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0= github.com/pion/rtp v1.6.1 h1:2Y2elcVBrahYnHKN2X7rMHX/r1R4TEBMP1LaVu/wNhk= github.com/pion/rtp v1.6.1/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= github.com/pion/sctp v1.7.10/go.mod h1:EhpTUQu1/lcK3xI+eriS6/96fWetHGCvBi9MSsnaBN0= github.com/pion/sctp v1.7.11 h1:UCnj7MsobLKLuP/Hh+JMiI/6W5Bs/VF45lWKgHFjSIE= github.com/pion/sctp v1.7.11/go.mod h1:EhpTUQu1/lcK3xI+eriS6/96fWetHGCvBi9MSsnaBN0= -github.com/pion/sdp/v3 v3.0.2 h1:UNnSPVaMM+Pdu/mR9UvAyyo6zkdYbKeuOooCwZvTl/g= -github.com/pion/sdp/v3 v3.0.2/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk= github.com/pion/sdp/v3 v3.0.3 h1:gJK9hk+JFD2NGIM1nXmqNCq1DkVaIZ9dlA3u3otnkaw= github.com/pion/sdp/v3 v3.0.3/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk= -github.com/pion/srtp v1.5.2 h1:25DmvH+fqKZDqvX64vTwnycVwL9ooJxHF/gkX16bDBY= -github.com/pion/srtp v1.5.2/go.mod h1:NiBff/MSxUwMUwx/fRNyD/xGE+dVvf8BOCeXhjCXZ9U= +github.com/pion/srtp/v2 v2.0.0-rc.3 h1:1fPiK1nJlNyh235tSGgBnXrPc99wK1/D707f6ntb3qY= +github.com/pion/srtp/v2 v2.0.0-rc.3/go.mod h1:S6J9oY6ahAXdU3ni4nUwhWTJuBfssFjPxoB0u41TBpY= github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg= github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA= github.com/pion/transport v0.8.10/go.mod h1:tBmha/UCjpum5hqTWhfAEs3CO4/tHSg0MYRhSzR+CZ8= github.com/pion/transport v0.10.0/go.mod h1:BnHnUipd0rZQyTVB2SBGojFHT9CBt5C5TcsJSQGkvSE= github.com/pion/transport v0.10.1 h1:2W+yJT+0mOQ160ThZYUx5Zp2skzshiNgxrNE9GUfhJM= github.com/pion/transport v0.10.1/go.mod h1:PBis1stIILMiis0PewDw91WJeLJkyIMcEk+DwKOzf4A= -github.com/pion/turn/v2 v2.0.4 h1:oDguhEv2L/4rxwbL9clGLgtzQPjtuZwCdoM7Te8vQVk= -github.com/pion/turn/v2 v2.0.4/go.mod h1:1812p4DcGVbYVBTiraUmP50XoKye++AMkbfp+N27mog= +github.com/pion/transport v0.11.0/go.mod h1:ORH8Ouyl1enoJyHwU+MwMeQocWbeorEk5068FOsHjog= +github.com/pion/transport v0.12.0 h1:UFmOBBZkTZ3LgvLRf/NGrfWdZEubcU6zkLU3PsA9YvU= +github.com/pion/transport v0.12.0/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= github.com/pion/turn/v2 v2.0.5 h1:iwMHqDfPEDEOFzwWKT56eFmh6DYC6o/+xnLAEzgISbA= github.com/pion/turn/v2 v2.0.5/go.mod h1:APg43CFyt/14Uy7heYUOGWdkem/Wu4PhCO/bjyrTqMw= github.com/pion/udp v0.1.0 h1:uGxQsNyrqG3GLINv36Ff60covYmfrLoxzwnCsIYspXI= github.com/pion/udp v0.1.0/go.mod h1:BPELIjbwE9PRbd/zxI/KYBnbo7B6+oA6YuEaNE8lths= -github.com/pion/webrtc/v3 v3.0.0-beta.12 h1:Civb1OA2ACJ3jXrqU1qrRY9stecLI3pZPnILAX3IWJ4= -github.com/pion/webrtc/v3 v3.0.0-beta.12/go.mod h1:UbmDN5G82nXLXAiSIo0HYU68GN6z09jeKSNEaDUzFvY= -github.com/pion/webrtc/v3 v3.0.0-beta.12.0.20201115002753-64bbf7eea97d h1:31CZJrqVx36tw/O31uQtcPYzrlHXNjLYghCrxhU+1Tg= -github.com/pion/webrtc/v3 v3.0.0-beta.12.0.20201115002753-64bbf7eea97d/go.mod h1:UbmDN5G82nXLXAiSIo0HYU68GN6z09jeKSNEaDUzFvY= +github.com/pion/webrtc/v3 v3.0.0-beta.15.0.20201209023348-63401a8837fb h1:odlj6CPofUlcqGpFZyRbCCBHEv9WJaPWUIqO/IPiTuk= +github.com/pion/webrtc/v3 v3.0.0-beta.15.0.20201209023348-63401a8837fb/go.mod h1:549ITPqIAp16O7ZtSRPAhj+CSteoM3Yjcb5xpDoT3vY= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= 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= -github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= -github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +github.com/rs/zerolog v1.20.0 h1:38k9hgtUBdxFwE34yS8rTHmHBa4eN16E4DJlv177LNs= +github.com/rs/zerolog v1.20.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo= github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY= -github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM= -github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0= -github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= -github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= -github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw= -github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod h1:8d3azKNyqcHP1GaQE/c6dDgjkgSx2BZ4IoEi4F1reUI= -github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod h1:ZpfEhSmds4ytuByIcDnOLkTHGUI6KNqRNPDLHDk+mUU= -github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag= -github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod h1:+rgNQw2P9ARFAs37qieuu7ohDNQ3gds9msbT2yn85sg= -github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod h1:zPn1wHpTIePGnXSHpsVPWEktKXHr6+SS6x/IKRb7cpw= -github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod h1:aYMfkZ6DWSJPJ6c4Wwz3QtW22G7mf/PEgaB9k/ik5+Y= -github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= -github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod h1:919LwcH0M7/W4fcZ0/jy0qGght1GIhqyS/EgWGH2j5Q= -github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod h1:e2qWDig5bLteJ4fwvDAc2NHzqFEthkqn7aOZAOpj+PQ= -github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod h1:NPpHK2TI7iSaM0buivtFUc9offApnI0Alt/K8hcHy0I= -github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod h1:b5uSkrEVM1jQUspwbixRBhaIjIzL2xazXp6kntxYle0= -github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ= -github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1lToEk4d2s07G3XGfz2QrgHXg4RJBvjrOozvoWfk= -github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4= -github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= -github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE= -github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/sourcegraph/jsonrpc2 v0.0.0-20200429184054-15c2290dcb37/go.mod h1:ZafdZgk/axhT1cvZAPOhw+95nz2I/Ra5qMlU4gTRwIo= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/twitchtv/twirp v7.1.0+incompatible h1:3fNSDoSPyq+fTrifIvGue9XM/tptzuhiGY83rxPVNUg= github.com/twitchtv/twirp v7.1.0+incompatible/go.mod h1:RRJoFSAmTEh2weEqWtpPE3vFK5YBhA6bqp2l1kfCC5A= github.com/urfave/cli/v2 v2.2.0 h1:JTTnM6wKzdA0Jqodd966MVj4vWbbquZykeX1sKbe2C4= github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc= github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= -github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= -github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= -go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= -golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= -golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM= -golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9 h1:umElSU9WZirRdgu2yFHY0ayQkEnKiOC1TtM3fWXFnoU= -golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9 h1:sYNJzB4J8toYPQTM6pAkcmBRgw9SnQKP9oXCHfgy604= +golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201002202402-0a1ea396d57c/go.mod h1:iQL9McJNjoIa5mjH6nYTCTZXUN6RP+XW3eib7Ya3XcI= +golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 h1:42cLlJJdEh+ySyeUUbEQ5bsTiq8voBeTuweGVkY6Puw= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7 h1:3uJsdck53FDIpWwLeAXlia9p4C8j0BO2xZrqzKpL0D8= +golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201207224615-747e23833adb h1:xj2oMIbduz83x7tzglytWT7spn6rP+9hvKjTpro6/pM= +golang.org/x/net v0.0.0-20201207224615-747e23833adb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201113233024-12cec1faf1ba h1:xmhUJGQGbxlod18iJGqVEp9cHIPLl7QiX2aA3to708s= -golang.org/x/sys v0.0.0-20201113233024-12cec1faf1ba/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d h1:MiWWjyhUzZ+jvhZvloX6ZrUsdEghn8a64Upd8EMHglE= +golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5 h1:hKsoRgsbwY1NafxrwTs+k64bikrLBkAgPir1TNCj3Zs= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200815165600-90abf76919f3 h1:0aScV/0rLmANzEYIhjCOi2pTvDyhZNduBUMD2q3iqs4= golang.org/x/tools v0.0.0-20200815165600-90abf76919f3/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= @@ -364,30 +439,37 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= -google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= -google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= -google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc/examples v0.0.0-20201209011439-fd32f6a4fefe/go.mod h1:Ly7ZA/ARzg8fnPU9TyZIxoz33sEUuWX7txiqs8lPTgE= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -397,17 +479,22 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -415,14 +502,10 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= -sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/pkg/rtc/config.go b/pkg/rtc/config.go index ae9ac4c46..bc78042d1 100644 --- a/pkg/rtc/config.go +++ b/pkg/rtc/config.go @@ -2,9 +2,7 @@ package rtc import ( "fmt" - "net/url" - "github.com/pion/sdp/v3" "github.com/pion/webrtc/v3" "github.com/livekit/livekit-server/pkg/config" @@ -54,19 +52,6 @@ func NewWebRTCConfig(conf *config.RTCConfig, externalIP string) (*WebRTCConfig, s.SetNAT1To1IPs([]string{externalIP}, webrtc.ICECandidateTypeHost) } - // Configure required extensions - sdes, _ := url.Parse(sdp.SDESRTPStreamIDURI) - sdedMid, _ := url.Parse(sdp.SDESMidURI) - exts := []sdp.ExtMap{ - { - URI: sdes, - }, - { - URI: sdedMid, - }, - } - s.AddSDPExtensions(webrtc.SDPSectionVideo, exts) - return &WebRTCConfig{ Configuration: c, SettingEngine: s, diff --git a/pkg/rtc/forwarder.go b/pkg/rtc/forwarder.go index b2ede5622..89c3c9bc4 100644 --- a/pkg/rtc/forwarder.go +++ b/pkg/rtc/forwarder.go @@ -6,15 +6,20 @@ import ( "sync" "time" - "github.com/livekit/livekit-server/pkg/logger" - "github.com/livekit/livekit-server/pkg/sfu" "github.com/pion/rtcp" "github.com/pion/rtp" "github.com/pion/webrtc/v3" + + "github.com/livekit/livekit-server/pkg/logger" + "github.com/livekit/livekit-server/pkg/sfu" ) -// a forwarder publishes data to a target mediaTrack or datachannel -// manages the RTCP loop with the target peer +type PacketBuffer interface { + GetBufferedPackets(mediaSSRC uint32, snOffset uint16, tsOffset uint32, sn []uint16) []rtp.Packet +} + +// a forwarder publishes data to a target remoteTrack or datachannel +// manages the RTCP loop with the target participant type Forwarder interface { ChannelType() ChannelType WriteRTP(*rtp.Packet) error @@ -38,14 +43,12 @@ const ( ) type SimpleForwarder struct { - ctx context.Context - cancel context.CancelFunc - rtcpWriter RTCPWriter // write RTCP to source peer - sender *webrtc.RTPSender // destination sender - track *webrtc.Track // sender track - buffer *sfu.Buffer - channelType ChannelType - payload uint8 + ctx context.Context + cancel context.CancelFunc + sourceRtcpCh chan []rtcp.Packet // channel to write RTCP packets to source + track *sfu.DownTrack // sender track + packetBuffer PacketBuffer + channelType ChannelType lastPli time.Time createdAt time.Time @@ -56,17 +59,15 @@ type SimpleForwarder struct { onClose func(forwarder Forwarder) } -func NewSimpleForwarder(ctx context.Context, rtcpWriter RTCPWriter, sender *webrtc.RTPSender, buffer *sfu.Buffer) *SimpleForwarder { - ctx, cancel := context.WithCancel(ctx) +func NewSimpleForwarder(rtcpCh chan []rtcp.Packet, track *sfu.DownTrack, pb PacketBuffer) *SimpleForwarder { + ctx, cancel := context.WithCancel(context.Background()) f := &SimpleForwarder{ - ctx: ctx, - cancel: cancel, - rtcpWriter: rtcpWriter, - sender: sender, - buffer: buffer, - track: sender.Track(), - payload: sender.Track().PayloadType(), - createdAt: time.Now(), + ctx: ctx, + cancel: cancel, + sourceRtcpCh: rtcpCh, + packetBuffer: pb, + track: track, + createdAt: time.Now(), } if f.track.Kind() == webrtc.RTPCodecTypeAudio { @@ -75,6 +76,9 @@ func NewSimpleForwarder(ctx context.Context, rtcpWriter RTCPWriter, sender *webr f.channelType = ChannelVideo } + // when underlying track is closed, close the forwarder too + track.OnCloseHandler(f.Close) + return f } @@ -89,10 +93,10 @@ func (f *SimpleForwarder) Start() { } func (f *SimpleForwarder) Close() { - if f.ctx.Err() != nil { - return - } - f.cancel() + //if f.ctx.Err() != nil { + // return + //} + //f.cancel() if f.onClose != nil { f.onClose(f) } @@ -100,10 +104,10 @@ func (f *SimpleForwarder) Close() { // Writes an RTP packet to peer func (f *SimpleForwarder) WriteRTP(pkt *rtp.Packet) error { - if f.ctx.Err() != nil { - // skip canceled context errors - return nil - } + //if f.ctx.Err() != nil { + // // skip canceled context errors + // return nil + //} err := f.track.WriteRTP(pkt) @@ -129,36 +133,57 @@ func (f *SimpleForwarder) CreatedAt() time.Time { // this include packet loss packets func (f *SimpleForwarder) rtcpWorker() { for { - pkts, err := f.sender.ReadRTCP() + pkts, err := f.track.RTPSender().ReadRTCP() if err == io.ErrClosedPipe { f.Close() return } - if f.ctx.Err() != nil { - return - } + //if f.ctx.Err() != nil { + // return + //} if err != nil { - // TODO: log error + logger.GetLogger().Errorw("could not write read RTCP", + "err", err) } var fwdPkts []rtcp.Packet + pliOnce := true + firOnce := true for _, pkt := range pkts { - switch pkt := pkt.(type) { - case *rtcp.PictureLossIndication, *rtcp.FullIntraRequest: - fwdPkts = append(fwdPkts, pkt) - f.lastPli = time.Now() + switch p := pkt.(type) { + case *rtcp.PictureLossIndication: + if pliOnce { + p.MediaSSRC = f.track.LastSSRC() + p.SenderSSRC = f.track.LastSSRC() + fwdPkts = append(fwdPkts, p) + pliOnce = false + } + case *rtcp.FullIntraRequest: + if firOnce { + p.MediaSSRC = f.track.LastSSRC() + p.SenderSSRC = f.track.SSRC() + fwdPkts = append(fwdPkts, p) + firOnce = false + } + case *rtcp.ReceiverReport: + if len(p.Reports) > 0 && p.Reports[0].FractionLost > 25 { + //log.Tracef("Slow link for sender %s, fraction packet lost %.2f", f.track.peerID, float64(p.Reports[0].FractionLost)/256) + } case *rtcp.TransportLayerNack: - for _, pair := range pkt.Nacks { - if err := f.buffer.WritePacket( - pair.PacketID, - f.track, - 0, - 0, + logger.GetLogger().Debugw("forwarder got nack", + "packet", p) + for _, pair := range p.Nacks { + bufferedPackets := f.packetBuffer.GetBufferedPackets( f.track.SSRC(), - ); err == sfu.ErrPacketNotFound { - // TODO handle missing nacks in sfu cache + f.track.SnOffset(), + f.track.TsOffset(), + f.track.GetNACKSeqNo(pair.PacketList()), + ) + for i, _ := range bufferedPackets { + pt := bufferedPackets[i] + f.track.WriteRTP(&rtp.Packet{Header: pt.Header, Payload: pt.Payload}) } } default: @@ -167,10 +192,7 @@ func (f *SimpleForwarder) rtcpWorker() { } if len(fwdPkts) > 0 { - if err := f.rtcpWriter.WriteRTCP(fwdPkts); err != nil { - logger.GetLogger().Warnw("could not forward RTCP to peer", - "err", err) - } + f.sourceRtcpCh <- fwdPkts } } } diff --git a/pkg/rtc/mediaengine.go b/pkg/rtc/mediaengine.go index cf61cd02e..9efb03c82 100644 --- a/pkg/rtc/mediaengine.go +++ b/pkg/rtc/mediaengine.go @@ -1,101 +1,82 @@ package rtc import ( - "fmt" - "strconv" - "strings" - "github.com/pion/sdp/v3" "github.com/pion/webrtc/v3" ) const ( - mediaNameAudio = "audio" - mediaNameVideo = "video" + mimeTypeH264 = "video/h264" + mimeTypeOpus = "audio/opus" + mimeTypeVP8 = "video/vp8" + mimeTypeVP9 = "video/vp9" ) -// MediaEngine handles stream codecs -type MediaEngine struct { - webrtc.MediaEngine - feedbackTypes []webrtc.RTCPFeedback - TCCExt int -} - -// PopulateFromSDP finds all codecs in sd and adds them to m, using the dynamic -// payload types and parameters from sd. -// PopulateFromSDP is intended for use when answering a request. -// The offerer sets the PayloadTypes for the connection. -// PopulateFromSDP allows an answerer to properly match the PayloadTypes from the offerer. -// A MediaEngine populated by PopulateFromSDP should be used only for a single session. -func (e *MediaEngine) PopulateFromSDP(sd webrtc.SessionDescription) error { - s := sdp.SessionDescription{} - if err := s.Unmarshal([]byte(sd.SDP)); err != nil { - return err - } - - for _, md := range s.MediaDescriptions { - if md.MediaName.Media != mediaNameAudio && md.MediaName.Media != mediaNameVideo { - continue - } - - for _, att := range md.Attributes { - if att.Key == sdp.AttrKeyExtMap && strings.HasSuffix(att.Value, sdp.TransportCCURI) { - e.TCCExt, _ = strconv.Atoi(att.Value[:1]) - break - } - } - - for _, format := range md.MediaName.Formats { - pt, err := strconv.Atoi(format) - if err != nil { - return fmt.Errorf("format parse error") - } - - payloadType := uint8(pt) - payloadCodec, err := s.GetCodecForPayloadType(payloadType) - if err != nil { - return fmt.Errorf("could not find codec for payload type %d", payloadType) - } - - var codec *webrtc.RTPCodec - switch { - case strings.EqualFold(payloadCodec.Name, webrtc.Opus): - codec = webrtc.NewRTPOpusCodec(payloadType, payloadCodec.ClockRate) - case strings.EqualFold(payloadCodec.Name, webrtc.VP8): - codec = webrtc.NewRTPVP8CodecExt(payloadType, payloadCodec.ClockRate, e.feedbackTypes, payloadCodec.Fmtp) - case strings.EqualFold(payloadCodec.Name, webrtc.VP9): - codec = webrtc.NewRTPVP9CodecExt(payloadType, payloadCodec.ClockRate, e.feedbackTypes, payloadCodec.Fmtp) - case strings.EqualFold(payloadCodec.Name, webrtc.H264): - codec = webrtc.NewRTPH264CodecExt(payloadType, payloadCodec.ClockRate, e.feedbackTypes, payloadCodec.Fmtp) - default: - // ignoring other codecs - continue - } - - e.RegisterCodec(codec) - } - } - - // Use defaults for codecs not provided in sdp - if len(e.GetCodecsByName(webrtc.Opus)) == 0 { - codec := webrtc.NewRTPOpusCodec(webrtc.DefaultPayloadTypeOpus, 48000) - e.RegisterCodec(codec) - } - - if len(e.GetCodecsByName(webrtc.VP8)) == 0 { - codec := webrtc.NewRTPVP8CodecExt(webrtc.DefaultPayloadTypeVP8, 90000, e.feedbackTypes, "") - e.RegisterCodec(codec) - } - - if len(e.GetCodecsByName(webrtc.VP9)) == 0 { - codec := webrtc.NewRTPVP9CodecExt(webrtc.DefaultPayloadTypeVP9, 90000, e.feedbackTypes, "") - e.RegisterCodec(codec) - } - - if len(e.GetCodecsByName(webrtc.H264)) == 0 { - codec := webrtc.NewRTPH264CodecExt(webrtc.DefaultPayloadTypeH264, 90000, e.feedbackTypes, "") - e.RegisterCodec(codec) - } - - return nil +func createMediaEngine() (*webrtc.MediaEngine, error) { + me := &webrtc.MediaEngine{} + if err := me.RegisterCodec(webrtc.RTPCodecParameters{ + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeOpus, ClockRate: 48000, Channels: 2, SDPFmtpLine: "minptime=10;useinbandfec=1", RTCPFeedback: nil}, + PayloadType: 111, + }, webrtc.RTPCodecTypeAudio); err != nil { + return nil, err + } + + videoRTCPFeedback := []webrtc.RTCPFeedback{{"goog-remb", ""}, {"ccm", "fir"}, {"nack", ""}, {"nack", "pli"}} + for _, codec := range []webrtc.RTPCodecParameters{ + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeVP8, ClockRate: 90000, RTCPFeedback: videoRTCPFeedback}, + PayloadType: 96, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeVP9, ClockRate: 90000, SDPFmtpLine: "profile-id=0", RTCPFeedback: videoRTCPFeedback}, + PayloadType: 98, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeVP9, ClockRate: 90000, SDPFmtpLine: "profile-id=1", RTCPFeedback: videoRTCPFeedback}, + PayloadType: 100, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeH264, ClockRate: 90000, SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42001f", RTCPFeedback: videoRTCPFeedback}, + PayloadType: 102, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeH264, ClockRate: 90000, SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=0;profile-level-id=42001f", RTCPFeedback: videoRTCPFeedback}, + PayloadType: 127, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeH264, ClockRate: 90000, SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42e01f", RTCPFeedback: videoRTCPFeedback}, + PayloadType: 125, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeH264, ClockRate: 90000, SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=0;profile-level-id=42e01f", RTCPFeedback: videoRTCPFeedback}, + PayloadType: 108, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeH264, ClockRate: 90000, SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=0;profile-level-id=42001f", RTCPFeedback: videoRTCPFeedback}, + PayloadType: 127, + }, + { + RTPCodecCapability: webrtc.RTPCodecCapability{MimeType: mimeTypeH264, ClockRate: 90000, SDPFmtpLine: "level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=640032", RTCPFeedback: videoRTCPFeedback}, + PayloadType: 123, + }, + } { + if err := me.RegisterCodec(codec, webrtc.RTPCodecTypeVideo); err != nil { + return nil, err + } + } + + for _, extension := range []string{ + sdp.SDESMidURI, + sdp.SDESRTPStreamIDURI, + sdp.TransportCCURI, + } { + if err := me.RegisterHeaderExtension(webrtc.RTPHeaderExtensionCapability{URI: extension}, webrtc.RTPCodecTypeAudio); err != nil { + return nil, err + } + if err := me.RegisterHeaderExtension(webrtc.RTPHeaderExtensionCapability{URI: extension}, webrtc.RTPCodecTypeVideo); err != nil { + return nil, err + } + } + + return me, nil } diff --git a/pkg/rtc/mediaengine_test.go b/pkg/rtc/mediaengine_test.go deleted file mode 100644 index 0df9a5068..000000000 --- a/pkg/rtc/mediaengine_test.go +++ /dev/null @@ -1,65 +0,0 @@ -package rtc - -import ( - "testing" - - "github.com/pion/webrtc/v3" - "github.com/stretchr/testify/assert" -) - -const sdpValue = `v=0 -o=- 884433216 1576829404 IN IP4 0.0.0.0 -s=- -t=0 0 -a=fingerprint:sha-256 1D:6B:6D:18:95:41:F9:BC:E4:AC:25:6A:26:A3:C8:09:D2:8C:EE:1B:7D:54:53:33:F7:E3:2C:0D:FE:7A:9D:6B -a=group:BUNDLE 0 1 2 -m=audio 9 UDP/TLS/RTP/SAVPF 0 8 111 9 -c=IN IP4 0.0.0.0 -a=mid:0 -a=rtpmap:0 PCMU/8000 -a=rtpmap:8 PCMA/8000 -a=rtpmap:111 opus/48000/2 -a=fmtp:111 minptime=10;useinbandfec=1 -a=rtpmap:9 G722/8000 -a=ssrc:1823804162 cname:pion1 -a=ssrc:1823804162 msid:pion1 audio -a=ssrc:1823804162 mslabel:pion1 -a=ssrc:1823804162 label:audio -a=msid:pion1 audio -m=video 9 UDP/TLS/RTP/SAVPF 105 115 135 -c=IN IP4 0.0.0.0 -a=mid:1 -a=rtpmap:105 VP8/90000 -a=rtpmap:115 H264/90000 -a=fmtp:115 level-asymmetry-allowed=1;packetization-mode=1;profile-level-id=42001f -a=rtpmap:135 VP9/90000 -a=ssrc:2949882636 cname:pion2 -a=ssrc:2949882636 msid:pion2 video -a=ssrc:2949882636 mslabel:pion2 -a=ssrc:2949882636 label:video -a=msid:pion2 video -m=application 9 DTLS/SCTP 5000 -c=IN IP4 0.0.0.0 -a=mid:2 -a=sctpmap:5000 webrtc-datachannel 1024 -` - -func TestPopulateFromSDP(t *testing.T) { - m := MediaEngine{} - assertCodecWithPayloadType := func(name string, payloadType uint8) { - for _, c := range m.GetCodecsByName(name) { - if c.PayloadType == payloadType && c.Name == name { - return - } - } - t.Fatalf("Failed to find codec(%s) with PayloadType(%d)", name, payloadType) - } - - m.RegisterDefaultCodecs() - assert.NoError(t, m.PopulateFromSDP(webrtc.SessionDescription{SDP: sdpValue})) - - assertCodecWithPayloadType(webrtc.Opus, 111) - assertCodecWithPayloadType(webrtc.VP8, 105) - assertCodecWithPayloadType(webrtc.H264, 115) - assertCodecWithPayloadType(webrtc.VP9, 135) -} diff --git a/pkg/rtc/participant.go b/pkg/rtc/participant.go index e1a4aab7c..9635810c4 100644 --- a/pkg/rtc/participant.go +++ b/pkg/rtc/participant.go @@ -2,27 +2,38 @@ package rtc import ( "context" + "io" "sync" "time" + "github.com/pion/interceptor" + "github.com/pion/ion-sfu/pkg/buffer" "github.com/pion/rtcp" "github.com/pion/webrtc/v3" "github.com/pkg/errors" "github.com/livekit/livekit-server/pkg/logger" + "github.com/livekit/livekit-server/pkg/sfu" "github.com/livekit/livekit-server/pkg/utils" "github.com/livekit/livekit-server/proto/livekit" ) +const ( + sdBatchSize = 20 +) + type Participant struct { id string peerConn *webrtc.PeerConnection sigConn SignalConnection ctx context.Context cancel context.CancelFunc - mediaEngine *MediaEngine + mediaEngine *webrtc.MediaEngine name string state livekit.ParticipantInfo_State + bi *buffer.Interceptor + rtcpCh chan []rtcp.Packet + downTracks map[string][]*sfu.DownTrack lock sync.RWMutex receiverConfig ReceiverConfig @@ -30,7 +41,7 @@ type Participant struct { once sync.Once // callbacks & handlers - // OnParticipantTrack - remote peer added a mediaTrack + // OnParticipantTrack - remote peer added a remoteTrack OnParticipantTrack func(*Participant, *Track) // OnOffer - offer is ready for remote peer OnOffer func(webrtc.SessionDescription) @@ -41,15 +52,18 @@ type Participant struct { } func NewParticipant(conf *WebRTCConfig, sc SignalConnection, name string) (*Participant, error) { - me := webrtc.MediaEngine{} + me := &webrtc.MediaEngine{} me.RegisterDefaultCodecs() api := webrtc.NewAPI(webrtc.WithMediaEngine(me), webrtc.WithSettingEngine(conf.SettingEngine)) pc, err := api.NewPeerConnection(conf.Configuration) - if err != nil { return nil, err } + bi := buffer.NewBufferInterceptor() + ir := &interceptor.Registry{} + ir.Add(bi) + ctx, cancel := context.WithCancel(context.Background()) participant := &Participant{ id: utils.NewGuid(utils.ParticipantPrefix), @@ -58,13 +72,14 @@ func NewParticipant(conf *WebRTCConfig, sc SignalConnection, name string) (*Part sigConn: sc, ctx: ctx, cancel: cancel, + bi: bi, + downTracks: make(map[string][]*sfu.DownTrack), state: livekit.ParticipantInfo_JOINING, lock: sync.RWMutex{}, receiverConfig: conf.receiver, tracks: make(map[string]*Track, 0), - mediaEngine: &MediaEngine{}, + mediaEngine: me, } - participant.mediaEngine.RegisterDefaultCodecs() log := logger.GetLogger() @@ -211,9 +226,30 @@ func (p *Participant) AddICECandidate(candidate webrtc.ICECandidateInit) error { return nil } +func (p *Participant) addDownTrack(streamId string, dt *sfu.DownTrack) { + p.lock.Lock() + p.downTracks[streamId] = append(p.downTracks[streamId], dt) + p.lock.Unlock() + p.scheduleDownTrackBindingReports(streamId) +} + +func (p *Participant) removeDownTrack(streamId string, dt *sfu.DownTrack) { + p.lock.Lock() + defer p.lock.Unlock() + tracks := p.downTracks[streamId] + newTracks := make([]*sfu.DownTrack, 0, len(tracks)) + for _, track := range tracks { + if track != dt { + newTracks = append(newTracks, track) + } + } + p.downTracks[streamId] = newTracks +} + func (p *Participant) Start() { p.once.Do(func() { go p.rtcpSendWorker() + go p.downTracksRTCPWorker() }) } @@ -221,6 +257,7 @@ func (p *Participant) Close() error { if p.ctx.Err() != nil { return p.ctx.Err() } + close(p.rtcpCh) p.updateState(livekit.ParticipantInfo_DISCONNECTED) if p.OnClose != nil { p.OnClose(p) @@ -230,16 +267,16 @@ func (p *Participant) Close() error { } // Subscribes otherPeer to all of the tracks -func (p *Participant) AddSubscriber(otherPeer *Participant) error { +func (p *Participant) AddSubscriber(op *Participant) error { p.lock.RLock() defer p.lock.RUnlock() for _, track := range p.tracks { - logger.GetLogger().Debugw("subscribing to mediaTrack", - "srcPeer", p.ID(), - "dstPeer", otherPeer.ID(), - "mediaTrack", track.id) - if err := track.AddSubscriber(otherPeer); err != nil { + logger.GetLogger().Debugw("subscribing to remoteTrack", + "srcParticipant", p.ID(), + "dstParticipant", op.ID(), + "remoteTrack", track.id) + if err := track.AddSubscriber(op); err != nil { return err } } @@ -292,14 +329,15 @@ func (p *Participant) updateState(state livekit.ParticipantInfo_State) { } } -// when a new mediaTrack is created, creates a Track and adds it to room -func (p *Participant) onTrack(track *webrtc.Track, rtpReceiver *webrtc.RTPReceiver) { - logger.GetLogger().Debugw("mediaTrack added", "participantId", p.ID(), "mediaTrack", track.Label()) +// when a new remoteTrack is created, creates a Track and adds it to room +func (p *Participant) onTrack(track *webrtc.TrackRemote, rtpReceiver *webrtc.RTPReceiver) { + track.StreamID() + logger.GetLogger().Debugw("remoteTrack added", "participantId", p.ID(), "remoteTrack", track.ID()) // create Receiver // p.mediaEngine.TCCExt - receiver := NewReceiver(p.ctx, p.id, rtpReceiver, p.receiverConfig, 0) - pt := NewTrack(p.ctx, p.id, p.peerConn, track, receiver) + receiver := NewReceiver(p.ctx, p.id, rtpReceiver, p.bi) + pt := NewTrack(p.id, p.rtcpCh, track, receiver) p.lock.Lock() p.tracks[pt.id] = pt @@ -307,39 +345,132 @@ func (p *Participant) onTrack(track *webrtc.Track, rtpReceiver *webrtc.RTPReceiv pt.Start() if p.OnParticipantTrack != nil { - // caller should hook up what happens when the peer mediaTrack is available + // caller should hook up what happens when the peer remoteTrack is available go p.OnParticipantTrack(p, pt) } } -func (p *Participant) rtcpSendWorker() { - t := time.NewTicker(time.Second) +func (p *Participant) scheduleDownTrackBindingReports(streamId string) { + var sd []rtcp.SourceDescriptionChunk + + p.lock.RLock() + dts := p.downTracks[streamId] + for _, dt := range dts { + if !dt.IsBound() { + continue + } + chunks := dt.CreateSourceDescriptionChunks() + if chunks != nil { + sd = append(sd, chunks...) + } + } + p.lock.RUnlock() + + pkts := []rtcp.Packet{ + &rtcp.SourceDescription{Chunks: sd}, + } + + go func() { + pkts := pkts + i := 0 + for { + if err := p.peerConn.WriteRTCP(pkts); err != nil { + logger.GetLogger().Debugw("Sending track binding reports", + "participant", p.id, + "err", err) + } + if i > 5 { + return + } + i++ + time.Sleep(20 * time.Millisecond) + } + }() +} + +// downTracksRTCPWorker sends SenderReports periodically when the participant is subscribed to +// other tracks in the room. +func (p *Participant) downTracksRTCPWorker() { for { - select { - case <-t.C: - pkts := make([]rtcp.Packet, 0) - p.lock.RLock() - for _, r := range p.tracks { - rr, ps := r.receiver.BuildRTCP() - if rr.SSRC != 0 { - ps = append(ps, &rtcp.ReceiverReport{ - Reports: []rtcp.ReceptionReport{rr}, - }) + time.Sleep(5 * time.Second) + + var pkts []rtcp.Packet + var sd []rtcp.SourceDescriptionChunk + p.lock.RLock() + for _, dts := range p.downTracks { + for _, dt := range dts { + if !dt.IsBound() { + continue } - pkts = append(pkts, ps...) - } - p.lock.RUnlock() - if len(pkts) > 0 { - if err := p.peerConn.WriteRTCP(pkts); err != nil { - logger.GetLogger().Errorw("error writing RTCP to peer", - "peer", p.id, - "err", err, - ) + pkts = append(pkts, dt.CreateSenderReport()) + chunks := dt.CreateSourceDescriptionChunks() + if chunks != nil { + sd = append(sd, chunks...) } } - case <-p.ctx.Done(): - t.Stop() - return + } + p.lock.RUnlock() + + // now send in batches of sdBatchSize + // first batch will contain the sender reports too + var batch []rtcp.SourceDescriptionChunk + for len(sd) > 0 { + size := len(sd) + if size > sdBatchSize { + size = sdBatchSize + } + batch = sd[:size] + sd = sd[size:] + pkts = append(pkts, &rtcp.SourceDescription{Chunks: batch}) + if err := p.peerConn.WriteRTCP(pkts); err != nil { + if err == io.EOF || err == io.ErrClosedPipe { + return + } + logger.GetLogger().Errorw("could not send downtrack reports", + "participant", p.id, + "err", err) + } + pkts = pkts[:0] } } } + +func (p *Participant) rtcpSendWorker() { + // read from rtcpChan + for pkts := range p.rtcpCh { + if err := p.peerConn.WriteRTCP(pkts); err != nil { + logger.GetLogger().Errorw("could not write RTCP to participant", + "participant", p.id, + "err", err) + } + } + //t := time.NewTicker(time.Second) + //for { + // select { + // case <-t.C: + // pkts := make([]rtcp.Packet, 0) + // p.lock.RLock() + // for _, r := range p.tracks { + // rr, ps := r.receiver.BuildRTCP() + // if rr.SSRC != 0 { + // ps = append(ps, &rtcp.ReceiverReport{ + // Reports: []rtcp.ReceptionReport{rr}, + // }) + // } + // pkts = append(pkts, ps...) + // } + // p.lock.RUnlock() + // if len(pkts) > 0 { + // if err := p.peerConn.WriteRTCP(pkts); err != nil { + // logger.GetLogger().Errorw("error writing RTCP to peer", + // "peer", p.id, + // "err", err, + // ) + // } + // } + // case <-p.ctx.Done(): + // t.Stop() + // return + // } + //} +} diff --git a/pkg/rtc/receiver.go b/pkg/rtc/receiver.go index 4e6fac3ca..efe3fa491 100644 --- a/pkg/rtc/receiver.go +++ b/pkg/rtc/receiver.go @@ -1,18 +1,15 @@ package rtc import ( + "context" "io" "sync" + "github.com/pion/ion-sfu/pkg/buffer" "github.com/pion/rtp" + "github.com/pion/webrtc/v3" "github.com/livekit/livekit-server/pkg/logger" - "github.com/livekit/livekit-server/pkg/sfu" - - "context" - - "github.com/pion/rtcp" - "github.com/pion/webrtc/v3" ) const ( @@ -20,22 +17,19 @@ const ( maxChanSize = 1024 ) -// A receiver is responsible for pulling from a mediaTrack +// A receiver is responsible for pulling from a remoteTrack type Receiver struct { peerId string ctx context.Context cancel context.CancelFunc rtpReceiver *webrtc.RTPReceiver - track *webrtc.Track - buffer *sfu.Buffer - rtpChan chan *rtp.Packet + track *webrtc.TrackRemote + bi *buffer.Interceptor once sync.Once bytesRead int64 - - onCloseHandler func(r *Receiver) } -func NewReceiver(ctx context.Context, peerId string, rtpReceiver *webrtc.RTPReceiver, conf ReceiverConfig, tccExt int) *Receiver { +func NewReceiver(ctx context.Context, peerId string, rtpReceiver *webrtc.RTPReceiver, bi *buffer.Interceptor) *Receiver { ctx, cancel := context.WithCancel(ctx) track := rtpReceiver.Track() return &Receiver{ @@ -44,13 +38,8 @@ func NewReceiver(ctx context.Context, peerId string, rtpReceiver *webrtc.RTPRece peerId: peerId, rtpReceiver: rtpReceiver, track: track, - rtpChan: make(chan *rtp.Packet, maxChanSize), - buffer: sfu.NewBuffer(track, sfu.BufferOptions{ - BufferTime: conf.maxBufferTime, - MaxBitRate: conf.maxBandwidth * 1000, - TCCExt: tccExt, - }), - once: sync.Once{}, + bi: bi, + once: sync.Once{}, } } @@ -65,12 +54,11 @@ func (r *Receiver) TrackId() string { // starts reading RTP and push to buffer func (r *Receiver) Start() { r.once.Do(func() { - go r.rtpWorker() go r.rtcpWorker() }) } -// Close gracefully close the mediaTrack. if the context is canceled +// Close gracefully close the remoteTrack. if the context is canceled func (r *Receiver) Close() { if r.ctx.Err() != nil { return @@ -78,92 +66,29 @@ func (r *Receiver) Close() { r.cancel() } -// returns channel to read rtp packets -func (r *Receiver) RTPChan() <-chan *rtp.Packet { - return r.rtpChan +// PacketBuffer interface, to provide forwarders packets from the buffer +func (r *Receiver) GetBufferedPackets(mediaSSRC uint32, snOffset uint16, tsOffset uint32, sn []uint16) []rtp.Packet { + return r.bi.GetBufferedPackets(uint32(r.track.SSRC()), mediaSSRC, snOffset, tsOffset, sn) } -// Builds RTCP report from buffer, report indicates receiving quality -func (r *Receiver) BuildRTCP() (rtcp.ReceptionReport, []rtcp.Packet) { - return r.buffer.BuildRTCP() -} - -// WriteBufferedPacket writes buffered packet to mediaTrack, return error if packet not found -func (r *Receiver) WriteBufferedPacket(sn uint16, track *webrtc.Track, snOffset uint16, tsOffset, ssrc uint32) error { - if r.buffer == nil || r.ctx.Err() != nil { - return nil - } - return r.buffer.WritePacket(sn, track, snOffset, tsOffset, ssrc) -} - -func (r *Receiver) Stats() (sfu.BufferStats, rtcp.ReceptionReport) { - return r.buffer.Stats(), r.buffer.BuildReceptionReport() -} - -func (r *Receiver) OnClose(onclose func(r *Receiver)) { - r.onCloseHandler = onclose -} - -// rtpWorker reads RTP stream, fills buffer and channel -func (r *Receiver) rtpWorker() { - defer func() { - close(r.rtpChan) - if r.onCloseHandler != nil { - r.onCloseHandler(r) - } - }() - - for { - pkt, err := r.track.ReadRTP() - if err == io.EOF { - // this indicates the track is done on the server side - // we should remove the track - r.Close() - return - } - - if err != nil { - // log and continue - logger.GetLogger().Warnw("receiver error reading RTP", - "peer", r.peerId, - "mediaTrack", r.track.SSRC(), - "err", err, - ) - continue - } - - r.buffer.Push(pkt) - - select { - case <-r.ctx.Done(): - return - default: - r.rtpChan <- pkt - } - } +func (r *Receiver) ReadRTP() (*rtp.Packet, error) { + return r.track.ReadRTP() } // rtcpWorker reads RTCP messages from receiver, notifies buffer func (r *Receiver) rtcpWorker() { for { - pkts, err := r.rtpReceiver.ReadRTCP() + _, err := r.rtpReceiver.ReadRTCP() if err == io.ErrClosedPipe || r.ctx.Err() != nil { return } if err != nil { logger.GetLogger().Warnw("receiver error reading RTCP", "peer", r.peerId, - "mediaTrack", r.track.SSRC(), + "remoteTrack", r.track.SSRC(), "err", err, ) continue } - - for _, pkt := range pkts { - switch pkt := pkt.(type) { - case *rtcp.SenderReport: - r.buffer.SetSenderReportData(pkt.RTPTime, pkt.NTPTime) - } - } } } diff --git a/pkg/rtc/room.go b/pkg/rtc/room.go index 6796c9a99..156e7b2be 100644 --- a/pkg/rtc/room.go +++ b/pkg/rtc/room.go @@ -118,7 +118,7 @@ func (r *Room) RemoveParticipant(id string) { delete(r.participants, id) } -// a peer in the room added a new mediaTrack, subscribe other participants to it +// a peer in the room added a new remoteTrack, subscribe other participants to it func (r *Room) onTrackAdded(participant *Participant, track *Track) { // publish participant update, since track state is changed r.broadcastParticipantState(participant) @@ -126,7 +126,7 @@ func (r *Room) onTrackAdded(participant *Participant, track *Track) { r.lock.RLock() defer r.lock.RUnlock() - // subscribe all existing participants to this mediaTrack + // subscribe all existing participants to this remoteTrack // this is the default behavior. in the future this could be more selective for _, existingParticipant := range r.participants { if existingParticipant == participant { @@ -134,9 +134,9 @@ func (r *Room) onTrackAdded(participant *Participant, track *Track) { continue } if err := track.AddSubscriber(existingParticipant); err != nil { - logger.GetLogger().Errorw("could not subscribe to mediaTrack", + logger.GetLogger().Errorw("could not subscribe to remoteTrack", "srcParticipant", participant.ID(), - "mediaTrack", track.id, + "remoteTrack", track.id, "dstParticipant", existingParticipant.ID()) } } diff --git a/pkg/rtc/track.go b/pkg/rtc/track.go index ef5b0f0d6..0c9ab8a6d 100644 --- a/pkg/rtc/track.go +++ b/pkg/rtc/track.go @@ -1,92 +1,102 @@ package rtc import ( - "context" + "io" "sync" "time" + "github.com/pion/rtcp" "github.com/pion/webrtc/v3" "github.com/pion/webrtc/v3/pkg/rtcerr" "github.com/livekit/livekit-server/pkg/logger" + "github.com/livekit/livekit-server/pkg/sfu" "github.com/livekit/livekit-server/pkg/utils" "github.com/livekit/livekit-server/proto/livekit" ) var ( creationDelay = 500 * time.Millisecond + feedbackTypes = []webrtc.RTCPFeedback{{"goog-remb", ""}, {"nack", ""}, {"nack", "pli"}} ) -// Track represents a mediaTrack that needs to be forwarded +// Track represents a remoteTrack that needs to be forwarded type Track struct { id string - ctx context.Context participantId string - // source mediaTrack - mediaTrack *webrtc.Track - // source RTCPWriter to forward RTCP requests - rtcpWriter RTCPWriter - lock sync.RWMutex + // source remoteTrack + remoteTrack *webrtc.TrackRemote + // channel to send RTCP packets to the source + rtcpCh chan []rtcp.Packet + lock sync.RWMutex // map of target participantId -> forwarder forwarders map[string]Forwarder receiver *Receiver lastNack int64 } -func NewTrack(ctx context.Context, pId string, rtcpWriter RTCPWriter, mediaTrack *webrtc.Track, receiver *Receiver) *Track { +func NewTrack(pId string, rtcpCh chan []rtcp.Packet, track *webrtc.TrackRemote, receiver *Receiver) *Track { t := &Track{ id: utils.NewGuid(utils.TrackPrefix), - ctx: ctx, participantId: pId, - mediaTrack: mediaTrack, - rtcpWriter: rtcpWriter, + remoteTrack: track, + rtcpCh: rtcpCh, lock: sync.RWMutex{}, forwarders: make(map[string]Forwarder), receiver: receiver, } - receiver.OnClose(func(r *Receiver) { - t.RemoveAllSubscribers() - // TODO: perhaps send unpublished events - }) - return t } func (t *Track) Start() { t.receiver.Start() // start worker - go t.forwardWorker() + go t.forwardRTPWorker() } func (t *Track) Kind() webrtc.RTPCodecType { - return t.mediaTrack.Kind() + return t.remoteTrack.Kind() } -// subscribes participant to current mediaTrack +func (t *Track) StreamID() string { + return t.remoteTrack.StreamID() +} + +// subscribes participant to current remoteTrack // creates and add necessary forwarders and starts them func (t *Track) AddSubscriber(participant *Participant) error { - // check codecs supported by outbound participant - codecs := participant.mediaEngine.GetCodecsByName(t.mediaTrack.Codec().Name) - if len(codecs) == 0 { - return ErrUnsupportedPayloadType - } - + codec := t.remoteTrack.Codec() // pack ID to identify all tracks packedId := PackTrackId(t.participantId, t.id) - // use existing SSRC with simple forwarders. adaptive forwarders require unique SSRC per layer - outTrack, err := participant.peerConn.NewTrack(codecs[0].PayloadType, t.mediaTrack.SSRC(), packedId, t.mediaTrack.Label()) + // using DownTrack from ion-sfu + outTrack, err := sfu.NewDownTrack(webrtc.RTPCodecCapability{ + MimeType: codec.MimeType, + ClockRate: codec.ClockRate, + Channels: codec.Channels, + SDPFmtpLine: codec.SDPFmtpLine, + RTCPFeedback: feedbackTypes, + }, packedId, t.remoteTrack.StreamID()) if err != nil { return err } - rtpSender, err := participant.peerConn.AddTrack(outTrack) + transceiver, err := participant.peerConn.AddTransceiverFromTrack(outTrack, webrtc.RTPTransceiverInit{ + Direction: webrtc.RTPTransceiverDirectionSendonly, + }) if err != nil { return err } - forwarder := NewSimpleForwarder(t.ctx, t.rtcpWriter, rtpSender, t.receiver.buffer) + outTrack.SetTransceiver(transceiver) + // TODO: when outtrack is bound, start loop to send reports + //outTrack.OnBind(func() { + // go sub.sendStreamDownTracksReports(recv.StreamID()) + //}) + participant.addDownTrack(t.StreamID(), outTrack) + + forwarder := NewSimpleForwarder(t.rtcpCh, outTrack, t.receiver) forwarder.OnClose(func(f Forwarder) { t.lock.Lock() delete(t.forwarders, participant.ID()) @@ -95,13 +105,15 @@ func (t *Track) AddSubscriber(participant *Participant) error { if participant.peerConn.ConnectionState() == webrtc.PeerConnectionStateClosed { return } - if err := participant.peerConn.RemoveTrack(rtpSender); err != nil { + if err := participant.peerConn.RemoveTrack(transceiver.Sender()); err != nil { if _, ok := err.(*rtcerr.InvalidStateError); !ok { - logger.GetLogger().Warnw("could not remove mediaTrack from forwarder", + logger.GetLogger().Warnw("could not remove remoteTrack from forwarder", "participant", participant.ID(), "err", err) } } + + participant.removeDownTrack(t.StreamID(), outTrack) }) t.lock.Lock() @@ -145,35 +157,49 @@ func (t *Track) ToProto() *livekit.TrackInfo { return &livekit.TrackInfo{ Sid: t.id, Type: kind, - Name: t.mediaTrack.Label(), + Name: t.remoteTrack.StreamID(), } } -// forwardWorker reads from the receiver and writes to each sender -func (t *Track) forwardWorker() { - for pkt := range t.receiver.RTPChan() { - if t.ctx.Err() != nil { +// forwardRTPWorker reads from the receiver and writes to each sender +func (t *Track) forwardRTPWorker() { + defer func() { + t.RemoveAllSubscribers() + // TODO: send unpublished events? + }() + + for { + pkt, err := t.receiver.ReadRTP() + if err == io.EOF { + logger.GetLogger().Debugw("Track received EOF, closing", + "participant", t.participantId, + "track", t.id) return } - now := time.Now() - //logger.GetLogger().Debugw("read packet from mediaTrack", + if err != nil { + logger.GetLogger().Errorw("error while reading RTP", + "participant", t.participantId, + "track", t.id) + } + + //logger.GetLogger().Debugw("read packet from remoteTrack", // "participantId", t.participantId, - // "mediaTrack", t.mediaTrack.ID()) + // "remoteTrack", t.remoteTrack.ID()) t.lock.RLock() for dstId, forwarder := range t.forwarders { - // There exists a bug in chrome where setLocalDescription - // fails if mediaTrack RTP arrives before the sfu offer is set. - // We refrain from sending RTP here to avoid the issue. - // https://bugs.chromium.org/p/webrtc/issues/detail?id=10139 - if now.Sub(forwarder.CreatedAt()) < creationDelay { + err := forwarder.WriteRTP(pkt) + if err == io.EOF { + // this participant unsubscribed, remove it + t.RemoveSubscriber(dstId) continue } - if err := forwarder.WriteRTP(pkt); err != nil { + + if err != nil { logger.GetLogger().Warnw("could not forward packet to participant", "src", t.participantId, "dest", dstId, - "mediaTrack", t.mediaTrack.SSRC(), + "remoteTrack", t.id, "err", err) } } diff --git a/pkg/sfu/README.md b/pkg/sfu/README.md index cc4b4542d..27a6f529c 100644 --- a/pkg/sfu/README.md +++ b/pkg/sfu/README.md @@ -2,4 +2,4 @@ This package is largely files from the wonderful ion-sfu project. https://github.com/pion/ion-sfu -It's duplicated here since we needed to access a private method in the Buffer class \ No newline at end of file +It's duplicated here since we needed to access a private method in various helper classes \ No newline at end of file diff --git a/pkg/sfu/buffer.go b/pkg/sfu/buffer.go deleted file mode 100644 index e515b2dd6..000000000 --- a/pkg/sfu/buffer.go +++ /dev/null @@ -1,454 +0,0 @@ -package sfu - -// file from ion-sfu project - -import ( - "math" - "sort" - "sync" - "time" - - "github.com/gammazero/deque" - "github.com/pion/rtcp" - "github.com/pion/rtp" - "github.com/pion/webrtc/v3" -) - -const ( - maxSN = 1 << 16 - // default buffer time by ms - defaultBufferTime = 1000 -) - -type rtpExtInfo struct { - ExtTSN uint32 - Timestamp int64 -} - -// Buffer contains all packets -type Buffer struct { - mu sync.RWMutex - - pktQueue queue - codecType webrtc.RTPCodecType - simulcast bool - clockRate uint32 - maxBitrate uint64 - - // supported feedbacks - remb bool - nack bool - tcc bool - - lastSRNTPTime uint64 - lastSRRTPTime uint32 - lastSRRecv int64 // Represents wall clock of the most recent sender report arrival - baseSN uint16 - cycles uint32 - lastExpected uint32 - lastReceived uint32 - lostRate float32 - ssrc uint32 - lastPacketTime int64 // Time the last RTP packet from this source was received - lastRtcpPacketTime int64 // Time the last RTCP packet was received. - lastRtcpSrTime int64 // Time the last RTCP SR was received. Required for DLSR computation. - packetCount uint32 // Number of packets received from this source. - lastTransit uint32 - maxSeqNo uint16 // The highest sequence number received in an RTP data packet - jitter float64 // An estimate of the statistical variance of the RTP data packet inter-arrival time. - totalByte uint64 - - // remb - rembSteps uint8 - - // transport-cc - tccExt uint8 - tccExtInfo []rtpExtInfo - tccCycles uint32 - tccLastExtSN uint32 - tccPktCtn uint8 - tccLastSn uint16 - lastExtInfo uint16 -} - -// BufferOptions provides configuration options for the buffer -type BufferOptions struct { - TCCExt int - BufferTime int - MaxBitRate uint64 -} - -// NewBuffer constructs a new Buffer -func NewBuffer(track *webrtc.Track, o BufferOptions) *Buffer { - b := &Buffer{ - ssrc: track.SSRC(), - clockRate: track.Codec().ClockRate, - codecType: track.Codec().Type, - maxBitrate: o.MaxBitRate, - simulcast: len(track.RID()) > 0, - rembSteps: 4, - } - if o.BufferTime <= 0 { - o.BufferTime = defaultBufferTime - } - b.pktQueue.duration = uint32(o.BufferTime) * b.clockRate / 1000 - b.pktQueue.ssrc = track.SSRC() - b.tccExt = uint8(o.TCCExt) - - for _, fb := range track.Codec().RTCPFeedback { - switch fb.Type { - case webrtc.TypeRTCPFBGoogREMB: - //log.Debugf("Setting feedback %s", webrtc.TypeRTCPFBGoogREMB) - b.remb = true - case webrtc.TypeRTCPFBTransportCC: - //log.Debugf("Setting feedback %s", webrtc.TypeRTCPFBTransportCC) - b.tccExtInfo = make([]rtpExtInfo, 1<<8) - b.tcc = true - case webrtc.TypeRTCPFBNACK: - //log.Debugf("Setting feedback %s", webrtc.TypeRTCPFBNACK) - b.nack = true - } - } - //log.Debugf("NewBuffer BufferOptions=%v", o) - return b -} - -// Push adds a RTP Packet, out of order, new packet may be arrived later -func (b *Buffer) Push(p *rtp.Packet) { - b.mu.Lock() - defer b.mu.Unlock() - b.totalByte += uint64(p.MarshalSize()) - if b.packetCount == 0 { - b.baseSN = p.SequenceNumber - b.maxSeqNo = p.SequenceNumber - b.pktQueue.headSN = p.SequenceNumber - 1 - } else if snDiff(b.maxSeqNo, p.SequenceNumber) <= 0 { - if p.SequenceNumber < b.maxSeqNo { - b.cycles += maxSN - } - b.maxSeqNo = p.SequenceNumber - } - b.packetCount++ - b.lastPacketTime = time.Now().UnixNano() - arrival := uint32(b.lastPacketTime / 1e6 * int64(b.clockRate/1e3)) - transit := arrival - p.Timestamp - if b.lastTransit != 0 { - d := int32(transit - b.lastTransit) - if d < 0 { - d = -d - } - b.jitter += (float64(d) - b.jitter) / 16 - } - b.lastTransit = transit - if b.codecType == webrtc.RTPCodecTypeVideo { - b.pktQueue.AddPacket(p, p.SequenceNumber == b.maxSeqNo) - } - - if b.tcc { - rtpTCC := rtp.TransportCCExtension{} - if err := rtpTCC.Unmarshal(p.GetExtension(b.tccExt)); err == nil { - if rtpTCC.TransportSequence < 0x0fff && (b.tccLastSn&0xffff) > 0xf000 { - b.tccCycles += maxSN - } - b.tccExtInfo = append(b.tccExtInfo, rtpExtInfo{ - ExtTSN: b.tccCycles | uint32(rtpTCC.TransportSequence), - Timestamp: b.lastPacketTime / 1e3, - }) - } - } -} - -func (b *Buffer) buildREMBPacket() *rtcp.ReceiverEstimatedMaximumBitrate { - br := b.maxBitrate - if b.rembSteps > 0 { - br /= uint64(b.rembSteps) - b.rembSteps-- - } - - return &rtcp.ReceiverEstimatedMaximumBitrate{ - SenderSSRC: b.ssrc, - Bitrate: br, - SSRCs: []uint32{b.ssrc}, - } -} - -func (b *Buffer) buildTransportCCPacket() *rtcp.TransportLayerCC { - if len(b.tccExtInfo) == 0 { - return nil - } - sort.Slice(b.tccExtInfo, func(i, j int) bool { - return b.tccExtInfo[i].ExtTSN < b.tccExtInfo[j].ExtTSN - }) - tccPkts := make([]rtpExtInfo, 0, int(float64(len(b.tccExtInfo))*1.2)) - for _, tccExtInfo := range b.tccExtInfo { - if tccExtInfo.ExtTSN < b.tccLastExtSN { - continue - } - if b.tccLastExtSN != 0 { - for j := b.tccLastExtSN + 1; j < tccExtInfo.ExtTSN; j++ { - tccPkts = append(tccPkts, rtpExtInfo{ExtTSN: j}) - } - } - b.tccLastExtSN = tccExtInfo.ExtTSN - tccPkts = append(tccPkts, tccExtInfo) - } - b.tccExtInfo = b.tccExtInfo[:0] - - rtcpTCC := &rtcp.TransportLayerCC{ - Header: rtcp.Header{ - Padding: true, - Count: rtcp.FormatTCC, - Type: rtcp.TypeTransportSpecificFeedback, - }, - MediaSSRC: b.ssrc, - BaseSequenceNumber: uint16(tccPkts[0].ExtTSN), - PacketStatusCount: uint16(len(tccPkts)), - FbPktCount: b.tccPktCtn, - } - b.tccPktCtn++ - - firstRecv := false - allSame := true - timestamp := int64(0) - deltaLen := 0 - lastStatus := rtcp.TypeTCCPacketReceivedWithoutDelta - maxStatus := rtcp.TypeTCCPacketNotReceived - - var statusList deque.Deque - - for _, stat := range tccPkts { - status := rtcp.TypeTCCPacketNotReceived - if stat.Timestamp != 0 { - var delta int64 - if !firstRecv { - firstRecv = true - timestamp = stat.Timestamp - rtcpTCC.ReferenceTime = uint32(stat.Timestamp / 64000) - } - - delta = (stat.Timestamp - timestamp) / 250 - if delta < 0 || delta > 255 { - status = rtcp.TypeTCCPacketReceivedLargeDelta - rDelta := int16(delta) - if int64(rDelta) != delta { - if rDelta > 0 { - rDelta = math.MaxInt16 - } else { - rDelta = math.MinInt16 - } - } - rtcpTCC.RecvDeltas = append(rtcpTCC.RecvDeltas, &rtcp.RecvDelta{ - Type: status, - Delta: int64(rDelta) * 250, - }) - deltaLen += 2 - } else { - status = rtcp.TypeTCCPacketReceivedSmallDelta - rtcpTCC.RecvDeltas = append(rtcpTCC.RecvDeltas, &rtcp.RecvDelta{ - Type: status, - Delta: delta * 250, - }) - deltaLen++ - } - timestamp = stat.Timestamp - } - - if allSame && lastStatus != rtcp.TypeTCCPacketReceivedWithoutDelta && status != lastStatus { - if statusList.Len() > 7 { - rtcpTCC.PacketChunks = append(rtcpTCC.PacketChunks, &rtcp.RunLengthChunk{ - PacketStatusSymbol: lastStatus, - RunLength: uint16(statusList.Len()), - }) - statusList.Clear() - lastStatus = rtcp.TypeTCCPacketReceivedWithoutDelta - maxStatus = rtcp.TypeTCCPacketNotReceived - allSame = true - } else { - allSame = false - } - } - statusList.PushBack(status) - if status > maxStatus { - maxStatus = status - } - lastStatus = status - - if !allSame { - if maxStatus == rtcp.TypeTCCPacketReceivedLargeDelta && statusList.Len() > 6 { - symbolList := make([]uint16, 7) - for i := 0; i < 7; i++ { - symbolList[i] = statusList.PopFront().(uint16) - } - rtcpTCC.PacketChunks = append(rtcpTCC.PacketChunks, &rtcp.StatusVectorChunk{ - SymbolSize: rtcp.TypeTCCSymbolSizeTwoBit, - SymbolList: symbolList, - }) - lastStatus = rtcp.TypeTCCPacketReceivedWithoutDelta - maxStatus = rtcp.TypeTCCPacketNotReceived - allSame = true - - for i := 0; i < statusList.Len(); i++ { - status = statusList.At(i).(uint16) - if status > maxStatus { - maxStatus = status - } - if allSame && lastStatus != rtcp.TypeTCCPacketReceivedWithoutDelta && status != lastStatus { - allSame = false - } - lastStatus = status - } - } else if statusList.Len() > 13 { - symbolList := make([]uint16, 14) - for i := 0; i < 14; i++ { - symbolList[i] = statusList.PopFront().(uint16) - } - rtcpTCC.PacketChunks = append(rtcpTCC.PacketChunks, &rtcp.StatusVectorChunk{ - SymbolSize: rtcp.TypeTCCSymbolSizeOneBit, - SymbolList: symbolList, - }) - lastStatus = rtcp.TypeTCCPacketReceivedWithoutDelta - maxStatus = rtcp.TypeTCCPacketNotReceived - allSame = true - } - } - } - - if statusList.Len() > 0 { - if allSame { - rtcpTCC.PacketChunks = append(rtcpTCC.PacketChunks, &rtcp.RunLengthChunk{ - PacketStatusSymbol: lastStatus, - RunLength: uint16(statusList.Len()), - }) - } else if maxStatus == rtcp.TypeTCCPacketReceivedLargeDelta { - symbolList := make([]uint16, statusList.Len()) - for i := 0; i < statusList.Len(); i++ { - symbolList[i] = statusList.PopFront().(uint16) - } - rtcpTCC.PacketChunks = append(rtcpTCC.PacketChunks, &rtcp.StatusVectorChunk{ - SymbolSize: rtcp.TypeTCCSymbolSizeTwoBit, - SymbolList: symbolList, - }) - } else { - symbolList := make([]uint16, statusList.Len()) - for i := 0; i < statusList.Len(); i++ { - symbolList[i] = statusList.PopFront().(uint16) - } - rtcpTCC.PacketChunks = append(rtcpTCC.PacketChunks, &rtcp.StatusVectorChunk{ - SymbolSize: rtcp.TypeTCCSymbolSizeOneBit, - SymbolList: symbolList, - }) - } - } - - pLen := uint16(20 + len(rtcpTCC.PacketChunks)*2 + deltaLen) - rtcpTCC.Header.Padding = pLen%4 != 0 - for pLen%4 != 0 { - pLen++ - } - rtcpTCC.Header.Length = (pLen / 4) - 1 - return rtcpTCC -} - -func (b *Buffer) BuildReceptionReport() rtcp.ReceptionReport { - extMaxSeq := b.cycles | uint32(b.maxSeqNo) - expected := extMaxSeq - uint32(b.baseSN) + 1 - lost := expected - b.packetCount - if b.packetCount == 0 { - lost = 0 - } - expectedInterval := expected - b.lastExpected - b.lastExpected = expected - - receivedInterval := b.packetCount - b.lastReceived - b.lastReceived = b.packetCount - - lostInterval := expectedInterval - receivedInterval - - b.lostRate = float32(lostInterval) / float32(expectedInterval) - var fracLost uint8 - if expectedInterval != 0 && lostInterval > 0 { - fracLost = uint8((lostInterval << 8) / expectedInterval) - } - var dlsr uint32 - if b.lastSRRecv != 0 { - delayMS := uint32((time.Now().UnixNano() - b.lastSRRecv) / 1e6) - dlsr = (delayMS / 1e3) << 16 - dlsr |= (delayMS % 1e3) * 65536 / 1000 - } - - rr := rtcp.ReceptionReport{ - SSRC: b.ssrc, - FractionLost: fracLost, - TotalLost: lost, - LastSequenceNumber: extMaxSeq, - Jitter: uint32(b.jitter), - LastSenderReport: uint32(b.lastSRNTPTime >> 16), - Delay: dlsr, - } - return rr -} - -func (b *Buffer) SetSenderReportData(rtpTime uint32, ntpTime uint64) { - b.mu.Lock() - defer b.mu.Unlock() - b.lastSRRTPTime = rtpTime - b.lastSRNTPTime = ntpTime - b.lastSRRecv = time.Now().UnixNano() -} - -func (b *Buffer) BuildRTCP() (rtcp.ReceptionReport, []rtcp.Packet) { - b.mu.RLock() - defer b.mu.RUnlock() - var pkts []rtcp.Packet - var report rtcp.ReceptionReport - - report = b.BuildReceptionReport() - - if b.remb { - pkts = append(pkts, b.buildREMBPacket()) - } - - if b.tcc { - if tccPkt := b.buildTransportCCPacket(); tccPkt != nil { - pkts = append(pkts, tccPkt) - } - } - - return report, pkts -} - -// WritePacket write buffer packet to requested track. and modify headers -func (b *Buffer) WritePacket(sn uint16, track *webrtc.Track, snOffset uint16, tsOffset, ssrc uint32) error { - b.mu.RLock() - defer b.mu.RUnlock() - if bufferPkt := b.pktQueue.GetPacket(sn); bufferPkt != nil { - bSsrc := bufferPkt.SSRC - bufferPkt.SequenceNumber -= snOffset - bufferPkt.Timestamp -= tsOffset - bufferPkt.SSRC = ssrc - err := track.WriteRTP(bufferPkt) - bufferPkt.Timestamp += tsOffset - bufferPkt.SequenceNumber += snOffset - bufferPkt.SSRC = bSsrc - return err - } - return ErrPacketNotFound -} - -func (b *Buffer) onLostHandler(fn func(nack *rtcp.TransportLayerNack)) { - if b.nack { - b.pktQueue.onLost = fn - } -} - -type BufferStats struct { - TotalBytes uint64 - LastPacketTime int64 -} - -func (b *Buffer) Stats() BufferStats { - return BufferStats{ - TotalBytes: b.totalByte, - LastPacketTime: b.lastPacketTime, - } -} diff --git a/pkg/sfu/downtrack.go b/pkg/sfu/downtrack.go new file mode 100644 index 000000000..30f79b95b --- /dev/null +++ b/pkg/sfu/downtrack.go @@ -0,0 +1,273 @@ +package sfu + +import ( + "bytes" + "encoding/binary" + "strings" + "sync" + "sync/atomic" + "time" + + log "github.com/pion/ion-log" + "github.com/pion/rtcp" + "github.com/pion/rtp" + "github.com/pion/webrtc/v3" +) + +// DownTrack implements TrackLocal, is the track used to write packets +// to SFU Subscriber, the track handle the packets for simple, simulcast +// and SVC Publisher. +type DownTrack struct { + id string + bound atomicBool + mime string + nList *nackList + ssrc uint32 + payload uint8 + streamID string + + //enabled atomicBool + reSync atomicBool + snOffset uint16 + tsOffset uint32 + lastSSRC uint32 + lastSN uint16 + lastTS uint32 + + codec webrtc.RTPCodecCapability + transceiver *webrtc.RTPTransceiver + writeStream webrtc.TrackLocalWriter + onCloseHandler func() + onBind func() + closeOnce sync.Once + + // Report helpers + octetCount uint32 + packetCount uint32 + maxPacketTs uint32 + lastPacketMs int64 +} + +// NewDownTrack returns a DownTrack. +func NewDownTrack(c webrtc.RTPCodecCapability, id, streamID string) (*DownTrack, error) { + return &DownTrack{ + id: id, + nList: newNACKList(), + codec: c, + streamID: streamID, + }, nil +} + +// Bind is called by the PeerConnection after negotiation is complete +// This asserts that the code requested is supported by the remote peer. +// If so it setups all the state (SSRC and PayloadType) to have a call +func (d *DownTrack) Bind(t webrtc.TrackLocalContext) (webrtc.RTPCodecParameters, error) { + parameters := webrtc.RTPCodecParameters{RTPCodecCapability: d.codec} + if codec, err := codecParametersFuzzySearch(parameters, t.CodecParameters()); err == nil { + d.ssrc = uint32(t.SSRC()) + d.payload = uint8(codec.PayloadType) + d.writeStream = t.WriteStream() + d.mime = strings.ToLower(codec.MimeType) + d.bound.set(true) + d.reSync.set(true) + if d.onBind != nil { + d.onBind() + } + return codec, nil + } + return webrtc.RTPCodecParameters{}, webrtc.ErrUnsupportedCodec +} + +// Unbind implements the teardown logic when the track is no longer needed. This happens +// because a track has been stopped. +func (d *DownTrack) Unbind(_ webrtc.TrackLocalContext) error { + d.bound.set(false) + return nil +} + +func (d *DownTrack) IsBound() bool { + return d.bound.get() +} + +// ID is the unique identifier for this Track. This should be unique for the +// stream, but doesn't have to globally unique. A common example would be 'audio' or 'video' +// and StreamID would be 'desktop' or 'webcam' +func (d *DownTrack) ID() string { return d.id } + +// Codec returns current track codec capability +func (d *DownTrack) Codec() webrtc.RTPCodecCapability { return d.codec } + +// StreamID is the group this track belongs too. This must be unique +func (d *DownTrack) StreamID() string { return d.streamID } + +// Kind controls if this TrackLocal is audio or video +func (d *DownTrack) Kind() webrtc.RTPCodecType { + switch { + case strings.HasPrefix(d.codec.MimeType, "audio/"): + return webrtc.RTPCodecTypeAudio + case strings.HasPrefix(d.codec.MimeType, "video/"): + return webrtc.RTPCodecTypeVideo + default: + return webrtc.RTPCodecType(0) + } +} + +// WriteRTP writes a RTP Packet to the DownTrack +func (d *DownTrack) WriteRTP(p *rtp.Packet) error { + if !d.IsBound() { + return nil + } + return d.writeSimpleRTP(*p) +} + +func (d *DownTrack) CreateSourceDescriptionChunks() []rtcp.SourceDescriptionChunk { + if !d.IsBound() { + return nil + } + return []rtcp.SourceDescriptionChunk{ + { + Source: d.ssrc, + Items: []rtcp.SourceDescriptionItem{{ + Type: rtcp.SDESCNAME, + Text: d.streamID, + }}, + }, { + Source: d.ssrc, + Items: []rtcp.SourceDescriptionItem{{ + Type: rtcp.SDESType(15), + Text: d.transceiver.Mid(), + }}, + }, + } +} + +func (d *DownTrack) CreateSenderReport() *rtcp.SenderReport { + now := time.Now().UnixNano() + nowNTP := timeToNtp(now) + lastPktMs := atomic.LoadInt64(&d.lastPacketMs) + maxPktTs := atomic.LoadUint32(&d.lastTS) + diffTs := uint32((now/1e6)-lastPktMs) * d.codec.ClockRate / 1000 + octets, packets := d.getSRStats() + return &rtcp.SenderReport{ + SSRC: d.ssrc, + NTPTime: nowNTP, + RTPTime: maxPktTs + diffTs, + PacketCount: packets, + OctetCount: octets, + } +} + +// Close track +func (d *DownTrack) Close() { + d.closeOnce.Do(func() { + if d.onCloseHandler != nil { + d.onCloseHandler() + } + }) +} + +// OnCloseHandler method to be called on remote tracked removed +func (d *DownTrack) OnCloseHandler(fn func()) { + d.onCloseHandler = fn +} + +func (d *DownTrack) OnBind(fn func()) { + d.onBind = fn +} + +// -- start -- accessors to avoid accessing private vars + +func (d *DownTrack) SetTransceiver(transceiver *webrtc.RTPTransceiver) { + d.transceiver = transceiver +} + +func (d *DownTrack) RTPSender() *webrtc.RTPSender { + return d.transceiver.Sender() +} + +func (d *DownTrack) SSRC() uint32 { + return d.ssrc +} + +func (d *DownTrack) LastSSRC() uint32 { + return d.lastSSRC +} + +func (d *DownTrack) SnOffset() uint16 { + return d.snOffset +} + +func (d *DownTrack) TsOffset() uint32 { + return d.tsOffset +} + +func (d *DownTrack) GetNACKSeqNo(seqNo []uint16) []uint16 { + return d.nList.getNACKSeqNo(seqNo) +} + +// -- end -- accessors to avoid accessing private vars + +func (d *DownTrack) writeSimpleRTP(pkt rtp.Packet) error { + if d.reSync.get() { + if d.Kind() == webrtc.RTPCodecTypeVideo { + relay := false + // Wait for a keyframe to sync new source + switch d.mime { + case "video/vp8": + vp8Packet := VP8Helper{} + if err := vp8Packet.Unmarshal(pkt.Payload); err == nil { + relay = vp8Packet.IsKeyFrame + } + case "video/h264": + var word uint32 + payload := bytes.NewReader(pkt.Payload) + err := binary.Read(payload, binary.BigEndian, &word) + if err != nil || (word&0x1F000000)>>24 != 24 { + relay = false + } else { + relay = word&0x1F == 7 + } + } + if !relay { + // TODO: how do we sent PLI to the source? + //d.receiver.SendRTCP([]rtcp.Packet{ + // &rtcp.PictureLossIndication{SenderSSRC: d.ssrc, MediaSSRC: pkt.SSRC}, + //}) + return ErrRequiresKeyFrame + } + } + d.snOffset = pkt.SequenceNumber - d.lastSN - 1 + d.tsOffset = pkt.Timestamp - d.lastTS - 1 + d.lastSSRC = pkt.SSRC + d.reSync.set(false) + } + + atomic.AddUint32(&d.octetCount, uint32(len(pkt.Payload))) + atomic.AddUint32(&d.packetCount, 1) + + d.lastSSRC = pkt.SSRC + newSN := pkt.SequenceNumber - d.snOffset + newTS := pkt.Timestamp - d.tsOffset + if (newSN-d.lastSN)&0x8000 == 0 || d.lastSN == 0 { + d.lastSN = newSN + atomic.StoreInt64(&d.lastPacketMs, time.Now().UnixNano()/1e6) + atomic.StoreUint32(&d.lastTS, newTS) + } + pkt.PayloadType = d.payload + pkt.Timestamp = d.lastTS + pkt.SequenceNumber = d.lastSN + pkt.SSRC = d.ssrc + + _, err := d.writeStream.WriteRTP(&pkt.Header, pkt.Payload) + if err != nil { + log.Errorf("Write packet err %v", err) + } + + return err +} + +func (d *DownTrack) getSRStats() (octets, packets uint32) { + octets = atomic.LoadUint32(&d.octetCount) + packets = atomic.LoadUint32(&d.packetCount) + return +} diff --git a/pkg/sfu/errors.go b/pkg/sfu/errors.go index a0369d6cd..b5387103b 100644 --- a/pkg/sfu/errors.go +++ b/pkg/sfu/errors.go @@ -5,12 +5,15 @@ import "errors" var ( errPeerConnectionInitFailed = errors.New("pc init failed") errPtNotSupported = errors.New("payload type not supported") + errCreatingDataChannel = errors.New("failed to create data channel") // router errors errNoReceiverFound = errors.New("no receiver found") // Helpers errors errShortPacket = errors.New("packet is not large enough") errNilPacket = errors.New("invalid nil packet") // buffer errors - ErrPacketNotFound = errors.New("packet not found in cache") + errPacketNotFound = errors.New("packet not found in cache") errPacketTooOld = errors.New("packet not found in cache, too old") + + ErrRequiresKeyFrame = errors.New("requires a keyframe to send down first") ) diff --git a/pkg/sfu/helpers.go b/pkg/sfu/helpers.go index 6f0614507..9c5987902 100644 --- a/pkg/sfu/helpers.go +++ b/pkg/sfu/helpers.go @@ -2,7 +2,10 @@ package sfu import ( "encoding/binary" + "strings" "sync/atomic" + + "github.com/pion/webrtc/v3" ) const ntpEpoch = 2208988800 @@ -71,11 +74,13 @@ func (p *VP8Helper) Unmarshal(payload []byte) error { } var idx uint8 + S := payload[idx]&0x10 > 0 // Check for extended bit control if payload[idx]&0x80 > 0 { idx++ // Check if T is present, if not, no temporal layer is available p.TemporalSupported = payload[idx]&0x20 > 0 + K := payload[idx]&0x10 > 0 L := payload[idx]&0x40 > 0 // Check for PictureID if payload[idx]&0x80 > 0 { @@ -97,38 +102,47 @@ func (p *VP8Helper) Unmarshal(payload []byte) error { p.tlzIdx = idx p.TL0PICIDX = payload[idx] } - idx++ - // Set TID - p.TID = (payload[idx] & 0xc0) >> 6 - idx++ + if p.TemporalSupported || K { + idx++ + p.TID = (payload[idx] & 0xc0) >> 6 + } if int(idx) >= payloadLen { return errShortPacket } + idx++ // Check is packet is a keyframe by looking at P bit in vp8 payload - p.IsKeyFrame = payload[idx]&0x01 == 0 + p.IsKeyFrame = payload[idx]&0x01 == 0 && S + } else { + idx++ + // Check is packet is a keyframe by looking at P bit in vp8 payload + p.IsKeyFrame = payload[idx]&0x01 == 0 && S } return nil } -func snDiff(sn1, sn2 uint16) int { - if sn1 == sn2 { - return 0 - } - if ((sn2 - sn1) & 0x8000) != 0 { - return 1 - } - return -1 -} - func timeToNtp(ns int64) uint64 { seconds := uint64(ns/1e9 + ntpEpoch) fraction := uint64(((ns % 1e9) << 32) / 1e9) return seconds<<32 | fraction } -// fromNtp converts a NTP timestamp into GO time -func fromNtp(seconds, fraction uint32) (tm int64) { - n := (int64(fraction) * 1e9) >> 32 - tm = (int64(seconds)-ntpEpoch)*1e9 + n - return +// Do a fuzzy find for a codec in the list of codecs +// Used for lookup up a codec in an existing list to find a match +func codecParametersFuzzySearch(needle webrtc.RTPCodecParameters, haystack []webrtc.RTPCodecParameters) (webrtc.RTPCodecParameters, error) { + // First attempt to match on MimeType + SDPFmtpLine + for _, c := range haystack { + if strings.EqualFold(c.RTPCodecCapability.MimeType, needle.RTPCodecCapability.MimeType) && + c.RTPCodecCapability.SDPFmtpLine == needle.RTPCodecCapability.SDPFmtpLine { + return c, nil + } + } + + // Fallback to just MimeType + for _, c := range haystack { + if strings.EqualFold(c.RTPCodecCapability.MimeType, needle.RTPCodecCapability.MimeType) { + return c, nil + } + } + + return webrtc.RTPCodecParameters{}, webrtc.ErrCodecNotFound } diff --git a/pkg/sfu/helpers_test.go b/pkg/sfu/helpers_test.go deleted file mode 100644 index 010152c5e..000000000 --- a/pkg/sfu/helpers_test.go +++ /dev/null @@ -1,129 +0,0 @@ -package sfu - -import ( - "testing" - "time" - - "github.com/stretchr/testify/assert" -) - -func TestVP8Helper_Unmarshal(t *testing.T) { - type args struct { - payload []byte - } - tests := []struct { - name string - args args - wantErr bool - checkTemporal bool - temporalSupport bool - checkKeyFrame bool - keyFrame bool - checkPictureID bool - pictureID uint16 - checkTlzIdx bool - tlzIdx uint8 - checkTempID bool - temporalID uint8 - }{ - { - name: "Empty or nil payload must return error", - args: args{payload: []byte{}}, - wantErr: true, - }, - { - name: "Small payloads must return errors", - args: args{payload: []byte{0x0, 0x1, 0x2}}, - wantErr: true, - }, - { - name: "Temporal must be supported by setting T bit to 1", - args: args{payload: []byte{0xff, 0x20, 0x1, 0x2, 0x3, 0x4}}, - checkTemporal: true, - temporalSupport: true, - }, - { - name: "Picture must be ID 7 bits by setting M bit to 0 and present by I bit set to 1", - args: args{payload: []byte{0xff, 0xff, 0x11, 0x2, 0x3, 0x4}}, - checkPictureID: true, - pictureID: 17, - }, - { - name: "Picture ID must be 15 bits by setting M bit to 1 and present by I bit set to 1", - args: args{payload: []byte{0xff, 0xff, 0x92, 0x67, 0x3, 0x4, 0x5}}, - checkPictureID: true, - pictureID: 4711, - }, - { - name: "Temporal level zero index must be present if L set to 1", - args: args{payload: []byte{0xff, 0xff, 0xff, 0xfd, 0xb4, 0x4, 0x5}}, - checkTlzIdx: true, - tlzIdx: 180, - }, - { - name: "Temporal index must be present and used if T bit set to 1", - args: args{payload: []byte{0xff, 0xff, 0xff, 0xfd, 0xb4, 0x9f, 0x5, 0x6}}, - checkTempID: true, - temporalID: 2, - }, - { - name: "Check if packet is a keyframe by looking at P bit set to 0", - args: args{payload: []byte{0xff, 0xff, 0xff, 0xfd, 0xb4, 0x9f, 0x94, 0x1}}, - checkKeyFrame: true, - keyFrame: true, - }, - } - for _, tt := range tests { - tt := tt - t.Run(tt.name, func(t *testing.T) { - p := &VP8Helper{} - if err := p.Unmarshal(tt.args.payload); (err != nil) != tt.wantErr { - t.Errorf("Unmarshal() error = %v, wantErr %v", err, tt.wantErr) - } - if tt.checkTemporal { - assert.Equal(t, tt.temporalSupport, p.TemporalSupported) - } - if tt.checkKeyFrame { - assert.Equal(t, tt.keyFrame, p.IsKeyFrame) - } - if tt.checkPictureID { - assert.Equal(t, tt.pictureID, p.PictureID) - } - if tt.checkTlzIdx { - assert.Equal(t, tt.tlzIdx, p.TL0PICIDX) - } - if tt.checkTempID { - assert.Equal(t, tt.temporalID, p.TID) - } - }) - } -} - -func Test_timeToNtp(t *testing.T) { - type args struct { - ns int64 - } - tests := []struct { - name string - args args - wantNTP uint64 - }{ - { - name: "Must return correct NTP time", - args: args{ - ns: time.Unix(1602391458, 1234).UnixNano(), - }, - wantNTP: 16369753560730047667, - }, - } - for _, tt := range tests { - tt := tt - t.Run(tt.name, func(t *testing.T) { - gotNTP := timeToNtp(tt.args.ns) - if gotNTP != tt.wantNTP { - t.Errorf("timeToNtp() gotFraction = %v, want %v", gotNTP, tt.wantNTP) - } - println(gotNTP >> 16) - }) - } -} diff --git a/pkg/sfu/nacklist.go b/pkg/sfu/nacklist.go new file mode 100644 index 000000000..4b5c068f3 --- /dev/null +++ b/pkg/sfu/nacklist.go @@ -0,0 +1,49 @@ +package sfu + +import ( + "container/list" + "time" +) + +const ( + ignoreRetransmission = 5e8 // Ignore packet retransmission after ignoreRetransmission milliseconds + maxNackQueue = 100 +) + +type NACK struct { + SN uint16 + LRX int64 +} + +type nackList struct { + nacks map[uint16]*list.Element + ll *list.List +} + +func newNACKList() *nackList { + return &nackList{ + nacks: make(map[uint16]*list.Element), + ll: list.New(), + } +} + +func (n *nackList) getNACKSeqNo(seqno []uint16) []uint16 { + packets := make([]uint16, 0, 17) + for _, sn := range seqno { + if nack, ok := n.nacks[sn]; !ok { + n.nacks[sn] = n.ll.PushBack(NACK{sn, time.Now().UnixNano()}) + packets = append(packets, sn) + } else if time.Now().UnixNano()-nack.Value.(NACK).LRX > ignoreRetransmission { + nack.Value = NACK{sn, time.Now().UnixNano()} + packets = append(packets, sn) + } + } + + for len(n.nacks) > maxNackQueue { + el := n.ll.Back() + delete(n.nacks, el.Value.(NACK).SN) + n.ll.Remove(el) + } + + return packets +} diff --git a/pkg/sfu/packetqueue.go b/pkg/sfu/packetqueue.go deleted file mode 100644 index 4803cee27..000000000 --- a/pkg/sfu/packetqueue.go +++ /dev/null @@ -1,124 +0,0 @@ -package sfu - -import ( - //"github.com/pion/ion-sfu/pkg/log" - "github.com/pion/rtcp" - "github.com/pion/rtp" -) - -type queue struct { - pkts []*rtp.Packet - ssrc uint32 - head int - tail int - size int - headSN uint16 - counter int - duration uint32 - onLost func(nack *rtcp.TransportLayerNack) -} - -func (q *queue) AddPacket(pkt *rtp.Packet, latest bool) { - if !latest { - q.set(int(q.headSN-pkt.SequenceNumber), pkt) - return - } - diff := pkt.SequenceNumber - q.headSN - q.headSN = pkt.SequenceNumber - for i := uint16(1); i < diff; i++ { - q.push(nil) - q.counter++ - } - q.counter++ - q.push(pkt) - if q.counter >= 7 { - if n := q.nack(); n != nil && q.onLost != nil { - q.onLost(&rtcp.TransportLayerNack{ - MediaSSRC: q.ssrc, - Nacks: []rtcp.NackPair{*n}, - }) - } - q.clean() - q.counter -= 5 - } -} - -func (q *queue) GetPacket(sn uint16) *rtp.Packet { - return q.get(int(q.headSN - sn)) -} - -func (q *queue) push(pkt *rtp.Packet) { - q.resize() - q.head = (q.head - 1) & (len(q.pkts) - 1) - q.pkts[q.head] = pkt - q.size++ -} - -func (q *queue) shift() { - if q.size <= 0 { - return - } - q.tail = (q.tail - 1) & (len(q.pkts) - 1) - q.pkts[q.tail] = nil - q.size-- -} - -func (q *queue) last() *rtp.Packet { - return q.pkts[(q.tail-1)&(len(q.pkts)-1)] -} - -func (q *queue) get(i int) *rtp.Packet { - if i < 0 || i >= q.size { - return nil - } - return q.pkts[(q.head+i)&(len(q.pkts)-1)] -} - -func (q *queue) set(i int, pkt *rtp.Packet) { - if i < 0 || i >= q.size { - //log.Warnf("warn: %v:", errPacketTooOld) - return - } - q.pkts[(q.head+i)&(len(q.pkts)-1)] = pkt -} - -func (q *queue) resize() { - if len(q.pkts) == 0 { - q.pkts = make([]*rtp.Packet, 128) - return - } - if q.size == len(q.pkts) { - newBuf := make([]*rtp.Packet, q.size<<1) - if q.tail > q.head { - copy(newBuf, q.pkts[q.head:q.tail]) - } else { - n := copy(newBuf, q.pkts[q.head:]) - copy(newBuf[n:], q.pkts[:q.tail]) - } - q.head = 0 - q.tail = q.size - q.pkts = newBuf - } -} - -func (q *queue) nack() *rtcp.NackPair { - for i := 0; i < 5; i++ { - if q.get(q.counter-i-1) == nil { - blp := uint16(0) - for j := 1; j < q.counter-i; j++ { - if q.get(q.counter-i-j-1) == nil { - blp |= 1 << (j - 1) - } - } - return &rtcp.NackPair{PacketID: q.headSN - uint16(q.counter-i-1), LostPackets: rtcp.PacketBitmap(blp)} - } - } - return nil -} - -func (q *queue) clean() { - last := q.last() - for q.size > 120 && (last == nil || q.pkts[q.head].Timestamp-last.Timestamp > q.duration) { - q.shift() - } -} diff --git a/pkg/sfu/packetqueue_test.go b/pkg/sfu/packetqueue_test.go deleted file mode 100644 index 43cc92b72..000000000 --- a/pkg/sfu/packetqueue_test.go +++ /dev/null @@ -1,147 +0,0 @@ -package sfu - -import ( - "reflect" - "testing" - - "github.com/stretchr/testify/assert" - - "github.com/pion/rtcp" - "github.com/pion/rtp" -) - -var TestPackets = []*rtp.Packet{ - { - Header: rtp.Header{ - SequenceNumber: 1, - }, - }, - { - Header: rtp.Header{ - SequenceNumber: 3, - }, - }, - { - Header: rtp.Header{ - SequenceNumber: 4, - }, - }, - { - Header: rtp.Header{ - SequenceNumber: 6, - }, - }, - { - Header: rtp.Header{ - SequenceNumber: 7, - }, - }, - { - Header: rtp.Header{ - SequenceNumber: 10, - }, - }, -} - -func Test_queue_nack(t *testing.T) { - type fields struct { - headSN uint16 - } - tests := []struct { - name string - fields fields - want *rtcp.NackPair - }{ - { - name: "Most generate correct nack packet", - fields: fields{}, - want: &rtcp.NackPair{ - PacketID: 2, - LostPackets: 100, - }, - }, - } - for _, tt := range tests { - tt := tt - t.Run(tt.name, func(t *testing.T) { - q := &queue{ - headSN: tt.fields.headSN, - } - for _, p := range TestPackets { - diff := p.SequenceNumber - q.headSN - for i := 1; i < int(diff); i++ { - q.push(nil) - q.counter++ - } - q.headSN = p.SequenceNumber - q.counter++ - q.push(p) - } - if got := q.nack(); !reflect.DeepEqual(got, tt.want) { - t.Errorf("nack() = %v, want %v", got, tt.want) - } - }) - } -} - -func Test_queue(t *testing.T) { - q := &queue{} - for _, p := range TestPackets { - p := p - assert.NotPanics(t, func() { - q.AddPacket(p, true) - }) - } - var expectedSN uint16 - expectedSN = 6 - assert.Equal(t, expectedSN, q.GetPacket(6).SequenceNumber) - - np := &rtp.Packet{ - Header: rtp.Header{ - SequenceNumber: 8, - }, - } - expectedSN = 8 - q.AddPacket(np, false) - assert.Equal(t, expectedSN, q.GetPacket(8).SequenceNumber) -} - -func Test_queue_edges(t *testing.T) { - var TestPackets = []*rtp.Packet{ - { - Header: rtp.Header{ - SequenceNumber: 65533, - }, - }, - { - Header: rtp.Header{ - SequenceNumber: 65534, - }, - }, - { - Header: rtp.Header{ - SequenceNumber: 2, - }, - }, - } - q := &queue{} - q.headSN = 65532 - for _, p := range TestPackets { - p := p - assert.NotPanics(t, func() { - q.AddPacket(p, true) - }) - } - assert.Equal(t, 6, q.size) - var expectedSN uint16 - expectedSN = 65534 - assert.Equal(t, expectedSN, q.GetPacket(expectedSN).SequenceNumber) - - np := &rtp.Packet{ - Header: rtp.Header{ - SequenceNumber: 65535, - }, - } - q.AddPacket(np, false) - assert.Equal(t, expectedSN+1, q.GetPacket(expectedSN+1).SequenceNumber) -}