wenjiegit

update master

1 listen 19350; 1 listen 19350;
  2 +chunk_size 65000;
2 vhost __defaultVhost__ { 3 vhost __defaultVhost__ {
3 - chunk_size 65000;  
4 enabled on; 4 enabled on;
5 gop_cache on; 5 gop_cache on;
6 hls { 6 hls {
@@ -14,18 +14,10 @@ log_dir ./objs/logs; @@ -14,18 +14,10 @@ log_dir ./objs/logs;
14 # if exceed the max connections, server will drop the new connection. 14 # if exceed the max connections, server will drop the new connection.
15 # default: 2000 15 # default: 2000
16 max_connections 2000; 16 max_connections 2000;
17 -# the default chunk size is 128, max is 65536,  
18 -# some client does not support chunk size change,  
19 -# however, most clients supports it and it can improve  
20 -# performance about 10%.  
21 -# if not specified, set to 4096.  
22 -# priority of chunk size in vhost > priority of chunk size in global.  
23 -chunk_size 65000;  
24 # vhost list, the __defaultVhost__ is the default vhost 17 # vhost list, the __defaultVhost__ is the default vhost
25 # for example, user use ip to access the stream: rtmp://192.168.1.2/live/livestream. 18 # for example, user use ip to access the stream: rtmp://192.168.1.2/live/livestream.
26 # for which cannot identify the required vhost. 19 # for which cannot identify the required vhost.
27 vhost __defaultVhost__ { 20 vhost __defaultVhost__ {
28 - chunk_size 65000;  
29 enabled on; 21 enabled on;
30 gop_cache on; 22 gop_cache on;
31 } 23 }
@@ -160,7 +152,6 @@ vhost players_pub_rtmp { @@ -160,7 +152,6 @@ vhost players_pub_rtmp {
160 152
161 # for development 153 # for development
162 vhost dev { 154 vhost dev {
163 - chunk_size 65000;  
164 enabled on; 155 enabled on;
165 gop_cache on; 156 gop_cache on;
166 queue_length 10; 157 queue_length 10;
@@ -181,7 +172,7 @@ vhost dev { @@ -181,7 +172,7 @@ vhost dev {
181 on_stop http://127.0.0.1:8085/api/v1/sessions; 172 on_stop http://127.0.0.1:8085/api/v1/sessions;
182 } 173 }
183 transcode { 174 transcode {
184 - enabled on; 175 + enabled off;
185 ffmpeg ./objs/ffmpeg/bin/ffmpeg; 176 ffmpeg ./objs/ffmpeg/bin/ffmpeg;
186 engine dev { 177 engine dev {
187 enabled on; 178 enabled on;
@@ -844,3 +835,4 @@ pithy_print { @@ -844,3 +835,4 @@ pithy_print {
844 hls 3000; 835 hls 3000;
845 } 836 }
846 837
  838 +