external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

merge upstream

Browse source
This commit is contained in:
wenjiegit 2013-12-24 10:38:38 +08:00
commit 3753e8c5f1
47 changed files with 3285 additions and 1178 deletions
Download patch file Download diff file Expand all files Collapse all files

10
trunk/conf/srs.19350.conf
View file

@ -3,9 +3,11 @@ vhost __defaultVhost__ {
chunk_size 65000;
enabled on;
gop_cache on;
hls on;
hls_path ./objs/nginx/html/forward;
hls_fragment 5;
hls_window 30;
hls {
enabled on;
hls_path ./objs/nginx/html/forward;
hls_fragment 5;
hls_window 30;
}
}

61
trunk/conf/srs.conf
View file

@ -18,11 +18,18 @@ 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.
# for default demo.
vhost __defaultVhost__ {
chunk_size 65000;
enabled on;
gop_cache on;
}
# 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.
# for default demo.
vhost demo.srs.com {
enabled on;
gop_cache on;
queue_length 30;
forward 127.0.0.1:19350;
hls {
@ -32,7 +39,7 @@ vhost __defaultVhost__ {
hls_window 30;
}
http_hooks {
enabled off;
enabled on;
on_connect http://127.0.0.1:8085/api/v1/clients;
on_close http://127.0.0.1:8085/api/v1/clients;
on_publish http://127.0.0.1:8085/api/v1/streams;
@ -46,7 +53,7 @@ vhost __defaultVhost__ {
engine ld {
enabled on;
vfilter {
vf 'drawtext=text=SimpleRtmpServer(SRS):x=10:y=10:fontcolor=#cccccc:fontfile=./doc/FreeSerifBold.ttf';
vf 'drawtext=text=SimpleRtmpServer(SRS):x=10:y=10:fontsize=30:fontcolor=#cccccc:fontfile=./doc/FreeSerifBold.ttf';
}
vcodec libx264;
vbitrate 300;
@ -91,15 +98,57 @@ vhost __defaultVhost__ {
}
}
}
# for the players site, to play or publish.
# the flash player publisher need to transcode to support hls,
# we add players_hls vhost to support it.
vhost players {
enabled on;
gop_cache on;
transcode {
enabled on;
ffmpeg ./objs/ffmpeg/bin/ffmpeg;
engine hls {
enabled on;
vfilter {
vf 'drawtext=text=SRS(SimpleRtmpServer):x=10:y=10:fontcolor=#cccccc:fontfile=./doc/FreeSerifBold.ttf';
}
vcodec libx264;
vbitrate 300;
vfps 20;
vwidth 768;
vheight 320;
vthreads 1;
vprofile baseline;
vpreset superfast;
vparams {
}
acodec libaacplus;
abitrate 30;
asample_rate 44100;
achannels 2;
aparams {
}
output rtmp://127.0.0.1:[port]/[app]?vhost=players_pub/[stream];
}
}
}
vhost players_pub {
hls {
enabled on;
hls_path ./objs/nginx/html;
hls_fragment 5;
hls_window 30;
}
}
# for development
vhost dev {
chunk_size 65000;
enabled on;
gop_cache on;
queue_length 10;
forward 127.0.0.1:19350;
#forward 127.0.0.1:19350;
hls {
enabled on;
enabled off;
hls_path ./objs/nginx/html;
hls_fragment 5;
hls_window 30;
@ -587,7 +636,7 @@ vhost all.transcode.vhost.com {
vhost ffempty.transcode.vhost.com {
transcode {
enabled on;
ffmpeg ./research/ffempty/ffempty;
ffmpeg ./objs/research/ffempty;
engine empty {
enabled on;
vcodec libx264;