mirror/galene
1
Fork 0
mirror of https://github.com/jech/galene.git synced 2024-11-10 02:35:58 +01:00
Code Activity

Move PLI rate-limiting into the reader loop.

Browse source
This commit is contained in:
Juliusz Chroboczek 2021-05-17 03:54:20 +02:00
parent 7665067a91
commit c00a21995e
2 changed files with 38 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
rtpconn/rtpconn.go
View file

@ -319,16 +319,11 @@ func (down *rtpDownConnection) flushICECandidates() error {
return err
}
type upTrackAtomics struct {
lastPLI uint64
}
type rtpUpTrack struct {
track *webrtc.TrackRemote
rate *estimator.Estimator
cache *packetcache.Cache
jitter *jitter.Estimator
atomics *upTrackAtomics
cname atomic.Value
localCh chan trackAction
@ -597,7 +592,6 @@ func newUpConn(c group.Client, id string, label string, offer string) (*rtpUpCon
cache: packetcache.New(minPacketCache(remote)),
rate: estimator.New(time.Second),
jitter: jitter.New(remote.Codec().ClockRate),
atomics: &upTrackAtomics{},
localCh: make(chan trackAction, 2),
readerDone: make(chan struct{}),
}
@ -626,12 +620,6 @@ func (up *rtpUpConnection) sendPLI(track *rtpUpTrack) error {
if !track.hasRtcpFb("nack", "pli") {
return ErrUnsupportedFeedback
}
last := atomic.LoadUint64(&track.atomics.lastPLI)
now := rtptime.Jiffies()
if now >= last && now-last < rtptime.JiffiesPerSec/2 {
return ErrRateLimited
}
atomic.StoreUint64(&track.atomics.lastPLI, now)
return sendPLI(up.pc, track.track.SSRC())
}

59
rtpconn/rtpreader.go
View file

@ -3,6 +3,7 @@ package rtpconn
import (
"io"
"log"
"time"
"github.com/pion/rtp"
"github.com/pion/webrtc/v3"
@ -21,10 +22,39 @@ func readLoop(conn *rtpUpConnection, track *rtpUpTrack) {
isvideo := track.track.Kind() == webrtc.RTPCodecTypeVideo
codec := track.track.Codec()
sendNACK := track.hasRtcpFb("nack", "")
sendPLI := track.hasRtcpFb("nack", "pli")
var kfNeeded bool
var kfRequested time.Time
buf := make([]byte, packetcache.BufSize)
var packet rtp.Packet
for {
inner:
for {
select {
case action := <-track.localCh:
switch action.action {
case trackActionAdd, trackActionDel:
err := writers.add(
action.track,
action.action == trackActionAdd,
)
if err != nil {
log.Printf(
"add/remove track: %v",
err,
)
}
case trackActionKeyframe:
kfNeeded = true
default:
log.Printf("Unknown action")
}
default:
break inner
}
}
bytes, _, err := track.track.Read(buf)
if err != nil {
if err != io.EOF {
@ -103,31 +133,18 @@ func readLoop(conn *rtpUpConnection, track *rtpUpTrack) {
writers.write(packet.SequenceNumber, index, delay,
isvideo, packet.Marker)
select {
case action := <-track.localCh:
switch action.action {
case trackActionAdd, trackActionDel:
err := writers.add(
action.track,
action.action == trackActionAdd,
)
now := time.Now()
if kfNeeded && now.Sub(kfRequested) > time.Second/2 {
if sendPLI {
err := conn.sendPLI(track)
if err != nil {
log.Printf("add/remove track: %v", err)
log.Printf("sendPLI: %v", err)
kfNeeded = false
}
case trackActionKeyframe:
kfNeeded = true
default:
log.Printf("Unknown action %v", action.action)
}
default:
}
if kfNeeded {
err := conn.sendPLI(track)
if err != nil && err != ErrRateLimited {
log.Printf("sendPLI: %v", err)
} else {
kfNeeded = false
}
kfRequested = now
}
}
}