Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
galene
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
galene
Commits
f3b73263
Commit
f3b73263
authored
May 17, 2021
by
Juliusz Chroboczek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix handling of NACKed packets when dropping.
We were not rewriting in this case.
parent
22585e9d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
rtpconn/rtpconn.go
rtpconn/rtpconn.go
+2
-8
No files found.
rtpconn/rtpconn.go
View file @
f3b73263
...
@@ -10,7 +10,6 @@ import (
...
@@ -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
...
@@ -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
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment