mirror/galene
1
Fork 0
mirror of https://github.com/jech/galene.git synced 2024-12-22 23:35:46 +01:00
Code Activity

Delay rtcpUpSender until the connection is complete.

Browse source 
This avoids locking in sendRR.
This commit is contained in:
Juliusz Chroboczek 2020-05-31 23:20:05 +02:00
parent 7786aa12aa
commit c4284a45c5
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
webclient.go
View file

@ -336,8 +336,6 @@ func addUpConn(c *webClient, id string) (*upConnection, error) {
sendICE(c, id, candidate)
})
go rtcpUpSender(c, conn)
pc.OnTrack(func(remote *webrtc.Track, receiver *webrtc.RTPReceiver) {
c.mu.Lock()
u, ok := c.up[id]
@ -395,6 +393,7 @@ func addUpConn(c *webClient, id string) (*upConnection, error) {
for _, cc := range clients {
cc.pushConn(u, tracks, u.label)
}
go rtcpUpSender(conn)
}
})
@ -569,10 +568,8 @@ func rtcpUpListener(conn *upConnection, track *upTrack, r *webrtc.RTPReceiver) {
}
}
func sendRR(c *webClient, conn *upConnection) error {
c.mu.Lock()
func sendRR(conn *upConnection) error {
if len(conn.tracks) == 0 {
c.mu.Unlock()
return nil
}
@ -600,25 +597,23 @@ func sendRR(c *webClient, conn *upConnection) error {
Delay: delay,
})
}
c.mu.Unlock()
return conn.pc.WriteRTCP([]rtcp.Packet{
&rtcp.ReceiverReport{
SSRC: 1,
Reports: reports,
},
})
}
func rtcpUpSender(c *webClient, conn *upConnection) {
func rtcpUpSender(conn *upConnection) {
for {
time.Sleep(time.Second)
err := sendRR(c, conn)
err := sendRR(conn)
if err != nil {
if err == io.EOF || err == io.ErrClosedPipe {
return
}
log.Printf("WriteRTCP: %v", err)
log.Printf("sendRR: %v", err)
}
}
}