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
7961d727
Commit
7961d727
authored
May 02, 2020
by
Juliusz Chroboczek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move monotonic time to separate package, use microseconds.
parent
1f50b42e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
70 additions
and
22 deletions
+70
-22
client.go
client.go
+13
-8
group.go
group.go
+9
-14
mono/mono.go
mono/mono.go
+19
-0
mono/mono_test.go
mono/mono_test.go
+29
-0
No files found.
client.go
View file @
7961d727
...
...
@@ -18,6 +18,7 @@ import (
"time"
"sfu/estimator"
"sfu/mono"
"sfu/packetcache"
"github.com/gorilla/websocket"
...
...
@@ -319,10 +320,10 @@ func upLoop(conn *upConnection, track *upTrack) {
buf
:=
make
([]
byte
,
packetcache
.
BufSize
)
var
packet
rtp
.
Packet
var
local
[]
*
downTrack
var
localTime
time
.
Time
var
localTime
uint64
for
{
now
:=
time
.
Now
()
if
now
.
Sub
(
localTime
)
>
time
.
Second
/
2
{
now
:=
mono
.
Microseconds
()
if
now
<
localTime
||
now
>
localTime
+
500000
{
local
=
track
.
getLocal
()
localTime
=
now
}
...
...
@@ -598,7 +599,9 @@ func rtcpDownListener(g *group, conn *downConnection, track *downTrack, s *webrt
log
.
Printf
(
"sendPLI: %v"
,
err
)
}
case
*
rtcp
.
ReceiverEstimatedMaximumBitrate
:
track
.
maxBitrate
.
Set
(
p
.
Bitrate
,
msSinceEpoch
())
track
.
maxBitrate
.
Set
(
p
.
Bitrate
,
mono
.
Microseconds
(),
)
case
*
rtcp
.
ReceiverReport
:
for
_
,
r
:=
range
p
.
Reports
{
if
r
.
SSRC
==
track
.
track
.
SSRC
()
{
...
...
@@ -609,7 +612,9 @@ func rtcpDownListener(g *group, conn *downConnection, track *downTrack, s *webrt
}
}
case
*
rtcp
.
TransportLayerNack
:
maxBitrate
:=
track
.
maxBitrate
.
Get
(
msSinceEpoch
())
maxBitrate
:=
track
.
maxBitrate
.
Get
(
mono
.
Microseconds
(),
)
bitrate
:=
track
.
rate
.
Estimate
()
if
uint64
(
bitrate
)
<
maxBitrate
{
sendRecovery
(
p
,
track
)
...
...
@@ -640,7 +645,7 @@ func trackKinds(down *downConnection) (audio bool, video bool) {
}
func
updateUpBitrate
(
up
*
upConnection
)
{
now
:=
m
sSinceEpoch
()
now
:=
m
ono
.
Microseconds
()
for
_
,
track
:=
range
up
.
tracks
{
track
.
maxBitrate
=
^
uint64
(
0
)
...
...
@@ -678,8 +683,8 @@ func updateUpBitrate(up *upConnection) {
func
(
up
*
upConnection
)
sendPLI
(
track
*
upTrack
)
error
{
last
:=
atomic
.
LoadUint64
(
&
track
.
lastPLI
)
now
:=
m
sSinceEpoch
()
if
now
>=
last
&&
now
-
last
<
200
{
now
:=
m
ono
.
Microseconds
()
if
now
>=
last
&&
now
-
last
<
200
000
{
return
nil
}
atomic
.
StoreUint64
(
&
track
.
lastPLI
,
now
)
...
...
group.go
View file @
7961d727
...
...
@@ -17,6 +17,7 @@ import (
"time"
"sfu/estimator"
"sfu/mono"
"sfu/packetcache"
"github.com/pion/webrtc/v2"
...
...
@@ -68,28 +69,22 @@ type upConnection struct {
tracks
[]
*
upTrack
}
func
msSinceEpoch
()
uint64
{
return
uint64
(
time
.
Since
(
epoch
)
/
time
.
Millisecond
)
}
var
epoch
=
time
.
Now
()
type
timeStampedBitrate
struct
{
bitrate
uint64
timestamp
uint64
bitrate
uint64
microseconds
uint64
}
func
(
tb
*
timeStampedBitrate
)
Set
(
bitrate
,
timestamp
uint64
)
{
func
(
tb
*
timeStampedBitrate
)
Set
(
bitrate
,
us
uint64
)
{
// this is racy -- a reader might read the
// data between the two writes. This shouldn't
// matter, we'll recover at the next sample.
atomic
.
StoreUint64
(
&
tb
.
bitrate
,
bitrate
)
atomic
.
StoreUint64
(
&
tb
.
timestamp
,
timestamp
)
atomic
.
StoreUint64
(
&
tb
.
bitrate
,
bitrate
)
atomic
.
StoreUint64
(
&
tb
.
microseconds
,
us
)
}
func
(
tb
*
timeStampedBitrate
)
Get
(
now
uint64
)
uint64
{
ts
:=
atomic
.
LoadUint64
(
&
tb
.
timestamp
)
if
now
<
ts
||
now
>
ts
+
1
000
{
ts
:=
atomic
.
LoadUint64
(
&
tb
.
microseconds
)
if
now
<
ts
||
now
>
ts
+
4000
000
{
return
^
uint64
(
0
)
}
return
atomic
.
LoadUint64
(
&
tb
.
bitrate
)
...
...
@@ -720,7 +715,7 @@ func getClientStats(c *client) clientStats {
loss
:=
atomic
.
LoadUint32
(
&
t
.
loss
)
conns
.
tracks
=
append
(
conns
.
tracks
,
trackStats
{
bitrate
:
uint64
(
t
.
rate
.
Estimate
())
*
8
,
maxBitrate
:
t
.
maxBitrate
.
Get
(
m
sSinceEpoch
()),
maxBitrate
:
t
.
maxBitrate
.
Get
(
m
ono
.
Microseconds
()),
loss
:
uint8
((
loss
*
100
)
/
256
),
})
}
...
...
mono/mono.go
0 → 100644
View file @
7961d727
package
mono
import
(
"time"
)
var
epoch
=
time
.
Now
()
func
fromDuration
(
d
time
.
Duration
,
hz
uint32
)
uint64
{
return
uint64
(
d
)
*
uint64
(
hz
)
/
uint64
(
time
.
Second
)
}
func
Now
(
hz
uint32
)
uint64
{
return
fromDuration
(
time
.
Since
(
epoch
),
hz
)
}
func
Microseconds
()
uint64
{
return
Now
(
1000000
)
}
mono/mono_test.go
0 → 100644
View file @
7961d727
package
mono
import
(
"testing"
"time"
)
func
differs
(
a
,
b
,
delta
uint64
)
bool
{
if
a
<
b
{
a
,
b
=
b
,
a
}
return
a
-
b
>=
delta
}
func
TestMono
(
t
*
testing
.
T
)
{
a
:=
Now
(
48000
)
time
.
Sleep
(
4
*
time
.
Millisecond
)
b
:=
Now
(
48000
)
-
a
if
differs
(
b
,
4
*
48
,
16
)
{
t
.
Errorf
(
"Expected %v, got %v"
,
4
*
48
,
b
)
}
c
:=
Microseconds
()
time
.
Sleep
(
4
*
time
.
Millisecond
)
d
:=
Microseconds
()
-
c
if
differs
(
d
,
4000
,
1000
)
{
t
.
Errorf
(
"Expected %v, got %v"
,
4000
,
d
)
}
}
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