From 9dad53691ed2c7c0c01bd33108385a7198ed5279 Mon Sep 17 00:00:00 2001
From: "Alex.CR" <shi.weibd@hotmail.com>
Date: Wed, 12 Feb 2020 20:54:24 -0600
Subject: [PATCH 1/2] solve latency parameter error (#1600)

* solve latency parameter error
---
 trunk/src/app/srs_app_config.cpp | 2 +-
 trunk/src/srt/srt_server.cpp     | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp
index 1cea608db..7a9f86a0a 100644
--- a/trunk/src/app/srs_app_config.cpp
+++ b/trunk/src/app/srs_app_config.cpp
@@ -6761,7 +6761,7 @@ int SrsConfig::get_srto_recv_latency() {
 }
 
 int SrsConfig::get_srto_peer_latency() {
-    static int DEFAULT = 120;
+    static int DEFAULT = 0;
     SrsConfDirective* conf = root->get("srt_server");
     if (!conf) {
         return DEFAULT;
diff --git a/trunk/src/srt/srt_server.cpp b/trunk/src/srt/srt_server.cpp
index 06660135c..3a17a0a8b 100644
--- a/trunk/src/srt/srt_server.cpp
+++ b/trunk/src/srt/srt_server.cpp
@@ -26,7 +26,8 @@ srt_server::~srt_server()
 }
 
 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);
 
@@ -53,17 +54,17 @@ int srt_server::init_srt_parameter() {
     srt_setsockopt(_server_socket, 0, SRTO_PAYLOADSIZE, &payload_size, opt_len);
 
     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);
     }
     
     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);
     }
     
     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);
     }
     

From 8b7fbac7d4bad5813811637a8923896c9f9a90ae Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 13 Feb 2020 12:17:09 +0800
Subject: [PATCH 2/2] SRT supports detail config for DynamicConfig. 4.0.4

---
 README.md                            | 1 +
 trunk/conf/full.conf                 | 7 +++++++
 trunk/src/core/srs_core_version4.hpp | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 04ba70062..10ebf1aff 100755
--- a/README.md
+++ b/README.md
@@ -153,6 +153,7 @@ For previous versions, please read:
 
 ## V4 changes
 
+* v4.0, 2020-02-13, SRT supports detail config for [DynamicEncoding](https://github.com/runner365/srt_encoder). 4.0.4
 * v4.0, 2020-02-04, Update project code. 4.0.3
 * v4.0, 2020-01-26, Allow use libsrt.so for SRT is MPL license. 4.0.2
 * v4.0, 2020-01-24, Fix [#1147][bug #1147], support SRT(Secure Reliable Transport). 4.0.1
diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf
index 0348a9433..bbfce255f 100644
--- a/trunk/conf/full.conf
+++ b/trunk/conf/full.conf
@@ -262,6 +262,13 @@ srt_server {
     enabled on;
     # The UDP listen port for SRT.
     listen 10080;
+    # For detail parameters, please read wiki:
+    #   https://github.com/ossrs/srs/wiki/v4_CN_SRTParams
+    #   https://github.com/ossrs/srs/wiki/v4_EN_SRTParams
+    maxbw 1000000000;
+    connect_timeout 4000;
+    peerlatency 300;
+    recvlatency 300;
 }
 
 #############################################################################################
diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp
index 747be972f..208807ee9 100644
--- a/trunk/src/core/srs_core_version4.hpp
+++ b/trunk/src/core/srs_core_version4.hpp
@@ -24,6 +24,6 @@
 #ifndef SRS_CORE_VERSION4_HPP
 #define SRS_CORE_VERSION4_HPP
 
-#define SRS_VERSION4_REVISION 3
+#define SRS_VERSION4_REVISION 4
 
 #endif