From 7571d70f16be77db09e6218b3236c2fb025db907 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 23 May 2015 19:32:27 +0800 Subject: [PATCH 1/3] fix the build failed bug. --- trunk/src/protocol/srs_http_stack.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/trunk/src/protocol/srs_http_stack.cpp b/trunk/src/protocol/srs_http_stack.cpp index 8ec6308cd..35818d1ea 100644 --- a/trunk/src/protocol/srs_http_stack.cpp +++ b/trunk/src/protocol/srs_http_stack.cpp @@ -25,6 +25,7 @@ #include #include +#include using namespace std; #include From 5840bc105335e7958cda68e8891c1467288be6c6 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 24 May 2015 08:41:29 +0800 Subject: [PATCH 2/3] add flv cluster confs. --- trunk/conf/http.flv.live.edge1.conf | 18 ++++++++++++++++++ trunk/conf/http.flv.live.edge2.conf | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 trunk/conf/http.flv.live.edge1.conf create mode 100644 trunk/conf/http.flv.live.edge2.conf diff --git a/trunk/conf/http.flv.live.edge1.conf b/trunk/conf/http.flv.live.edge1.conf new file mode 100644 index 000000000..8cd023d47 --- /dev/null +++ b/trunk/conf/http.flv.live.edge1.conf @@ -0,0 +1,18 @@ +listen 19351; +max_connections 1000; +pid objs/srs.flv.19351.pid; +srs_log_file objs/srs.flv.19351.log; +http_server { + enabled on; + listen 8081; + dir ./objs/nginx/html; +} +vhost __defaultVhost__ { + mode remote; + origin 127.0.0.1; + http_remux { + enabled on; + mount [vhost]/[app]/[stream].flv; + hstrs on; + } +} diff --git a/trunk/conf/http.flv.live.edge2.conf b/trunk/conf/http.flv.live.edge2.conf new file mode 100644 index 000000000..1948b4f15 --- /dev/null +++ b/trunk/conf/http.flv.live.edge2.conf @@ -0,0 +1,18 @@ +listen 19352; +max_connections 1000; +pid objs/srs.flv.19352.pid; +srs_log_file objs/srs.flv.19352.log; +http_server { + enabled on; + listen 8082; + dir ./objs/nginx/html; +} +vhost __defaultVhost__ { + mode remote; + origin 127.0.0.1; + http_remux { + enabled on; + mount [vhost]/[app]/[stream].flv; + hstrs on; + } +} From 94efe3f727db814e3ca39fab634e93bd14dab08f Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 24 May 2015 09:15:30 +0800 Subject: [PATCH 3/3] update wiki --- README.md | 3 +++ trunk/conf/http.flv.live.edge1.conf | 4 ++++ trunk/conf/http.flv.live.edge2.conf | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/README.md b/README.md index 0102515c4..43f1c504f 100755 --- a/README.md +++ b/README.md @@ -117,6 +117,7 @@ cd simple-rtmp-server/trunk See also: * Usage: How to delivery RTMP?([CN][v1_CN_SampleRTMP], [EN][v1_EN_SampleRTMP]) * Usage: How to delivery HTTP FLV Live Streaming?([CN][v2_CN_SampleHttpFlv], [EN][v2_EN_SampleHttpFlv]) +* Usage: How to delivery HTTP FLV Live Streaming Cluster?([CN][v2_CN_SampleHttpFlvCluster], [EN][v2_EN_SampleHttpFlvCluster]) * Usage: How to delivery HLS?([CN][v1_CN_SampleHLS], [EN][v1_EN_SampleHLS]) * Usage: How to delivery HLS for other codec?([CN][v1_CN_SampleTranscode2HLS], [EN][v1_EN_SampleTranscode2HLS]) * Usage: How to transode RTMP stream by SRS?([CN][v1_CN_SampleFFMPEG], [EN][v1_EN_SampleFFMPEG]) @@ -932,6 +933,8 @@ Winlin [v2_EN_Streamer2]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_Streamer#push-http-flv-to-srs [v2_CN_SampleHttpFlv]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleHttpFlv [v2_EN_SampleHttpFlv]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleHttpFlv +[v2_CN_SampleHttpFlvCluster]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleHttpFlvCluster +[v2_EN_SampleHttpFlvCluster]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleHttpFlvCluster [bug #213]: https://github.com/simple-rtmp-server/srs/issues/213 [bug #194]: https://github.com/simple-rtmp-server/srs/issues/194 diff --git a/trunk/conf/http.flv.live.edge1.conf b/trunk/conf/http.flv.live.edge1.conf index 8cd023d47..a9000d25f 100644 --- a/trunk/conf/http.flv.live.edge1.conf +++ b/trunk/conf/http.flv.live.edge1.conf @@ -1,3 +1,7 @@ +# the config for srs to remux rtmp to flv live stream. +# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHttpStream +# @see full.conf for detail config. + listen 19351; max_connections 1000; pid objs/srs.flv.19351.pid; diff --git a/trunk/conf/http.flv.live.edge2.conf b/trunk/conf/http.flv.live.edge2.conf index 1948b4f15..98c877b90 100644 --- a/trunk/conf/http.flv.live.edge2.conf +++ b/trunk/conf/http.flv.live.edge2.conf @@ -1,3 +1,7 @@ +# the config for srs to remux rtmp to flv live stream. +# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHttpStream +# @see full.conf for detail config. + listen 19352; max_connections 1000; pid objs/srs.flv.19352.pid;