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

support dvr. change to 0.9.69

Browse source
This commit is contained in:
winlin 2014-04-17 16:06:49 +08:00
parent 996d042a33
commit 73459547e1
13 changed files with 600 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/conf/demo.conf
View file

@ -113,14 +113,14 @@ vhost demo.srs.com {
}
}
ingest {
enable on;
enabled on;
input {
type file;
url ./doc/source.200kbps.768x320.flv;
}
ffmpeg ./objs/ffmpeg/bin/ffmpeg;
engine {
enable off;
enabled off;
output rtmp://127.0.0.1:[port]/live?vhost=[vhost]/livestream;
}
}
@ -158,14 +158,14 @@ vhost players {
}
}
ingest {
enable on;
enabled on;
input {
type file;
url ./doc/source.200kbps.768x320.flv;
}
ffmpeg ./objs/ffmpeg/bin/ffmpeg;
engine {
enable off;
enabled off;
output rtmp://127.0.0.1:[port]/live?vhost=[vhost]/demo;
}
}

36
trunk/conf/full.conf
View file

@ -91,15 +91,39 @@ http_stream {
vhost __defaultVhost__ {
}
# vhost for dvr
vhost dvr.srs.com {
# dvr RTMP stream to file,
# when encoder(FMLE/ffmpeg/flash) start to publish,
# start the dvr and record RTMP to file(flv).
# stop record when encoder stop to publish.
dvr {
# whether enabled dvr features
# default: off
enabled on;
# the dvr output path.
# the app dir is auto created under the dvr_path.
# for example, for rtmp stream:
# rtmp://127.0.0.1/live/livestream
# http://127.0.0.1/live/livestream.m3u8
# where dvr_path is /dvr, srs will create the following files:
# /dvr/live the app dir for all streams.
# /dvr/live/livestream.flv the dvr flv file.
# in a word, the dvr_path is for vhost.
# default: ./objs/nginx/html
dvr_path ./objs/nginx/html;
}
}
# vhost for ingest
vhost ingest.srs.com {
# ingest file/stream/device then push to SRS over RTMP.
# the name/id used to identify the ingest, must be unique in global.
# ingest id is used in reload or http api management.
ingest livestream {
# whether enable ingest features
# whether enabled ingest features
# default: off
enable on;
enabled on;
# input file/stream/device
# @remark only support one input.
input {
@ -121,7 +145,7 @@ vhost ingest.srs.com {
# @see enabled of transcode engine.
# if disabled or vcodec/acodec not specified, use copy.
# default: off.
enable off;
enabled off;
# output stream. variables:
# [vhost] current vhost which start the ingest.
# [port] system RTMP stream port.
@ -134,7 +158,7 @@ vhost ingest.srs.com {
vhost http.srs.com {
# http vhost specified config
http {
# whether enable the http streaming service for vhost.
# whether enabled the http streaming service for vhost.
# default: off
enabled on;
# the virtual directory root for this vhost to mount at
@ -743,7 +767,7 @@ vhost with-hls.srs.com {
# /hls/live/livestream-1.ts the HLS media/ts file.
# in a word, the hls_path is for vhost.
# default: ./objs/nginx/html
hls_path /data/nginx/html;
hls_path ./objs/nginx/html;
# the hls fragment in seconds, the duration of a piece of ts.
# default: 10
hls_fragment 10;
@ -766,7 +790,7 @@ vhost no-hls.srs.com {
vhost min.delay.com {
# whether cache the last gop.
# if on, cache the last gop and dispatch to client,
# to enable fast startup for client, client play immediately.
# to enabled fast startup for client, client play immediately.
# if off, send the latest media data to client,
# client need to wait for the next Iframe to decode and show the video.
# set to off if requires min delay;

4
trunk/conf/ingest.conf
View file

@ -5,14 +5,14 @@
listen 1935;
vhost __defaultVhost__ {
ingest livestream {
enable on;
enabled on;
input {
type file;
url ./doc/source.200kbps.768x320.flv;
}
ffmpeg ./objs/ffmpeg/bin/ffmpeg;
engine {
enable off;
enabled off;
output rtmp://127.0.0.1:[port]/live?vhost=[vhost]/livestream;
}
}