From a647043a069a74ff8f30103458054bfb49bf953c Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 22 Jan 2015 18:39:53 +0800 Subject: [PATCH] update readme and wiki url for http ts stream --- README.md | 8 ++++---- trunk/conf/full.conf | 17 ++++++++++------- trunk/conf/http.aac.live.conf | 2 +- trunk/conf/http.flv.live.conf | 2 +- trunk/conf/http.mp3.live.conf | 2 +- trunk/conf/http.ts.live.conf | 17 +++++++++++++++++ 6 files changed, 34 insertions(+), 14 deletions(-) create mode 100644 trunk/conf/http.ts.live.conf diff --git a/README.md b/README.md index 3594a958f..0b9fde569 100755 --- a/README.md +++ b/README.md @@ -36,8 +36,8 @@ HLS( [EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_DeliveryHLS) ), HTTP( -[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DeliveryHttpFlvStream), -[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DeliveryHttpFlvStream) +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DeliveryHttpStream), +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DeliveryHttpStream) ), high-performance(10k+ clients)( [CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Performance), @@ -481,8 +481,8 @@ Supported operating systems and hardware: [274](https://github.com/winlinvip/simple-rtmp-server/issues/274). 1. Support rtmp remux to http flv/mp3/aac live stream, read [#293](https://github.com/winlinvip/simple-rtmp-server/issues/293)( -[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DeliveryHttpFlvStream), -[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DeliveryHttpFlvStream) +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DeliveryHttpStream), +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DeliveryHttpStream) ). 1. [no-plan] Support <500ms latency, FRSC(Fast RTMP-compatible Stream Channel tech). 1. [no-plan] Support RTMP 302 redirect [#92](https://github.com/winlinvip/simple-rtmp-server/issues/92). diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index f3c65620b..6d0ebf9da 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -379,26 +379,27 @@ vhost http.static.srs.com { # vhost for http flv/aac/mp3 live stream for each vhost. vhost http.remux.srs.com { - # http flv/mp3/aac stream vhost specified config + # http flv/mp3/aac/ts stream vhost specified config http_remux { - # whether enable the http flv live streaming service for vhost. + # whether enable the http live streaming service for vhost. # default: off enabled on; # the fast cache for audio stream(mp3/aac), # to cache more audio and send to client in a time to make android(weixin) happy. - # @remark the flv stream ignore it + # @remark the flv/ts stream ignore it # @remark 0 to disable fast cache for http audio stream. # default: 0 fast_cache 30; - # the stream mout for rtmp to remux to flv live streaming. + # the stream mout for rtmp to remux to live streaming. # typical mount to [vhost]/[app]/[stream].flv # the variables: - # [vhost] current vhost for http flv live stream. - # [app] current app for http flv live stream. - # [stream] current stream for http flv live stream. + # [vhost] current vhost for http live stream. + # [app] current app for http live stream. + # [stream] current stream for http live stream. # @remark the [vhost] is optional, used to mount at specified vhost. # the extension: # .flv mount http live flv stream, use default gop cache. + # .ts mount http live ts stream, use default gop cache. # .mp3 mount http live mp3 stream, ignore video and audio mp3 codec required. # .aac mount http live aac stream, ignore video and audio aac codec required. # for example: @@ -411,6 +412,8 @@ vhost http.remux.srs.com { # access by http://ossrs.net:8080/live/livestream.mp3 # mount to [vhost]/[app]/[stream].aac # access by http://ossrs.net:8080/live/livestream.aac + # mount to [vhost]/[app]/[stream].ts + # access by http://ossrs.net:8080/live/livestream.ts # @remark the port of http is specified by http_server section. # default: [vhost]/[app]/[stream].flv mount [vhost]/[app]/[stream].flv; diff --git a/trunk/conf/http.aac.live.conf b/trunk/conf/http.aac.live.conf index 8e56208f5..8e4bddcaf 100644 --- a/trunk/conf/http.aac.live.conf +++ b/trunk/conf/http.aac.live.conf @@ -1,5 +1,5 @@ # the config for srs to remux rtmp to aac live stream. -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DeliveryHttpFlvStream +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DeliveryHttpStream # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/http.flv.live.conf b/trunk/conf/http.flv.live.conf index 1fd9585ff..cf1ec745e 100644 --- a/trunk/conf/http.flv.live.conf +++ b/trunk/conf/http.flv.live.conf @@ -1,5 +1,5 @@ # the config for srs to remux rtmp to flv live stream. -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DeliveryHttpFlvStream +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DeliveryHttpStream # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/http.mp3.live.conf b/trunk/conf/http.mp3.live.conf index 23b821990..f8965c8bf 100644 --- a/trunk/conf/http.mp3.live.conf +++ b/trunk/conf/http.mp3.live.conf @@ -1,5 +1,5 @@ # the config for srs to remux rtmp to mp3 live stream. -# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DeliveryHttpFlvStream +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DeliveryHttpStream # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/http.ts.live.conf b/trunk/conf/http.ts.live.conf new file mode 100644 index 000000000..f5349d9f1 --- /dev/null +++ b/trunk/conf/http.ts.live.conf @@ -0,0 +1,17 @@ +# the config for srs to remux rtmp to ts live stream. +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DeliveryHttpStream +# @see full.conf for detail config. + +listen 1935; +max_connections 1000; +http_server { + enabled on; + listen 8080; + dir ./objs/nginx/html; +} +vhost __defaultVhost__ { + http_remux { + enabled on; + mount [vhost]/[app]/[stream].ts; + } +}