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

for #133, update the wiki.

Browse source
This commit is contained in:
winlin 2015-03-01 21:08:44 +08:00
parent fb3fced8d0
commit 012c29e124
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -21,7 +21,7 @@ Download from ossrs.net:
RTSP/MPEGTS-over-UDP. RTSP/MPEGTS-over-UDP.
1. Popular internet delivery: RTMP for flash, HLS for mobile(IOS/IPad/MAC/Android), HTTP 1. Popular internet delivery: RTMP for flash, HLS for mobile(IOS/IPad/MAC/Android), HTTP
flv/ts/mp3/aac streaming for user prefered. flv/ts/mp3/aac streaming for user prefered.
1. Enhanced DVR: segment/session/append/api plan, customer path and HTTP callback. 1. Enhanced DVR: segment/session/append plan, customer path and HTTP callback.
1. Multiple feature: transcode, forward, ingest, http hooks, dvr, hls, rtsp, http streaming, 1. Multiple feature: transcode, forward, ingest, http hooks, dvr, hls, rtsp, http streaming,
http api, refer, log, bandwith test and srs-librtmp. http api, refer, log, bandwith test and srs-librtmp.
1. Best maintainess: simple arch over state-threads(coroutine), single thread, single process 1. Best maintainess: simple arch over state-threads(coroutine), single thread, single process

4
trunk/conf/full.conf
View file

@ -180,6 +180,8 @@ stream_caster {
caster rtsp; caster rtsp;
output rtmp://127.0.0.1/[app]/[stream]; output rtmp://127.0.0.1/[app]/[stream];
listen 554; listen 554;
rtp_port_min 57200;
rtp_port_max 57300;
} }
############################################################################################# #############################################################################################
@ -532,7 +534,6 @@ vhost with-hls.srs.com {
# the available audio codec: # the available audio codec:
# aac, mp3 # aac, mp3
# default: aac # default: aac
# TODO: FIXME: update wiki for it.
hls_acodec aac; hls_acodec aac;
# the default video codec of hls. # the default video codec of hls.
# when codec changed, write the PAT/PMT table, but maybe ok util next ts. # when codec changed, write the PAT/PMT table, but maybe ok util next ts.
@ -540,7 +541,6 @@ vhost with-hls.srs.com {
# the available video codec: # the available video codec:
# h264, vn # h264, vn
# default: h264 # default: h264
# TODO: FIXME: update wiki for it.
hls_vcodec h264; hls_vcodec h264;
} }
} }

15
trunk/conf/push.rtsp.conf Normal file
View file

@ -0,0 +1,15 @@
# push MPEG-TS over UDP to SRS.
# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_Streamer#push-mpeg-ts-over-udp
# @see https://github.com/winlinvip/simple-rtmp-server/issues/250#issuecomment-72321769
# @see full.conf for detail config.
listen 1935;
max_connections 1000;
stream_caster {
enabled on;
caster mpegts_over_udp;
output rtmp://127.0.0.1/live/livestream;
listen 1935;
}
vhost __defaultVhost__ {
}