diff --git a/README.md b/README.md index 6289691ad..493c25e3b 100755 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Download from ossrs.net: RTSP/MPEGTS-over-UDP. 1. Popular internet delivery: RTMP for flash, HLS for mobile(IOS/IPad/MAC/Android), HTTP 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, http api, refer, log, bandwith test and srs-librtmp. 1. Best maintainess: simple arch over state-threads(coroutine), single thread, single process diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index 76b7966c4..6aa7c6b56 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -180,6 +180,8 @@ stream_caster { caster rtsp; output rtmp://127.0.0.1/[app]/[stream]; listen 554; + rtp_port_min 57200; + rtp_port_max 57300; } ############################################################################################# @@ -532,7 +534,6 @@ vhost with-hls.srs.com { # the available audio codec: # aac, mp3 # default: aac - # TODO: FIXME: update wiki for it. hls_acodec aac; # the default video codec of hls. # 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: # h264, vn # default: h264 - # TODO: FIXME: update wiki for it. hls_vcodec h264; } } diff --git a/trunk/conf/push.rtsp.conf b/trunk/conf/push.rtsp.conf new file mode 100644 index 000000000..209b64e44 --- /dev/null +++ b/trunk/conf/push.rtsp.conf @@ -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__ { +}