external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-12 19:31:53 +00:00
Code Issues Releases Wiki Activity

update readme and wiki url for http ts stream

Browse source
This commit is contained in:
winlin 2015-01-22 18:39:53 +08:00
parent 0702ad19b6
commit a647043a06
6 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -36,8 +36,8 @@ HLS(
[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_DeliveryHLS) [EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_DeliveryHLS)
), ),
HTTP( HTTP(
[CN](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_DeliveryHttpFlvStream) [EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_DeliveryHttpStream)
), ),
high-performance(10k+ clients)( high-performance(10k+ clients)(
[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Performance), [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). [274](https://github.com/winlinvip/simple-rtmp-server/issues/274).
1. Support rtmp remux to http flv/mp3/aac live stream, read 1. Support rtmp remux to http flv/mp3/aac live stream, read
[#293](https://github.com/winlinvip/simple-rtmp-server/issues/293)( [#293](https://github.com/winlinvip/simple-rtmp-server/issues/293)(
[CN](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_DeliveryHttpFlvStream) [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 <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). 1. [no-plan] Support RTMP 302 redirect [#92](https://github.com/winlinvip/simple-rtmp-server/issues/92).

17
trunk/conf/full.conf
View file

@ -379,26 +379,27 @@ vhost http.static.srs.com {
# vhost for http flv/aac/mp3 live stream for each vhost. # vhost for http flv/aac/mp3 live stream for each vhost.
vhost http.remux.srs.com { vhost http.remux.srs.com {
# http flv/mp3/aac stream vhost specified config # http flv/mp3/aac/ts stream vhost specified config
http_remux { http_remux {
# whether enable the http flv live streaming service for vhost. # whether enable the http live streaming service for vhost.
# default: off # default: off
enabled on; enabled on;
# the fast cache for audio stream(mp3/aac), # the fast cache for audio stream(mp3/aac),
# to cache more audio and send to client in a time to make android(weixin) happy. # 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. # @remark 0 to disable fast cache for http audio stream.
# default: 0 # default: 0
fast_cache 30; 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 # typical mount to [vhost]/[app]/[stream].flv
# the variables: # the variables:
# [vhost] current vhost for http flv live stream. # [vhost] current vhost for http live stream.
# [app] current app for http flv live stream. # [app] current app for http live stream.
# [stream] current stream for http flv live stream. # [stream] current stream for http live stream.
# @remark the [vhost] is optional, used to mount at specified vhost. # @remark the [vhost] is optional, used to mount at specified vhost.
# the extension: # the extension:
# .flv mount http live flv stream, use default gop cache. # .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. # .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. # .aac mount http live aac stream, ignore video and audio aac codec required.
# for example: # for example:
@ -411,6 +412,8 @@ vhost http.remux.srs.com {
# access by http://ossrs.net:8080/live/livestream.mp3 # access by http://ossrs.net:8080/live/livestream.mp3
# mount to [vhost]/[app]/[stream].aac # mount to [vhost]/[app]/[stream].aac
# access by http://ossrs.net:8080/live/livestream.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. # @remark the port of http is specified by http_server section.
# default: [vhost]/[app]/[stream].flv # default: [vhost]/[app]/[stream].flv
mount [vhost]/[app]/[stream].flv; mount [vhost]/[app]/[stream].flv;

2
trunk/conf/http.aac.live.conf
View file

@ -1,5 +1,5 @@
# the config for srs to remux rtmp to aac live stream. # 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. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/http.flv.live.conf
View file

@ -1,5 +1,5 @@
# the config for srs to remux rtmp to flv live stream. # 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. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/http.mp3.live.conf
View file

@ -1,5 +1,5 @@
# the config for srs to remux rtmp to mp3 live stream. # 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. # @see full.conf for detail config.
listen 1935; listen 1935;

17
trunk/conf/http.ts.live.conf Normal file
View file

@ -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;
}
}