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

for #319, move time_jitter and mix_correct to play

Browse source
This commit is contained in:
winlin 2015-08-29 23:18:25 +08:00
parent 738642073e
commit d6b0aa3a5b
11 changed files with 171 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

28
trunk/conf/compatible.conf
View file

@ -42,4 +42,32 @@ vhost __defaultVhost__ {
enabled off;
latency 350;
}
# for SRS2
mode remote;
origin 127.0.0.1:1935 localhost:1935;
token_traverse off;
vhost same.edge.srs.com;
debug_srs_upnode off;
# for SRS2
forward 127.0.0.1:1936 127.0.0.1:1937;
# for SRS2
time_jitter full;
mix_correct off;
atc on;
atc_auto on;
min_latency on;
mw_latency 100;
gop_cache off;
queue_length 10;
send_min_interval 10.0;
reduce_sequence_header on;
}

56
trunk/conf/full.conf
View file

@ -979,7 +979,7 @@ vhost mrw.srs.com {
# @see publish.srs.com
publish {
mr off;
mr on;
mr_latenct 350;
}
}
@ -988,9 +988,6 @@ vhost mrw.srs.com {
vhost min.delay.com {
# @see vhost mrw.srs.com for detail.
min_latency on;
mr {
enabled off;
}
mw_latency 100;
# whether cache the last gop.
# if on, cache the last gop and dispatch to client,
@ -1010,15 +1007,17 @@ vhost min.delay.com {
# if on, set the nodelay of fd by setsockopt
# default: off
tcp_nodelay on;
# @see publish.srs.com
publish {
mr off;
}
}
# the vhost to control the stream delivery feature
vhost stream.control.com {
# @see vhost mrw.srs.com for detail.
min_latency on;
mr {
enabled off;
}
mw_latency 100;
# @see vhost min.delay.com
queue_length 10;
@ -1040,6 +1039,7 @@ vhost stream.control.com {
# @see publish.srs.com
publish {
mr off;
firstpkt_timeout 20000;
normal_timeout 7000;
}
@ -1086,24 +1086,36 @@ vhost chunksize.srs.com {
chunk_size 128;
}
# the play specified configs
vhost play.srs.com {
# for play client, both RTMP and other stream clients,
# for instance, the HTTP FLV stream clients.
play {
# about the stream monotonically increasing:
# 1. video timestamp is monotonically increasing,
# 2. audio timestamp is monotonically increasing,
# 3. video and audio timestamp is interleaved/mixed monotonically increasing.
# it's specified by RTMP specification, @see 3. Byte Order, Alignment, and Time Format
# however, some encoder cannot provides this feature, please set this to off to ignore time jitter.
# the time jitter algorithm:
# 1. full, to ensure stream start at zero, and ensure stream monotonically increasing.
# 2. zero, only ensure sttream start at zero, ignore timestamp jitter.
# 3. off, disable the time jitter algorithm, like atc.
# 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 time jitter
vhost jitter.srs.com {
# about the stream monotonically increasing:
# 1. video timestamp is monotonically increasing,
# 2. audio timestamp is monotonically increasing,
# 3. video and audio timestamp is interleaved/mixed monotonically increasing.
# it's specified by RTMP specification, @see 3. Byte Order, Alignment, and Time Format
# however, some encoder cannot provides this feature, please set this to off to ignore time jitter.
# the time jitter algorithm:
# 1. full, to ensure stream start at zero, and ensure stream monotonically increasing.
# 2. zero, only ensure sttream start at zero, ignore timestamp jitter.
# 3. off, disable the time jitter algorithm, like atc.
# default: full
# @see play.srs.com
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
# @see play.srs.com
mix_correct off;
}

56
trunk/conf/full.one.vhost.conf
View file

@ -48,30 +48,42 @@ vhost __defaultVhost__ {
vhost vhost.srs.com {
enabled off;
mode remote;
origin 127.0.0.1:1935 localhost:1935;
token_traverse off;
vhost same.edge.srs.com;
forward 127.0.0.1:1936 127.0.0.1:1937;
debug_srs_upnode off;
chunk_size 128;
time_jitter full;
mix_correct off;
atc on;
atc_auto on;
min_latency on;
mw_latency 100;
gop_cache off;
queue_length 10;
tcp_nodelay on;
send_min_interval 10.0;
reduce_sequence_header on;
# TODO
cluster {
mode remote;
origin 127.0.0.1:1935 localhost:1935;
token_traverse off;
vhost same.edge.srs.com;
debug_srs_upnode off;
}
# TODO
forward {
destination 127.0.0.1:1936 127.0.0.1:1937;
}
play {
time_jitter full;
mix_correct off;
# TODO
atc on;
atc_auto on;
min_latency on;
mw_latency 100;
gop_cache off;
queue_length 10;
send_min_interval 10.0;
reduce_sequence_header on;
}
publish {
mr off;

12
trunk/conf/realtime.conf
View file

@ -5,11 +5,15 @@
listen 1935;
max_connections 1000;
vhost __defaultVhost__ {
gop_cache off;
queue_length 10;
min_latency on;
mw_latency 100;
tcp_nodelay on;
play {
gop_cache off;
queue_length 10;
min_latency on;
mw_latency 100;
}
publish {
mr off;
}