Merge branch 'srs.1.0release' into 1.0release

winlin
Commit 9426b834d11b36ef2946503278ed2ac9c29efb3f 9426b834 2 parents ad6e838d d672fae2
AUTHORS.txt
README.md
trunk/src/app/srs_app_config.cpp
trunk/src/app/srs_app_edge.cpp
trunk/src/app/srs_app_forward.cpp
trunk/src/app/srs_app_http_api.cpp
trunk/src/app/srs_app_source.cpp
trunk/src/core/srs_core.hpp
trunk/src/main/srs_main_server.cpp
trunk/src/rtmp/srs_protocol_rtmp.cpp
--- a/AUTHORS.txt 100755 → 100644
查看文件 @9426b83
+++ b/AUTHORS.txt 100755 → 100644
查看文件 @9426b83
-Authors ordered by first contribution.
+There are three types of people that have contributed to the SRS project:
+1. PRIMARY: Contribute important features and >10% code. Names of all PRIMARY response in NetConnection.connect and metadata.
+2. AUTHORS: Contribute features and 1%~10% code. Names of all PRIMARY response in NetConnection.connect and metadata.
+3. CONTRIBUTORS: Submit patches, report bugs, add translations, help answer newbie questions, and generally make SRS that much better.
-* winlin<winlin@vip.126.com>
-* wenjie.zhao<740936897@qq.com>
-* xiangcheng.liu<liuxc0116@foxmail.com>
-* naijia.liu<youngcow@youngcow.net>
-* alcoholyi<alcoholyi@qq.com>
-* byteman<wangchen2011@gmail.com>
-* chad.wang<chad.wang.cn@gmail.com>
-* suhetao<suhetao@gmail.com>
-* Johnny<fengjihu@163.com>
-* karthikeyan<keyanmca@gmail.com>
-* StevenLiu<lq@chinaffmpeg.org>
-* zhengfl<zhengfl_1989@126.com>
+PRIMARY ordered by first contribution.
+* winlin<winlin@vip.126.com> "Plan, arch, implement SRS1.0 and SRS2.0"
+
+AUTHORS ordered by first contribution.
+* wenjie.zhao<740936897@qq.com> "The bandwidth test module"
+
+CONTRIBUTORS ordered by first contribution.
+* xiangcheng.liu<liuxc0116@foxmail.com> "Bug fixed"
+* naijia.liu<youngcow@youngcow.net> "Performance benchmark"
+* alcoholyi<alcoholyi@qq.com> "Bug fixed"
+* byteman<wangchen2011@gmail.com> "Bug fixed"
+* chad.wang<chad.wang.cn@gmail.com> "Bug fixed"
+* suhetao<suhetao@gmail.com> "Bug fixed"
+* Johnny<fengjihu@163.com> "Create domain ossrs.net"
+* karthikeyan<keyanmca@gmail.com> "Bug fixed"
+* StevenLiu<lq@chinaffmpeg.org> "Build SRS on Darwin OSX"
+* zhengfl<zhengfl_1989@126.com> "Bug fixed"
--- a/README.md
查看文件 @9426b83
+++ b/README.md
查看文件 @9426b83
@@ -162,19 +162,17 @@ StreamServers：[BLS](https://github.com/wenjiegit/Bull-Live-Server)/[BLE](https
 [FMS/AMS](http://www.adobe.com/products/adobe-media-server-standard.html)
 ## AUTHORS
-The PRIMARY AUTHORS are (and/or have been)(Authors ordered by first contribution): 
-* winlin([winterserver](#)): [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin) 
-* wenjie([wenjiegit](https://github.com/wenjiegit/simple-rtmp-server)): [http://blog.chinaunix.net/uid/25006789.html](http://blog.chinaunix.net/uid/25006789.html) 
-About the primary AUTHORS: 
-* Contribute important features to SRS. 
-* Names of all PRIMARY AUTHORS response in NetConnection.connect and metadata. 
-* Names of all CONTRIBUTORS response in api/v1/authors.
+There are three types of people that have contributed to the SRS project:
+* PRIMARY: Contribute important features and >10% code. Names of all 
+PRIMARY response in NetConnection.connect and metadata. 
+* AUTHORS: Contribute features and 1%~10% code. Names of all 
+PRIMARY response in NetConnection.connect and metadata. 
+* CONTRIBUTORS: Submit patches, report bugs, add translations, help answer 
+newbie questions, and generally make SRS that much better.
-And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS --
-people who have submitted patches, reported bugs, added translations, helped
-answer newbie questions, and generally made SRS that much better: 
-[AUTHORS.txt](https://github.com/winlinvip/simple-rtmp-server/blob/master/AUTHORS.txt)
+About all PRIMARY, AUTHORS and CONTRIBUTORS, read 
+[AUTHORS.txt](https://github.com/winlinvip/simple-rtmp-server/blob/master/AUTHORS.txt).
 A big THANK YOU goes to:
 * [chnvideo](chnvideo.com) co-founders([wiseyoung](mailto:wiseyoung@chnvideo.com), [trueice](mailto:trueice@chnvideo.com), [leijian](mailto:leijian@chnvideo.com)) for [big supports](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Product#bigthanks).
@@ -374,6 +372,7 @@ Supported operating systems and hardware:
 * 2013-10-17, Created.<br/>
 ## History
+* v1.0, 2014-11-25, update PRIMARY, AUTHORS, CONTRIBUTORS of SRS. 1.0.8.
 * v1.0, 2014-11-18, all wiki translated to English. 1.0.7.
 * v1.0, 2014-11-13, hotfix [#200](https://github.com/winlinvip/simple-rtmp-server/issues/200), deadloop when read/write 0 and ETIME. 1.0.6.
 * v1.0, 2014-11-06, use number for macro VERSION_MAJOR, VERSION_MINOR and VERSION_REVISION. 1.0.5.
--- a/trunk/src/app/srs_app_config.cpp
查看文件 @9426b83
+++ b/trunk/src/app/srs_app_config.cpp
查看文件 @9426b83
@@ -1167,7 +1167,8 @@ void SrsConfig::print_help(char** argv)
     printf(
         RTMP_SIG_SRS_NAME" "RTMP_SIG_SRS_VERSION" "RTMP_SIG_SRS_COPYRIGHT"\n" 
         "license: "RTMP_SIG_SRS_LICENSE"\n"
-        "Primary Authors: "RTMP_SIG_SRS_PRIMARY_AUTHROS"\n"
+        "Primary: "RTMP_SIG_SRS_PRIMARY"\n"
+        "Authors: "RTMP_SIG_SRS_AUTHROS"\n"
         "Build: "SRS_AUTO_BUILD_DATE" Configuration:"SRS_AUTO_USER_CONFIGURE"\n"
         "Features:"SRS_AUTO_CONFIGURE"\n""\n"
         "Usage: %s [-h?vV] [[-t] -c <filename>]\n" 
--- a/trunk/src/app/srs_app_edge.cpp
查看文件 @9426b83
+++ b/trunk/src/app/srs_app_edge.cpp
查看文件 @9426b83
@@ -230,7 +230,8 @@ int SrsEdgeIngester::connect_app(string ep_server, string ep_port)
     data->set("srs_site", SrsAmf0Any::str(RTMP_SIG_SRS_WEB));
     data->set("srs_email", SrsAmf0Any::str(RTMP_SIG_SRS_EMAIL));
     data->set("srs_copyright", SrsAmf0Any::str(RTMP_SIG_SRS_COPYRIGHT));
-    data->set("srs_primary_authors", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY_AUTHROS));
+    data->set("srs_primary", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY));
+    data->set("srs_authors", SrsAmf0Any::str(RTMP_SIG_SRS_AUTHROS));
     // for edge to directly get the id of client.
     data->set("srs_pid", SrsAmf0Any::number(getpid()));
     data->set("srs_id", SrsAmf0Any::number(_srs_context->get_id()));
@@ -661,7 +662,8 @@ int SrsEdgeForwarder::connect_app(string ep_server, string ep_port)
     data->set("srs_site", SrsAmf0Any::str(RTMP_SIG_SRS_WEB));
     data->set("srs_email", SrsAmf0Any::str(RTMP_SIG_SRS_EMAIL));
     data->set("srs_copyright", SrsAmf0Any::str(RTMP_SIG_SRS_COPYRIGHT));
-    data->set("srs_primary_authors", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY_AUTHROS));
+    data->set("srs_primary", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY));
+    data->set("srs_authors", SrsAmf0Any::str(RTMP_SIG_SRS_AUTHROS));
     // for edge to directly get the id of client.
     data->set("srs_pid", SrsAmf0Any::number(getpid()));
     data->set("srs_id", SrsAmf0Any::number(_srs_context->get_id()));
--- a/trunk/src/app/srs_app_forward.cpp
查看文件 @9426b83
+++ b/trunk/src/app/srs_app_forward.cpp
查看文件 @9426b83
@@ -344,7 +344,8 @@ int SrsForwarder::connect_app(string ep_server, string ep_port)
     data->set("srs_site", SrsAmf0Any::str(RTMP_SIG_SRS_WEB));
     data->set("srs_email", SrsAmf0Any::str(RTMP_SIG_SRS_EMAIL));
     data->set("srs_copyright", SrsAmf0Any::str(RTMP_SIG_SRS_COPYRIGHT));
-    data->set("srs_primary_authors", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY_AUTHROS));
+    data->set("srs_primary", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY));
+    data->set("srs_authors", SrsAmf0Any::str(RTMP_SIG_SRS_AUTHROS));
     // for edge to directly get the id of client.
     data->set("srs_pid", SrsAmf0Any::number(getpid()));
     data->set("srs_id", SrsAmf0Any::number(_srs_context->get_id()));
--- a/trunk/src/app/srs_app_http_api.cpp
查看文件 @9426b83
+++ b/trunk/src/app/srs_app_http_api.cpp
查看文件 @9426b83
@@ -490,7 +490,8 @@ int SrsApiAuthors::do_process_request(SrsStSocket* skt, SrsHttpMessage* req)
     ss << __SRS_JOBJECT_START
         << __SRS_JFIELD_ERROR(ERROR_SUCCESS) << __SRS_JFIELD_CONT
         << __SRS_JFIELD_ORG("data", __SRS_JOBJECT_START)
-            << __SRS_JFIELD_STR("primary_authors", RTMP_SIG_SRS_PRIMARY_AUTHROS) << __SRS_JFIELD_CONT
+            << __SRS_JFIELD_STR("primary", RTMP_SIG_SRS_PRIMARY) << __SRS_JFIELD_CONT
+            << __SRS_JFIELD_STR("authors", RTMP_SIG_SRS_AUTHROS) << __SRS_JFIELD_CONT
             << __SRS_JFIELD_STR("contributors_link", RTMP_SIG_SRS_CONTRIBUTORS_URL) << __SRS_JFIELD_CONT
             << __SRS_JFIELD_STR("contributors", SRS_AUTO_CONSTRIBUTORS)
         << __SRS_JOBJECT_END
--- a/trunk/src/app/srs_app_source.cpp
查看文件 @9426b83
+++ b/trunk/src/app/srs_app_source.cpp
查看文件 @9426b83
@@ -957,7 +957,8 @@ int SrsSource::on_meta_data(SrsMessage* msg, SrsOnMetaDataPacket* metadata)
     // add server info to metadata
     metadata->metadata->set("server", SrsAmf0Any::str(RTMP_SIG_SRS_KEY" "RTMP_SIG_SRS_VERSION" ("RTMP_SIG_SRS_URL_SHORT")"));
-    metadata->metadata->set("authors", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY_AUTHROS));
+    metadata->metadata->set("primary", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY));
+    metadata->metadata->set("authors", SrsAmf0Any::str(RTMP_SIG_SRS_AUTHROS));
     // version, for example, 1.0.0
     // add version to metadata, please donot remove it, for debug.
--- a/trunk/src/core/srs_core.hpp
查看文件 @9426b83
+++ b/trunk/src/core/srs_core.hpp
查看文件 @9426b83
@@ -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    7
+#define VERSION_REVISION    8
 // server info.
 #define RTMP_SIG_SRS_KEY "SRS"
 #define RTMP_SIG_SRS_ROLE "origin/edge server"
@@ -42,7 +42,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define RTMP_SIG_SRS_EMAIL "winlin@vip.126.com"
 #define RTMP_SIG_SRS_LICENSE "The MIT License (MIT)"
 #define RTMP_SIG_SRS_COPYRIGHT "Copyright (c) 2013-2014 winlin"
-#define RTMP_SIG_SRS_PRIMARY_AUTHROS "winlin,wenjie.zhao"
+#define RTMP_SIG_SRS_PRIMARY "winlin"
+#define RTMP_SIG_SRS_AUTHROS "wenjie.zhao"
 #define RTMP_SIG_SRS_CONTRIBUTORS_URL RTMP_SIG_SRS_URL"/blob/master/AUTHORS.txt"
 #define RTMP_SIG_SRS_HANDSHAKE RTMP_SIG_SRS_KEY"("RTMP_SIG_SRS_VERSION")"
 #define RTMP_SIG_SRS_RELEASE "https://github.com/winlinvip/simple-rtmp-server/tree/1.0release"
--- a/trunk/src/main/srs_main_server.cpp
查看文件 @9426b83
+++ b/trunk/src/main/srs_main_server.cpp
查看文件 @9426b83
@@ -182,7 +182,8 @@ int main(int argc, char** argv)
     srs_trace("srs(simple-rtmp-server) "RTMP_SIG_SRS_VERSION);
     srs_trace("license: "RTMP_SIG_SRS_LICENSE);
-    srs_trace("authors: "RTMP_SIG_SRS_PRIMARY_AUTHROS);
+    srs_trace("primary: "RTMP_SIG_SRS_PRIMARY);
+    srs_trace("authors: "RTMP_SIG_SRS_AUTHROS);
     srs_trace("contributors: "SRS_AUTO_CONSTRIBUTORS);
     srs_trace("uname: "SRS_AUTO_UNAME);
     srs_trace("build: %s, %s", SRS_AUTO_BUILD_DATE, srs_is_little_endian()? "little-endian":"big-endian");
--- a/trunk/src/rtmp/srs_protocol_rtmp.cpp
查看文件 @9426b83
+++ b/trunk/src/rtmp/srs_protocol_rtmp.cpp
查看文件 @9426b83
@@ -908,7 +908,8 @@ int SrsRtmpServer::response_connect_app(SrsRequest *req, const char* server_ip)
     data->set("srs_site", SrsAmf0Any::str(RTMP_SIG_SRS_WEB));
     data->set("srs_email", SrsAmf0Any::str(RTMP_SIG_SRS_EMAIL));
     data->set("srs_copyright", SrsAmf0Any::str(RTMP_SIG_SRS_COPYRIGHT));
-    data->set("srs_primary_authors", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY_AUTHROS));
+    data->set("srs_primary", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY));
+    data->set("srs_authors", SrsAmf0Any::str(RTMP_SIG_SRS_AUTHROS));
     if (server_ip) {
         data->set("srs_server_ip", SrsAmf0Any::str(server_ip));