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
b09dba0e
Commit
b09dba0e
authored
May 11, 2021
by
Juliusz Chroboczek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove FIR sending code.
We no longer send FIRs.
parent
d3f53e6a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
38 deletions
+1
-38
rtpconn/rtpconn.go
rtpconn/rtpconn.go
+1
-38
No files found.
rtpconn/rtpconn.go
View file @
b09dba0e
...
@@ -225,9 +225,7 @@ func (down *rtpDownConnection) flushICECandidates() error {
...
@@ -225,9 +225,7 @@ func (down *rtpDownConnection) flushICECandidates() error {
}
}
type
upTrackAtomics
struct
{
type
upTrackAtomics
struct
{
lastPLI
uint64
lastPLI
uint64
lastFIR
uint64
firSeqno
uint32
}
}
type
rtpUpTrack
struct
{
type
rtpUpTrack
struct
{
...
@@ -546,41 +544,6 @@ func sendPLI(pc *webrtc.PeerConnection, ssrc webrtc.SSRC) error {
...
@@ -546,41 +544,6 @@ func sendPLI(pc *webrtc.PeerConnection, ssrc webrtc.SSRC) error {
})
})
}
}
func
(
up
*
rtpUpConnection
)
sendFIR
(
track
*
rtpUpTrack
,
increment
bool
)
error
{
// we need to reliably increment the seqno, even if we are going
// to drop the packet due to rate limiting.
var
seqno
uint8
if
increment
{
seqno
=
uint8
(
atomic
.
AddUint32
(
&
track
.
atomics
.
firSeqno
,
1
)
&
0xFF
)
}
else
{
seqno
=
uint8
(
atomic
.
LoadUint32
(
&
track
.
atomics
.
firSeqno
)
&
0xFF
)
}
if
!
track
.
hasRtcpFb
(
"ccm"
,
"fir"
)
{
return
ErrUnsupportedFeedback
}
last
:=
atomic
.
LoadUint64
(
&
track
.
atomics
.
lastFIR
)
now
:=
rtptime
.
Jiffies
()
if
now
>=
last
&&
now
-
last
<
rtptime
.
JiffiesPerSec
/
2
{
return
ErrRateLimited
}
atomic
.
StoreUint64
(
&
track
.
atomics
.
lastFIR
,
now
)
return
sendFIR
(
up
.
pc
,
track
.
track
.
SSRC
(),
seqno
)
}
func
sendFIR
(
pc
*
webrtc
.
PeerConnection
,
ssrc
webrtc
.
SSRC
,
seqno
uint8
)
error
{
return
pc
.
WriteRTCP
([]
rtcp
.
Packet
{
&
rtcp
.
FullIntraRequest
{
FIR
:
[]
rtcp
.
FIREntry
{
{
SSRC
:
uint32
(
ssrc
),
SequenceNumber
:
seqno
,
},
},
},
})
}
func
(
up
*
rtpUpConnection
)
sendNACK
(
track
*
rtpUpTrack
,
first
uint16
,
bitmap
uint16
)
error
{
func
(
up
*
rtpUpConnection
)
sendNACK
(
track
*
rtpUpTrack
,
first
uint16
,
bitmap
uint16
)
error
{
if
!
track
.
hasRtcpFb
(
"nack"
,
""
)
{
if
!
track
.
hasRtcpFb
(
"nack"
,
""
)
{
return
ErrUnsupportedFeedback
return
ErrUnsupportedFeedback
...
...
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