Add debounce and fix sdes mid ext for senders

Author: OrlandoCo

go.mod

@@ -3,6 +3,7 @@ module github.com/pion/ion-sfu
 go 1.13
 
 require (
+	github.com/bep/debounce v1.2.0
 	github.com/gammazero/deque v0.0.0-20201010052221-3932da5530cc
 	github.com/golang/protobuf v1.4.3 // indirect
 	github.com/gorilla/websocket v1.4.2

go.sum

@@ -30,6 +30,8 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV
 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/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/bep/debounce v1.2.0 h1:wXds8Kq8qRfwAOpAxHrJDbCXgC5aHSzgQb/0gKsHQqo=
+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/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=

pkg/router.go

@@ -95,10 +95,20 @@ func (r *router) AddReceiver(track *webrtc.Track, receiver *webrtc.RTPReceiver)
 		}
 	}
 	trackID := track.ID()
+
+	var twccExt uint8
+	if e, ok := r.extensions[webrtc.SDPSectionType(mid)]; ok {
+		for _, ex := range e {
+			if ex.URI.String() == sdp.TransportCCURI {
+				twccExt = uint8(ex.Value)
+			}
+		}
+	}
+
 	recv := NewWebRTCReceiver(receiver, track, BufferOptions{
 		BufferTime: r.config.MaxBufferTime,
 		MaxBitRate: r.config.MaxBandwidth * 1000,
-		TWCCExt:    r.GetExtMap(mid, sdp.TransportCCURI),
+		TWCCExt:    twccExt,
 	})
 	recv.OnTransportWideCC(func(sn uint16, timeNS int64, marker bool) {
 		r.twcc.push(sn, timeNS, marker)
@@ -253,6 +263,8 @@ func (r *router) sendRTCP() {
 }
 
 func (r *router) GetExtMap(mid, ext string) uint8 {
+	r.mu.RLock()
+	defer r.mu.RUnlock()
 	if e, ok := r.extensions[webrtc.SDPSectionType(mid)]; ok {
 		for _, ex := range e {
 			if ex.URI.String() == ext {

pkg/sender.go

@@ -21,7 +21,6 @@ type Sender interface {
 	ID() string
 	Start()
 	Close()
-	SetMidExt(id uint8)
 	Kind() webrtc.RTPCodecType
 	Type() SenderType
 	Track() *webrtc.Track

pkg/simplesender.go

@@ -24,7 +24,6 @@ type SimpleSender struct {
 	payload        uint8
 	maxBitrate     uint64
 	target         uint64
-	sdesMidExt     uint8
 	sdesMidHdrCtr  uint8
 	onCloseHandler func()
 	// Muting helpers
@@ -116,8 +115,8 @@ func (s *SimpleSender) WriteRTP(pkt *rtp.Packet) {
 	h.PayloadType = s.payload
 	h.Timestamp = s.lastTS
 	h.SequenceNumber = s.lastSN
-	if s.sdesMidHdrCtr < 50 && s.sdesMidExt != 0 {
-		if err := h.SetExtension(s.sdesMidExt, []byte(s.transceiver.Mid())); err != nil {
+	if s.sdesMidHdrCtr < 50 {
+		if err := h.SetExtension(1, []byte(s.transceiver.Mid())); err != nil {
 			log.Errorf("Setting sdes mid header err: %v", err)
 		}
 		s.sdesMidHdrCtr++
@@ -145,10 +144,6 @@ func (s *SimpleSender) Mute(val bool) {
 	}
 }
 
-func (s *SimpleSender) SetMidExt(id uint8) {
-	s.sdesMidExt = id
-}
-
 func (s *SimpleSender) Kind() webrtc.RTPCodecType {
 	return s.track.Kind()
 }

pkg/simulcastsender.go

@@ -25,7 +25,6 @@ type SimulcastSender struct {
 	enabled        atomicBool
 	target         uint64
 	payload        uint8
-	sdesMidExt     uint8
 	sdesMidHdrCtr  uint8
 	maxBitrate     uint64
 	onCloseHandler func()
@@ -181,8 +180,8 @@ func (s *SimulcastSender) WriteRTP(pkt *rtp.Packet) {
 	h.SequenceNumber = lSN
 	h.Timestamp = s.lTS
 	h.PayloadType = s.payload
-	if s.sdesMidHdrCtr < 50 && s.sdesMidExt != 0 {
-		if err := h.SetExtension(s.sdesMidExt, []byte(s.transceiver.Mid())); err != nil {
+	if s.sdesMidHdrCtr < 50 {
+		if err := h.SetExtension(1, []byte(s.transceiver.Mid())); err != nil {
 			log.Errorf("Setting sdes mid header err: %v", err)
 		}
 		s.sdesMidHdrCtr++
@@ -219,10 +218,6 @@ func (s *SimulcastSender) Transceiver() *webrtc.RTPTransceiver {
 	return s.transceiver
 }
 
-func (s *SimulcastSender) SetMidExt(id uint8) {
-	s.sdesMidExt = id
-}
-
 func (s *SimulcastSender) Type() SenderType {
 	return SimulcastSenderType
 }

pkg/webrtctransport.go

@@ -2,7 +2,9 @@ package sfu
 
 import (
 	"sync"
+	"time"
 
+	"github.com/bep/debounce"
 	"github.com/gammazero/deque"
 
 	"github.com/lucsky/cuid"
@@ -156,8 +158,6 @@ func (p *WebRTCTransport) SetRemoteDescription(desc webrtc.SessionDescription) e
 				for i := 0; i < p.pendingSenders.Len(); i++ {
 					pd := p.pendingSenders.PopFront().(pendingSender)
 					if pd.transceiver.Mid() == mid {
-						ext := p.router.GetExtMap(mid, sdp.SDESMidURI)
-						pd.sender.SetMidExt(ext)
 						pendingStart = append(pendingStart, pd)
 					} else {
 						p.pendingSenders.PushBack(pd)
@@ -215,7 +215,10 @@ func (p *WebRTCTransport) OnICECandidate(f func(c *webrtc.ICECandidate)) {
 
 // OnNegotiationNeeded handler
 func (p *WebRTCTransport) OnNegotiationNeeded(f func()) {
-	p.negotiate = f
+	debounced := debounce.New(100 * time.Millisecond)
+	p.negotiate = func() {
+		debounced(f)
+	}
 }
 
 // OnTrack handler