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

update master

Browse source
This commit is contained in:
wenjiegit 2014-01-02 18:23:27 +08:00
parent 6d2e1c95da
commit a91ffb1e11
2 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/conf/srs.19350.conf
View file

@ -1,6 +1,6 @@
listen 19350; listen 19350;
chunk_size 65000;
vhost __defaultVhost__ { vhost __defaultVhost__ {
chunk_size 65000;
enabled on; enabled on;
gop_cache on; gop_cache on;
hls { hls {

12
trunk/conf/srs.conf
View file

@ -14,18 +14,10 @@ log_dir ./objs/logs;
# if exceed the max connections, server will drop the new connection. # if exceed the max connections, server will drop the new connection.
# default: 2000 # default: 2000
max_connections 2000; max_connections 2000;
# the default chunk size is 128, max is 65536,
# some client does not support chunk size change,
# however, most clients supports it and it can improve
# performance about 10%.
# if not specified, set to 4096.
# priority of chunk size in vhost > priority of chunk size in global.
chunk_size 65000;
# vhost list, the __defaultVhost__ is the default vhost # vhost list, the __defaultVhost__ is the default vhost
# for example, user use ip to access the stream: rtmp://192.168.1.2/live/livestream. # for example, user use ip to access the stream: rtmp://192.168.1.2/live/livestream.
# for which cannot identify the required vhost. # for which cannot identify the required vhost.
vhost __defaultVhost__ { vhost __defaultVhost__ {
chunk_size 65000;
enabled on; enabled on;
gop_cache on; gop_cache on;
} }
@ -160,7 +152,6 @@ vhost players_pub_rtmp {
# for development # for development
vhost dev { vhost dev {
chunk_size 65000;
enabled on; enabled on;
gop_cache on; gop_cache on;
queue_length 10; queue_length 10;
@ -181,7 +172,7 @@ vhost dev {
on_stop http://127.0.0.1:8085/api/v1/sessions; on_stop http://127.0.0.1:8085/api/v1/sessions;
} }
transcode { transcode {
enabled on; enabled off;
ffmpeg ./objs/ffmpeg/bin/ffmpeg; ffmpeg ./objs/ffmpeg/bin/ffmpeg;
engine dev { engine dev {
enabled on; enabled on;
@ -844,3 +835,4 @@ pithy_print {
hls 3000; hls 3000;
} }