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

Refine SRT code, with StateThread adpater

Browse source
This commit is contained in:
hondaxiao 2022-04-15 13:54:24 +08:00 • committed by winlin
parent 3ed4aed824
commit 94fa0ff7bd
25 changed files with 4131 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2546,8 +2546,9 @@ srs_error_t SrsConfig::check_normal_config()
&& n != "mss" && n != "latency" && n != "recvlatency"
&& n != "peerlatency" && n != "tlpkdrop" && n != "connect_timeout"
&& n != "sendbuf" && n != "recvbuf" && n != "payloadsize"
&& n != "default_app" && n != "mix_correct" && n != "sei_filter") {
return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "illegal srt_stream.%s", n.c_str());
&& n != "default_app" && n != "mix_correct" && n != "sei_filter"
&& n != "tlpktdrop" && n != "tsbpdmode") {
return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "illegal srt_server.%s", n.c_str());
}
}
}
@ -6798,6 +6799,20 @@ int SrsConfig::get_srto_mss() {
return atoi(conf->arg0().c_str());
}
bool SrsConfig::get_srto_tsbpdmode() {
static bool DEFAULT = false;
SrsConfDirective* conf = root->get("srt_server");
if (!conf) {
return DEFAULT;
}
conf = conf->get("tsbpdmode");
if (!conf || conf->arg0().empty()) {
return DEFAULT;
}
return SRS_CONF_PERFER_TRUE(conf->arg0());
}
int SrsConfig::get_srto_latency() {
static int DEFAULT = 120;
SrsConfDirective* conf = root->get("srt_server");
@ -6854,14 +6869,18 @@ bool SrsConfig::get_srt_sei_filter() {
return SRS_CONF_PERFER_TRUE(conf->arg0());
}
bool SrsConfig::get_srto_tlpkdrop() {
bool SrsConfig::get_srto_tlpktdrop() {
static bool DEFAULT = true;
SrsConfDirective* conf = root->get("srt_server");
if (!conf) {
SrsConfDirective* srt_server_conf = root->get("srt_server");
if (!srt_server_conf) {
return DEFAULT;
}
conf = conf->get("tlpkdrop");
SrsConfDirective* conf = srt_server_conf->get("tlpkdrop");
if (! conf) {
// make it compatible tlpkdrop and tlpktdrop opt.
conf = srt_server_conf->get("tlpktdrop");
}
if (!conf || conf->arg0().empty()) {
return DEFAULT;
}
@ -6882,6 +6901,20 @@ int SrsConfig::get_srto_conntimeout() {
return atoi(conf->arg0().c_str());
}
int SrsConfig::get_srto_peeridletimeout() {
static int DEFAULT = 10000;
SrsConfDirective* conf = root->get("srt_server");
if (!conf) {
return DEFAULT;
}
conf = conf->get("peer_idle_timeout");
if (!conf || conf->arg0().empty()) {
return DEFAULT;
}
return atoi(conf->arg0().c_str());
}
int SrsConfig::get_srto_sendbuf() {
static int64_t DEFAULT = 8192 * (1500-28);
SrsConfDirective* conf = root->get("srt_server");