Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2016-08-09 12:37:48 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
516f33888c7e67e29099e96d4591127ca7dc4d2f
516f3388
1 parent
36eb0981
refine config
显示空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
24 行增加
和
8 行删除
trunk/conf/full.conf
trunk/conf/full.conf
查看文件 @
516f338
...
...
@@ -409,14 +409,10 @@ vhost play.srs.com {
# 1. full, to ensure stream start at zero, and ensure stream monotonically increasing.
# 2. zero, only ensure stream start at zero, ignore timestamp jitter.
# 3. off, disable the time jitter algorithm, like atc.
# @remark for full, correct timestamp only when |delta| > 250ms.
# @remark disabled when atc is on.
# default: full
time_jitter
full
;
# whether use the interleaved/mixed algorithm to correct the timestamp.
# if on, always ensure the timestamp of audio+video is interleaved/mixed monotonically increase.
# if off, use time_jitter to correct the timestamp if required.
# default: off
mix_correct
off
;
# vhost for atc for hls/hds/rtmp backup.
# generally, atc default to off, server delivery rtmp stream to client(flash) timestamp from 0.
# when atc is on, server delivery rtmp stream by absolute time.
...
...
@@ -428,8 +424,16 @@ vhost play.srs.com {
# @see http://www.adobe.com/cn/devnet/adobe-media-server/articles/varnish-sample-for-failover.html
# @see http://www.baidu.com/#wd=hds%20hls%20atc
#
# @remark when atc is on, auto off the time_jitter
# default: off
atc
off
;
# whether use the interleaved/mixed algorithm to correct the timestamp.
# if on, always ensure the timestamp of audio+video is interleaved/mixed monotonically increase.
# if off, use time_jitter to correct the timestamp if required.
# @remark to use mix_correct, atc should on(or time_jitter should off).
# default: off
mix_correct
off
;
# whether enable the auto atc,
# if enabled, detect the bravo_atc="true" in onMetaData packet,
# set atc to on if matched.
...
...
@@ -464,9 +468,21 @@ vhost play.srs.com {
# vhost for time jitter
vhost
jitter
.
srs
.
com
{
# @see play.srs.com
# to use time_jitter full, the default config.
play
{
time_jitter
full
;
mix_correct
off
;
}
# to use mix_correct.
play
{
time_jitter
off
;
mix_correct
on
;
}
play
{
atc
on
;
mix_correct
on
;
}
# to use atc
play
{
atc
on
;
}
}
...
...
请
注册
或
登录
后发表评论