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 gop_cache and queue_length to play

Browse source
This commit is contained in:
winlin 2015-08-30 07:26:55 +08:00
parent 06ae74dd3f
commit f7c893d907
10 changed files with 105 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

16
trunk/conf/compatible.conf
View file

@ -28,7 +28,7 @@ vhost __defaultVhost__ {
dir ./objs/nginx/html/hls;
}
# for SRS2.
# for SRS1.
refer github.com github.io;
refer_publish github.com github.io;
refer_play github.com github.io;
@ -43,7 +43,7 @@ vhost __defaultVhost__ {
latency 350;
}
# for SRS2
# for SRS1
mode remote;
origin 127.0.0.1:1935 localhost:1935;
@ -52,21 +52,27 @@ vhost __defaultVhost__ {
debug_srs_upnode off;
# for SRS2
# for SRS1
forward 127.0.0.1:1936 127.0.0.1:1937;
# for SRS2
# for SRS1
time_jitter full;
# for SRS2
mix_correct off;
#for SRS1
atc on;
atc_auto on;
# for SRS2
mw_latency 100;
# for SRS1
gop_cache off;
queue_length 10;
# for SRS2
send_min_interval 10.0;
reduce_sequence_header on;
}

35
trunk/conf/full.conf
View file

@ -378,6 +378,21 @@ vhost play.srs.com {
# for play client, both RTMP and other stream clients,
# for instance, the HTTP FLV stream clients.
play {
# whether cache the last gop.
# if on, cache the last gop and dispatch to client,
# to enabled fast startup for client, client play immediately.
# if off, send the latest media data to client,
# client need to wait for the next Iframe to decode and show the video.
# set to off if requires min delay;
# set to on if requires client fast startup.
# default: on
gop_cache off;
# the max live queue length in seconds.
# if the messages in the queue exceed the max length,
# drop the old whole gop.
# default: 30
queue_length 10;
# about the stream monotonically increasing:
# 1. video timestamp is monotonically increasing,
# 2. audio timestamp is monotonically increasing,
@ -466,24 +481,11 @@ vhost min.delay.com {
# @see scope.vhost.srs.com
tcp_nodelay on;
# whether cache the last gop.
# if on, cache the last gop and dispatch to client,
# to enabled fast startup for client, client play immediately.
# if off, send the latest media data to client,
# client need to wait for the next Iframe to decode and show the video.
# set to off if requires min delay;
# set to on if requires client fast startup.
# default: on
gop_cache off;
# the max live queue length in seconds.
# if the messages in the queue exceed the max length,
# drop the old whole gop.
# default: 30
queue_length 10;
# @see play.srs.com
play {
mw_latency 100;
gop_cache off;
queue_length 10;
}
# @see publish.srs.com
@ -499,8 +501,6 @@ vhost stream.control.com {
# @see scope.vhost.srs.com
tcp_nodelay on;
# @see vhost min.delay.com
queue_length 10;
# the minimal packets send interval in ms,
# used to control the ndiff of stream by srs_rtmp_dump,
# for example, some device can only accept some stream which
@ -519,6 +519,7 @@ vhost stream.control.com {
# @see play.srs.com
play {
mw_latency 100;
queue_length 10;
}
# @see publish.srs.com

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

@ -76,10 +76,10 @@ vhost vhost.srs.com {
mw_latency 100;
# TODO
gop_cache off;
queue_length 10;
# TODO
send_min_interval 10.0;
reduce_sequence_header on;
}