winlin

update the conf of http static and stream.

@@ -350,11 +350,23 @@ vhost http.static.srs.com { @@ -350,11 +350,23 @@ vhost http.static.srs.com {
350 # whether enabled the http static service for vhost. 350 # whether enabled the http static service for vhost.
351 # default: off 351 # default: off
352 enabled on; 352 enabled on;
353 - # the virtual directory root for this vhost to mount at  
354 - # for example, if mount to [vhost]/hls, user access by http://[vhost]/hls 353 + # the url to mount to,
  354 + # typical mount to [vhost]/
355 # the variables: 355 # the variables:
356 # [vhost] current vhost for http server. 356 # [vhost] current vhost for http server.
  357 + # @remark the [vhost] is optional, used to mount at specified vhost.
357 # @remark the http of __defaultVhost__ will override the http_stream section. 358 # @remark the http of __defaultVhost__ will override the http_stream section.
  359 + # for example:
  360 + # mount to [vhost]/
  361 + # access by http://ossrs.net/xxx.html
  362 + # mount to [vhost]/hls
  363 + # access by http://ossrs.net/hls/xxx.html
  364 + # mount to /
  365 + # access by http://ossrs.net/xxx.html
  366 + # or by http://192.168.1.173/xxx.html
  367 + # mount to /hls
  368 + # access by http://ossrs.net/hls/xxx.html
  369 + # or by http://192.168.1.173/hls/xxx.html
358 # default: [vhost]/ 370 # default: [vhost]/
359 mount [vhost]/hls; 371 mount [vhost]/hls;
360 # main dir of vhost, 372 # main dir of vhost,
@@ -364,7 +376,7 @@ vhost http.static.srs.com { @@ -364,7 +376,7 @@ vhost http.static.srs.com {
364 } 376 }
365 } 377 }
366 378
367 -# vhost for http flv live stream for each vhost. 379 +# vhost for http flv/aac/mp3 live stream for each vhost.
368 vhost http.flv.srs.com { 380 vhost http.flv.srs.com {
369 # http flv stream vhost specified config 381 # http flv stream vhost specified config
370 http_flv { 382 http_flv {
@@ -377,15 +389,26 @@ vhost http.flv.srs.com { @@ -377,15 +389,26 @@ vhost http.flv.srs.com {
377 # default: 30 389 # default: 30
378 fast_cache 30; 390 fast_cache 30;
379 # the stream mout for rtmp to remux to flv live streaming. 391 # the stream mout for rtmp to remux to flv live streaming.
380 - # for example, if mount to [vhost]/[app]/[stream].flv, user access by http://[vhost]/[app]/[stream].flv 392 + # typical mount to [vhost]/[app]/[stream].flv
381 # the variables: 393 # the variables:
382 # [vhost] current vhost for http flv live stream. 394 # [vhost] current vhost for http flv live stream.
383 # [app] current app for http flv live stream. 395 # [app] current app for http flv live stream.
384 # [stream] current stream for http flv live stream. 396 # [stream] current stream for http flv live stream.
  397 + # @remark the [vhost] is optional, used to mount at specified vhost.
385 # the extension: 398 # the extension:
386 # .flv mount http live flv stream, use default gop cache. 399 # .flv mount http live flv stream, use default gop cache.
387 # .mp3 mount http live mp3 stream, ignore video and audio mp3 codec required. 400 # .mp3 mount http live mp3 stream, ignore video and audio mp3 codec required.
388 # .aac mount http live aac stream, ignore video and audio aac codec required. 401 # .aac mount http live aac stream, ignore video and audio aac codec required.
  402 + # for example:
  403 + # mount to [vhost]/[app]/[stream].flv
  404 + # access by http://ossrs.net/live/livestream.flv
  405 + # mount to /[app]/[stream].flv
  406 + # access by http://ossrs.net/live/livestream.flv
  407 + # or by http://192.168.1.173/live/livestream.flv
  408 + # mount to [vhost]/[app]/[stream].mp3
  409 + # access by http://ossrs.net/live/livestream.mp3
  410 + # mount to [vhost]/[app]/[stream].aac
  411 + # access by http://ossrs.net/live/livestream.aac
389 # default: [vhost]/[app]/[stream].flv 412 # default: [vhost]/[app]/[stream].flv
390 mount [vhost]/[app]/[stream].flv; 413 mount [vhost]/[app]/[stream].flv;
391 } 414 }