winlin

for #136, refine the conf for hls.

@@ -448,18 +448,6 @@ vhost with-hls.srs.com { @@ -448,18 +448,6 @@ vhost with-hls.srs.com {
448 # if off, donot write hls(ts and m3u8) when publish. 448 # if off, donot write hls(ts and m3u8) when publish.
449 # default: off 449 # default: off
450 enabled on; 450 enabled on;
451 - # the hls output path.  
452 - # the app dir is auto created under the hls_path.  
453 - # for example, for rtmp stream:  
454 - # rtmp://127.0.0.1/live/livestream  
455 - # http://127.0.0.1/live/livestream.m3u8  
456 - # where hls_path is /hls, srs will create the following files:  
457 - # /hls/live the app dir for all streams.  
458 - # /hls/live/livestream.m3u8 the HLS m3u8 file.  
459 - # /hls/live/livestream-1.ts the HLS media/ts file.  
460 - # in a word, the hls_path is for vhost.  
461 - # default: ./objs/nginx/html  
462 - hls_path ./objs/nginx/html;  
463 # the hls fragment in seconds, the duration of a piece of ts. 451 # the hls fragment in seconds, the duration of a piece of ts.
464 # default: 10 452 # default: 10
465 hls_fragment 10; 453 hls_fragment 10;
@@ -473,6 +461,18 @@ vhost with-hls.srs.com { @@ -473,6 +461,18 @@ vhost with-hls.srs.com {
473 # @see https://github.com/winlinvip/simple-rtmp-server/issues/264 461 # @see https://github.com/winlinvip/simple-rtmp-server/issues/264
474 # default: ignore 462 # default: ignore
475 hls_on_error ignore; 463 hls_on_error ignore;
  464 + # the hls output path.
  465 + # the app dir is auto created under the hls_path.
  466 + # for example, for rtmp stream:
  467 + # rtmp://127.0.0.1/live/livestream
  468 + # http://127.0.0.1/live/livestream.m3u8
  469 + # where hls_path is /hls, srs will create the following files:
  470 + # /hls/live the app dir for all streams.
  471 + # /hls/live/livestream.m3u8 the HLS m3u8 file.
  472 + # /hls/live/livestream-1.ts the HLS media/ts file.
  473 + # in a word, the hls_path is for vhost.
  474 + # default: ./objs/nginx/html
  475 + hls_path ./objs/nginx/html;
476 } 476 }
477 } 477 }
478 # the vhost with hls disabled. 478 # the vhost with hls disabled.
@@ -7,8 +7,8 @@ max_connections 1000; @@ -7,8 +7,8 @@ max_connections 1000;
7 vhost __defaultVhost__ { 7 vhost __defaultVhost__ {
8 hls { 8 hls {
9 enabled on; 9 enabled on;
10 - hls_path ./objs/nginx/html;  
11 hls_fragment 10; 10 hls_fragment 10;
12 hls_window 60; 11 hls_window 60;
  12 + hls_path ./objs/nginx/html;
13 } 13 }
14 } 14 }