From a91ffb1e11cde33e78005c16f30a9c9f77179f6b Mon Sep 17 00:00:00 2001 From: wenjiegit Date: Thu, 2 Jan 2014 18:23:27 +0800 Subject: [PATCH] update master --- trunk/conf/srs.19350.conf | 2 +- trunk/conf/srs.conf | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/trunk/conf/srs.19350.conf b/trunk/conf/srs.19350.conf index 83ee20bbb..13d32fbba 100755 --- a/trunk/conf/srs.19350.conf +++ b/trunk/conf/srs.19350.conf @@ -1,6 +1,6 @@ listen 19350; +chunk_size 65000; vhost __defaultVhost__ { - chunk_size 65000; enabled on; gop_cache on; hls { diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf index 4375d4a92..6ae16e04c 100755 --- a/trunk/conf/srs.conf +++ b/trunk/conf/srs.conf @@ -14,18 +14,10 @@ log_dir ./objs/logs; # if exceed the max connections, server will drop the new connection. # default: 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 # for example, user use ip to access the stream: rtmp://192.168.1.2/live/livestream. # for which cannot identify the required vhost. vhost __defaultVhost__ { - chunk_size 65000; enabled on; gop_cache on; } @@ -160,7 +152,6 @@ vhost players_pub_rtmp { # for development vhost dev { - chunk_size 65000; enabled on; gop_cache on; queue_length 10; @@ -181,7 +172,7 @@ vhost dev { on_stop http://127.0.0.1:8085/api/v1/sessions; } transcode { - enabled on; + enabled off; ffmpeg ./objs/ffmpeg/bin/ffmpeg; engine dev { enabled on; @@ -844,3 +835,4 @@ pithy_print { hls 3000; } +