external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

solve latency parameter error (#1600)

Browse source 
* solve latency parameter error
This commit is contained in:
Alex.CR 2020-02-12 20:54:24 -06:00 • committed by GitHub
parent 5f7d23f123
commit 9dad53691e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_config.cpp
View file

@ -6761,7 +6761,7 @@ int SrsConfig::get_srto_recv_latency() {
} }
int SrsConfig::get_srto_peer_latency() { int SrsConfig::get_srto_peer_latency() {
static int DEFAULT = 120; static int DEFAULT = 0;
SrsConfDirective* conf = root->get("srt_server"); SrsConfDirective* conf = root->get("srt_server");
if (!conf) { if (!conf) {
return DEFAULT; return DEFAULT;

9
trunk/src/srt/srt_server.cpp
View file

@ -26,7 +26,8 @@ srt_server::~srt_server()
} }
int srt_server::init_srt_parameter() { int srt_server::init_srt_parameter() {
const int DEF_LATENCY = 188*7; const int DEF_RECV_LATENCY = 120;
const int DEF_PEER_LATENCY = 0;
int opt_len = sizeof(int); int opt_len = sizeof(int);
@ -53,17 +54,17 @@ int srt_server::init_srt_parameter() {
srt_setsockopt(_server_socket, 0, SRTO_PAYLOADSIZE, &payload_size, opt_len); srt_setsockopt(_server_socket, 0, SRTO_PAYLOADSIZE, &payload_size, opt_len);
int latency = _srs_config->get_srto_latency(); int latency = _srs_config->get_srto_latency();
if (DEF_LATENCY != latency) { if (DEF_RECV_LATENCY != latency) {
srt_setsockopt(_server_socket, 0, SRTO_LATENCY, &latency, opt_len); srt_setsockopt(_server_socket, 0, SRTO_LATENCY, &latency, opt_len);
} }
int recv_latency = _srs_config->get_srto_recv_latency(); int recv_latency = _srs_config->get_srto_recv_latency();
if (DEF_LATENCY != recv_latency) { if (DEF_RECV_LATENCY != recv_latency) {
srt_setsockopt(_server_socket, 0, SRTO_RCVLATENCY, &recv_latency, opt_len); srt_setsockopt(_server_socket, 0, SRTO_RCVLATENCY, &recv_latency, opt_len);
} }
int peer_latency = _srs_config->get_srto_peer_latency(); int peer_latency = _srs_config->get_srto_peer_latency();
if (DEF_LATENCY != peer_latency) { if (DEF_PEER_LATENCY != peer_latency) {
srt_setsockopt(_server_socket, 0, SRTO_PEERLATENCY, &recv_latency, opt_len); srt_setsockopt(_server_socket, 0, SRTO_PEERLATENCY, &recv_latency, opt_len);
} }