正在显示
3 个修改的文件
包含
6 行增加
和
6 行删除
| @@ -165,8 +165,8 @@ vhost mrw.srs.com { | @@ -165,8 +165,8 @@ vhost mrw.srs.com { | ||
| 165 | # SRS always set mw on, so we just set the latency value. | 165 | # SRS always set mw on, so we just set the latency value. |
| 166 | # the latency of stream >= mw_latency + mr_latency | 166 | # the latency of stream >= mw_latency + mr_latency |
| 167 | # the value recomment is [300, 1800] | 167 | # the value recomment is [300, 1800] |
| 168 | - # default: 350 | ||
| 169 | - mw_latency 350; | 168 | + # default: 450 |
| 169 | + mw_latency 450; | ||
| 170 | } | 170 | } |
| 171 | 171 | ||
| 172 | # vhost for edge, edge and origin is the same vhost | 172 | # vhost for edge, edge and origin is the same vhost |
| @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 31 | // current release version | 31 | // current release version |
| 32 | #define VERSION_MAJOR 2 | 32 | #define VERSION_MAJOR 2 |
| 33 | #define VERSION_MINOR 0 | 33 | #define VERSION_MINOR 0 |
| 34 | -#define VERSION_REVISION 66 | 34 | +#define VERSION_REVISION 67 |
| 35 | // server info. | 35 | // server info. |
| 36 | #define RTMP_SIG_SRS_KEY "SRS" | 36 | #define RTMP_SIG_SRS_KEY "SRS" |
| 37 | #define RTMP_SIG_SRS_ROLE "origin/edge server" | 37 | #define RTMP_SIG_SRS_ROLE "origin/edge server" |
| @@ -95,7 +95,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -95,7 +95,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 95 | * 2000 150 300 | 95 | * 2000 150 300 |
| 96 | */ | 96 | */ |
| 97 | // the default config of mw. | 97 | // the default config of mw. |
| 98 | -#define SRS_PERF_MW_SLEEP 350 | 98 | +#define SRS_PERF_MW_SLEEP 450 |
| 99 | /** | 99 | /** |
| 100 | * use iovs cache in each msg, | 100 | * use iovs cache in each msg, |
| 101 | * for the shared ptr message, we calc once and used for every copy. | 101 | * 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. | @@ -138,7 +138,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 138 | * whether enable the fast vector for qeueue. | 138 | * whether enable the fast vector for qeueue. |
| 139 | * @see https://github.com/winlinvip/simple-rtmp-server/issues/251 | 139 | * @see https://github.com/winlinvip/simple-rtmp-server/issues/251 |
| 140 | */ | 140 | */ |
| 141 | -#undef SRS_PERF_QUEUE_FAST_VECTOR | 141 | +#define SRS_PERF_QUEUE_FAST_VECTOR |
| 142 | #if defined(SRS_PERF_QUEUE_FAST_CACHE) && defined(SRS_PERF_QUEUE_FAST_VECTOR) | 142 | #if defined(SRS_PERF_QUEUE_FAST_CACHE) && defined(SRS_PERF_QUEUE_FAST_VECTOR) |
| 143 | #error "fast cache conflict with fast vector" | 143 | #error "fast cache conflict with fast vector" |
| 144 | #endif | 144 | #endif |
| @@ -147,7 +147,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -147,7 +147,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 147 | * @remark this improve performance for large connectios. | 147 | * @remark this improve performance for large connectios. |
| 148 | * @see https://github.com/winlinvip/simple-rtmp-server/issues/251 | 148 | * @see https://github.com/winlinvip/simple-rtmp-server/issues/251 |
| 149 | */ | 149 | */ |
| 150 | -#undef SRS_PERF_QUEUE_COND_WAIT | 150 | +#define SRS_PERF_QUEUE_COND_WAIT |
| 151 | #ifdef SRS_PERF_QUEUE_COND_WAIT | 151 | #ifdef SRS_PERF_QUEUE_COND_WAIT |
| 152 | #define SRS_PERF_MW_MIN_MSGS 8 | 152 | #define SRS_PERF_MW_MIN_MSGS 8 |
| 153 | #endif | 153 | #endif |
-
请 注册 或 登录 后发表评论