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

Fix handling of NACKed packets when dropping.

Browse source 
We were not rewriting in this case.
This commit is contained in:
Juliusz Chroboczek 2021-05-17 20:06:08 +02:00
parent 22585e9d10
commit f3b73263c8
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rtpconn/rtpconn.go
View file

@ -10,7 +10,6 @@ import (
"time" "time"
"github.com/pion/rtcp" "github.com/pion/rtcp"
"github.com/pion/rtp"
"github.com/pion/sdp/v3" "github.com/pion/sdp/v3"
"github.com/pion/webrtc/v3" "github.com/pion/webrtc/v3"
@ -711,7 +710,6 @@ func sendNACKs(pc *webrtc.PeerConnection, ssrc webrtc.SSRC, nacks []rtcp.NackPai
func gotNACK(conn *rtpDownConnection, track *rtpDownTrack, p *rtcp.TransportLayerNack) { func gotNACK(conn *rtpDownConnection, track *rtpDownTrack, p *rtcp.TransportLayerNack) {
var unhandled []uint16 var unhandled []uint16
var packet rtp.Packet
buf := make([]byte, packetcache.BufSize) buf := make([]byte, packetcache.BufSize)
for _, nack := range p.Nacks { for _, nack := range p.Nacks {
nack.Range(func(s uint16) bool { nack.Range(func(s uint16) bool {
@ -724,13 +722,9 @@ func gotNACK(conn *rtpDownConnection, track *rtpDownTrack, p *rtcp.TransportLaye
unhandled = append(unhandled, seqno) unhandled = append(unhandled, seqno)
return true return true
} }
err := packet.Unmarshal(buf[:l]) _, err := track.Write(buf[:l])
if err != nil { if err != nil {
return true log.Printf("Write: %v", err)
}
err = track.track.WriteRTP(&packet)
if err != nil {
log.Printf("WriteRTP: %v", err)
return false return false
} }
return true return true