Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
mediastreamer2
Commits
2be49acd
Commit
2be49acd
authored
May 12, 2014
by
Ghislain MARY
Browse files
Merge branch 'master' into dev_avpf
parents
626924ab
1934ed78
Changes
1
Hide whitespace changes
Inline
Side-by-side
tools/mediastream.c
View file @
2be49acd
...
...
@@ -131,6 +131,7 @@ typedef struct _MediastreamDatas {
char
*
srtp_remote_master_key
;
int
netsim_bw
;
int
netsim_lossrate
;
int
netsim_latency
;
float
zoom
;
float
zoom_cx
,
zoom_cy
;
...
...
@@ -204,6 +205,7 @@ const char *usage="mediastream --local <port> --remote <ip:port> \n"
"[ --srtp <local master_key> <remote master_key> (enable srtp, master key is generated if absent from comand line)
\n
"
"[ --netsim-bandwidth <bandwidth limit in bits/s> (simulates a network download bandwidth limit)
\n
"
"[ --netsim-lossrate <0-100> (simulates a network lost rate)
\n
"
"[ --netsim-latency <latency in ms> (simulates a network latency)
\n
"
"[ --zoom zoomfactor]
\n
"
"[ --ice-local-candidate <ip:port:[host|srflx|prflx|relay]> ]
\n
"
"[ --ice-remote-candidate <ip:port:[host|srflx|prflx|relay]> ]
\n
"
...
...
@@ -497,6 +499,9 @@ bool_t parse_args(int argc, char** argv, MediastreamDatas* out) {
ms_warning
(
"%d > 100, wrong value for --lost-rate: set to 100"
,
out
->
netsim_lossrate
);
out
->
netsim_lossrate
=
100
;
}
}
else
if
(
strcmp
(
argv
[
i
],
"--netsim-latency"
)
==
0
)
{
i
++
;
out
->
netsim_latency
=
atoi
(
argv
[
i
]);
}
else
if
(
strcmp
(
argv
[
i
],
"--zoom"
)
==
0
){
i
++
;
if
(
sscanf
(
argv
[
i
],
"%f,%f,%f"
,
&
out
->
zoom
,
&
out
->
zoom_cx
,
&
out
->
zoom_cy
)
!=
3
)
{
...
...
@@ -510,7 +515,6 @@ bool_t parse_args(int argc, char** argv, MediastreamDatas* out) {
return
FALSE
;
}
}
else
if
(
strcmp
(
argv
[
i
],
"--interactive"
)
==
0
){
i
++
;
out
->
interactive
=
TRUE
;
}
else
if
(
strcmp
(
argv
[
i
],
"--avpf"
)
==
0
)
{
out
->
enable_avpf
=
TRUE
;
...
...
@@ -804,6 +808,10 @@ void setup_media_streams(MediastreamDatas* args) {
params
.
enabled
=
TRUE
;
params
.
loss_rate
=
args
->
netsim_lossrate
;
}
if
(
args
->
netsim_latency
>
0
)
{
params
.
enabled
=
TRUE
;
params
.
latency
=
args
->
netsim_latency
;
}
if
(
params
.
enabled
){
rtp_session_enable_network_simulation
(
args
->
session
,
&
params
);
}
...
...
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