diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index de0ca04987..2e47826d51 100755 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -165,8 +165,8 @@ vhost mrw.srs.com { # SRS always set mw on, so we just set the latency value. # the latency of stream >= mw_latency + mr_latency # the value recomment is [300, 1800] - # default: 350 - mw_latency 350; + # default: 450 + mw_latency 450; } # vhost for edge, edge and origin is the same vhost diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 26c3c1f7cd..b7ea4e366a 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR 2 #define VERSION_MINOR 0 -#define VERSION_REVISION 66 +#define VERSION_REVISION 67 // server info. #define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_ROLE "origin/edge server" diff --git a/trunk/src/core/srs_core_performance.hpp b/trunk/src/core/srs_core_performance.hpp index 4757c66e8e..2ac545e09e 100644 --- a/trunk/src/core/srs_core_performance.hpp +++ b/trunk/src/core/srs_core_performance.hpp @@ -95,7 +95,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * 2000 150 300 */ // the default config of mw. -#define SRS_PERF_MW_SLEEP 350 +#define SRS_PERF_MW_SLEEP 450 /** * use iovs cache in each msg, * for the shared ptr message, we calc once and used for every copy. @@ -138,7 +138,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * whether enable the fast vector for qeueue. * @see https://github.com/winlinvip/simple-rtmp-server/issues/251 */ -#undef SRS_PERF_QUEUE_FAST_VECTOR +#define SRS_PERF_QUEUE_FAST_VECTOR #if defined(SRS_PERF_QUEUE_FAST_CACHE) && defined(SRS_PERF_QUEUE_FAST_VECTOR) #error "fast cache conflict with fast vector" #endif @@ -147,7 +147,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * @remark this improve performance for large connectios. * @see https://github.com/winlinvip/simple-rtmp-server/issues/251 */ -#undef SRS_PERF_QUEUE_COND_WAIT +#define SRS_PERF_QUEUE_COND_WAIT #ifdef SRS_PERF_QUEUE_COND_WAIT #define SRS_PERF_MW_MIN_MSGS 8 #endif