mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
merge from srs2. for #513.
This commit is contained in:
parent
f30b3073a2
commit
664844b5f5
16 changed files with 25 additions and 553 deletions
|
@ -963,12 +963,6 @@ vhost with-hls.srs.com {
|
|||
# @see https://github.com/ossrs/srs/issues/264
|
||||
# default: continue
|
||||
hls_on_error continue;
|
||||
# the hls storage: disk, ram or both.
|
||||
# disk, to write hls m3u8/ts to disk.
|
||||
# ram, serve m3u8/ts in memory, which use embedded http server to delivery.
|
||||
# both, disk and ram.
|
||||
# default: disk
|
||||
hls_storage disk;
|
||||
# the hls output path.
|
||||
# the m3u8 file is configured by hls_path/hls_m3u8_file, the default is:
|
||||
# ./objs/nginx/html/[app]/[stream].m3u8
|
||||
|
@ -1017,13 +1011,6 @@ vhost with-hls.srs.com {
|
|||
# ...
|
||||
# optional, default to empty string.
|
||||
hls_entry_prefix http://your-server;
|
||||
# the hls mount for hls_storage ram,
|
||||
# which use srs embedded http server to delivery HLS,
|
||||
# where the mount specifies the HTTP url to mount.
|
||||
# @see the mount of http_remux.
|
||||
# @remark the hls_mount must endswith .m3u8.
|
||||
# default: [vhost]/[app]/[stream].m3u8
|
||||
hls_mount [vhost]/[app]/[stream].m3u8;
|
||||
# the default audio codec of hls.
|
||||
# when codec changed, write the PAT/PMT table, but maybe ok util next ts.
|
||||
# so user can set the default codec for mp3.
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
# the config for srs to delivery hls
|
||||
# @see https://github.com/ossrs/srs/wiki/v1_CN_SampleHLS
|
||||
# @see full.conf for detail config.
|
||||
|
||||
listen 1935;
|
||||
max_connections 1000;
|
||||
http_server {
|
||||
enabled on;
|
||||
listen 8080;
|
||||
dir ./objs/nginx/html;
|
||||
}
|
||||
vhost __defaultVhost__ {
|
||||
hls {
|
||||
enabled on;
|
||||
hls_fragment 10;
|
||||
hls_window 60;
|
||||
hls_storage ram;
|
||||
hls_mount /[app]/[stream].m3u8;
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue