From 49daee34b4684a9f9aef26653112197489bb5f2e Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 26 Dec 2014 21:39:53 +0800 Subject: [PATCH 1/3] hotfix 1.0release, remove the multiple process arch, for 2.0 supports huge connections, and 3.0 will use other arch without st. --- README.md | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/README.md b/README.md index 32a11c87b..84fdbe742 100755 --- a/README.md +++ b/README.md @@ -722,41 +722,6 @@ Schema#2: SRS RTMP Edge server pull stream from origin (or upstream SRS RTMP Edge server), then delivery to Client. -### (plan) SRS Multiple processes Architecture(design by wenjie) - -
-                 +---------------+              +--------+
-                 | upnode server |              + client +
-                 +-------+-------+              +---+----+
-            -------------+------------network-------+---------
-                         |                          |
- +--------+         +----+-----------+         +----+----------+
- | master +--fork->-+ back source(1) +-->-pull-+ stream 1-N(2) +
- +---+----+         +----------------+         +-------+-------+
-     |                                                 |
-     +-------------------------------------fork--->-----+
-     |                           +-------------+
-     +-------------------fork-->-+ http/vod(3) |
-                                 +-------------+
-Remark:
-(1) back source process: create by master process, get stream from 
-    upnode server if edge, create stream if origin, serve the stream 
-    process.
-(2) stream process: create by master process, get stream from back
-    source process, serve the client.
-(3) the embeded mininum http server, also provides vod service. for
-    http server, it provides http api, hls(live/vod) delivery. for
-    vod server, it slice the file to hls(m3u8/ts).
-Remark:
-(a) This multiple processes architecture is design by wenjie, it's a
-    very simple and powerful multiple process architecture, for the
-    master no need to pass between stream process.
-(b) The CLI architecture is similar to this, instead, cli process
-    will collect informations from all stream process, master process
-    only send signals to child processes.
-(c) Maybe multiple thread is ok? By winlin.
-
- ### Bandwidth Test Workflow 

From 02ec7710300392260a55cbf712bd4c236d249c69 Mon Sep 17 00:00:00 2001
From: winlin 
Date: Fri, 26 Dec 2014 21:41:08 +0800
Subject: [PATCH 2/3] hotfix 1.0release, update the system requirements.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 84fdbe742..3e1e071cf 100755
--- a/README.md
+++ b/README.md
@@ -312,7 +312,7 @@ Donations:

 ## System Requirements
 Supported operating systems and hardware:
 * All Linux , both 32 and 64 bits
-* All hardware.
+* All hardware with x86/x86_64/arm/mips cpu.
 
 ## Summary
 1. 简洁稳定：Simple, also stable enough.

From 9a66d22f3b812115f305869649a3b5f1d296a18e Mon Sep 17 00:00:00 2001
From: winlin 
Date: Fri, 26 Dec 2014 21:43:00 +0800
Subject: [PATCH 3/3] hotfix 1.0release, 1.0.13

---
 trunk/src/core/srs_core.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp
index 253a15daf..0c29a7282 100644
--- a/trunk/src/core/srs_core.hpp
+++ b/trunk/src/core/srs_core.hpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 #define VERSION_MAJOR       1
 #define VERSION_MINOR       0
-#define VERSION_REVISION    12
+#define VERSION_REVISION    13
 // server info.
 #define RTMP_SIG_SRS_KEY "SRS"
 #define RTMP_SIG_SRS_ROLE "origin/edge server"