From 34c73b6bec63dbe3c8920a09c9ac9ba1a066da4f Mon Sep 17 00:00:00 2001 From: winlin <winlin@vip.126.com> Date: Tue, 27 Jun 2017 08:15:39 +0800 Subject: [PATCH 1/3] Update README.md --- README.md | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index d11b4b236..c55f21af3 100755 --- a/README.md +++ b/README.md @@ -6,14 +6,13 @@ SRS/3.0, [OuXuli][release3]<br/> SRS是大娱乐直播领域广泛应用的野鸡服务器，志存高远不限于色情行业。<br/> -SRS is an industrial-strength live cluster, with simple code and best conceptual integrity. +SRS is an industrial-strength live streaming cluster, with the simplest code and the best conceptual integrity. Download from github.io: [Centos6-x86_64][centos0], [more...][more0]<br/> Download from ossrs.net: [Centos6-x86_64][centos1], [more...][more1]<br/> For the wiki for SRS/3.0, please read [Chinese][srs_CN] or [English][srs_EN]. -Although SRS is licenced under [MIT][LICENSE], but there are some depended libraries -which are distributed using their own licenses, please read [License Mixing][LicenseMixing]. +> Remark: SRS3 isn't released and it's really unstable, please use stable branches such as [SRS2](https://github.com/ossrs/srs/tree/2.0release) or [SRS1](https://github.com/ossrs/srs/tree/1.0release) instead. ## Content @@ -41,13 +40,13 @@ which are distributed using their own licenses, please read [License Mixing][Lic ## About -SRS(Simple RTMP Server) is created in 2013.10. -SRS supports many protocols includes RTMP, HLS, HTTP-FLV, HDS and MPEG-DASH. -SRS can run on both LINUX and OSX, and X86, X64, ARM and MIPS cpu. -Vhost is used as service unit for live cluster, which delivery stream by origin and edge. -The stream on origin can be transcoded, DVR to VOD file, ingest from external sources, or forwarded to other servers. -HTTP API and callback is powerful mechenism for integraty. -The wikis are writen by both English and Chinese. +SRS(Simple RTMP Server) is created in 2013.10 by winlin. +SRS supports the major internet live steraming protocols including RTMP, HLS, HTTP-FLV, HDS and MPEG-DASH. +User can run SRS on LINUX and OSX, with CPUs such as X86, X64, ARM and MIPS. +The cluster feature consists of origin and edge server, which uses vhost as the service unit seperating config for customers. +There're lots of useful features in origin server, including transcoding, DVR, ingesting and forwarding. +The ST coroutine, HTTP API and tracable log cost SRS effective for maintainability. +All wikis are writen in English and Chinese. Why SRS? @@ -68,6 +67,9 @@ follows RTMP/HLS/DASH/RTSP spec. and session based log, linux service script and install script. 1. <strong>MIT license:</strong> Open source with product management and evolution. +> Remark: Although SRS is licenced under [MIT][LICENSE], but there are some depended libraries +which are distributed using their own licenses, please read [License Mixing][LicenseMixing]. + Enjoy it! ## Product From f641f0617140e6576fae0810a497a22e411866fc Mon Sep 17 00:00:00 2001 From: winlin <winlin@vip.126.com> Date: Tue, 27 Jun 2017 08:19:48 +0800 Subject: [PATCH 2/3] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c55f21af3..b673ab4f0 100755 --- a/README.md +++ b/README.md @@ -8,11 +8,11 @@ SRS/3.0, [OuXuli][release3]<br/> SRS是大娱乐直播领域广泛应用的野鸡服务器，志存高远不限于色情行业。<br/> SRS is an industrial-strength live streaming cluster, with the simplest code and the best conceptual integrity. -Download from github.io: [Centos6-x86_64][centos0], [more...][more0]<br/> -Download from ossrs.net: [Centos6-x86_64][centos1], [more...][more1]<br/> -For the wiki for SRS/3.0, please read [Chinese][srs_CN] or [English][srs_EN]. +Download binaries from github.io: [Centos6-x86_64][centos0], [more...][more0]<br/> +Download binaries from ossrs.net: [Centos6-x86_64][centos1], [more...][more1]<br/> +About the wiki of SRS/3.0, please read [Chinese][srs_CN] or [English][srs_EN]. -> Remark: SRS3 isn't released and it's really unstable, please use stable branches such as [SRS2](https://github.com/ossrs/srs/tree/2.0release) or [SRS1](https://github.com/ossrs/srs/tree/1.0release) instead. +> Remark: SRS3 hasn't been released and it's really unstable, please use stable branches such as [SRS2](https://github.com/ossrs/srs/tree/2.0release) or [SRS1](https://github.com/ossrs/srs/tree/1.0release) instead, unless you can fix bugs and debug it. ## Content From 494879f6edcf1ef2f6ab2a360df066948e419009 Mon Sep 17 00:00:00 2001 From: winlin <winlin@vip.126.com> Date: Tue, 27 Jun 2017 08:26:02 +0800 Subject: [PATCH 3/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b673ab4f0..f303d0f6f 100755 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ SRS/3.0, [OuXuli][release3]<br/> SRS是大娱乐直播领域广泛应用的野鸡服务器，志存高远不限于色情行业。<br/> -SRS is an industrial-strength live streaming cluster, with the simplest code and the best conceptual integrity. +SRS's an industrial-strength live streaming cluster, with the simplest implementation and the best conceptual integrity. Download binaries from github.io: [Centos6-x86_64][centos0], [more...][more0]<br/> Download binaries from ossrs.net: [Centos6-x86_64][centos1], [more...][more1]<br/>