胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
44962c91 1 parent 32cf44e5

update PRIMARY, AUTHORS, CONTRIBUTORS rule

内嵌 并排对比
正在显示 9 个修改的文件 包含 23 行增加 和 9 行删除
  1 +There are three types of people that have contributed to the SRS project:
  2 +1. PRIMARY: Contribute important features and >10% code. Names of all PRIMARY response in NetConnection.connect and metadata.
  3 +2. AUTHORS: Contribute features and 1%~10% code. Names of all PRIMARY response in NetConnection.connect and metadata.
  4 +3. CONTRIBUTORS: Submit patches, report bugs, add translations, help answer newbie questions, and generally make SRS that much better.
  5 +
1 PRIMARY ordered by first contribution. 6 PRIMARY ordered by first contribution.
2 * winlin<winlin@vip.126.com> "Plan, arch, implement SRS1.0 and SRS2.0" 7 * winlin<winlin@vip.126.com> "Plan, arch, implement SRS1.0 and SRS2.0"
3 8
@@ -1167,7 +1167,8 @@ void SrsConfig::print_help(char** argv) @@ -1167,7 +1167,8 @@ void SrsConfig::print_help(char** argv)
1167 printf( 1167 printf(
1168 RTMP_SIG_SRS_NAME" "RTMP_SIG_SRS_VERSION" "RTMP_SIG_SRS_COPYRIGHT"\n" 1168 RTMP_SIG_SRS_NAME" "RTMP_SIG_SRS_VERSION" "RTMP_SIG_SRS_COPYRIGHT"\n"
1169 "license: "RTMP_SIG_SRS_LICENSE"\n" 1169 "license: "RTMP_SIG_SRS_LICENSE"\n"
1170 - "Primary Authors: "RTMP_SIG_SRS_PRIMARY_AUTHROS"\n" 1170 + "Primary: "RTMP_SIG_SRS_PRIMARY"\n"
  1171 + "Authors: "RTMP_SIG_SRS_AUTHROS"\n"
1171 "Build: "SRS_AUTO_BUILD_DATE" Configuration:"SRS_AUTO_USER_CONFIGURE"\n" 1172 "Build: "SRS_AUTO_BUILD_DATE" Configuration:"SRS_AUTO_USER_CONFIGURE"\n"
1172 "Features:"SRS_AUTO_CONFIGURE"\n""\n" 1173 "Features:"SRS_AUTO_CONFIGURE"\n""\n"
1173 "Usage: %s [-h?vV] [[-t] -c <filename>]\n" 1174 "Usage: %s [-h?vV] [[-t] -c <filename>]\n"
@@ -230,7 +230,8 @@ int SrsEdgeIngester::connect_app(string ep_server, string ep_port) @@ -230,7 +230,8 @@ int SrsEdgeIngester::connect_app(string ep_server, string ep_port)
230 data->set("srs_site", SrsAmf0Any::str(RTMP_SIG_SRS_WEB)); 230 data->set("srs_site", SrsAmf0Any::str(RTMP_SIG_SRS_WEB));
231 data->set("srs_email", SrsAmf0Any::str(RTMP_SIG_SRS_EMAIL)); 231 data->set("srs_email", SrsAmf0Any::str(RTMP_SIG_SRS_EMAIL));
232 data->set("srs_copyright", SrsAmf0Any::str(RTMP_SIG_SRS_COPYRIGHT)); 232 data->set("srs_copyright", SrsAmf0Any::str(RTMP_SIG_SRS_COPYRIGHT));
233 - data->set("srs_primary_authors", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY_AUTHROS)); 233 + data->set("srs_primary", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY));
  234 + data->set("srs_authors", SrsAmf0Any::str(RTMP_SIG_SRS_AUTHROS));
234 // for edge to directly get the id of client. 235 // for edge to directly get the id of client.
235 data->set("srs_pid", SrsAmf0Any::number(getpid())); 236 data->set("srs_pid", SrsAmf0Any::number(getpid()));
236 data->set("srs_id", SrsAmf0Any::number(_srs_context->get_id())); 237 data->set("srs_id", SrsAmf0Any::number(_srs_context->get_id()));
@@ -661,7 +662,8 @@ int SrsEdgeForwarder::connect_app(string ep_server, string ep_port) @@ -661,7 +662,8 @@ int SrsEdgeForwarder::connect_app(string ep_server, string ep_port)
661 data->set("srs_site", SrsAmf0Any::str(RTMP_SIG_SRS_WEB)); 662 data->set("srs_site", SrsAmf0Any::str(RTMP_SIG_SRS_WEB));
662 data->set("srs_email", SrsAmf0Any::str(RTMP_SIG_SRS_EMAIL)); 663 data->set("srs_email", SrsAmf0Any::str(RTMP_SIG_SRS_EMAIL));
663 data->set("srs_copyright", SrsAmf0Any::str(RTMP_SIG_SRS_COPYRIGHT)); 664 data->set("srs_copyright", SrsAmf0Any::str(RTMP_SIG_SRS_COPYRIGHT));
664 - data->set("srs_primary_authors", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY_AUTHROS)); 665 + data->set("srs_primary", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY));
  666 + data->set("srs_authors", SrsAmf0Any::str(RTMP_SIG_SRS_AUTHROS));
665 // for edge to directly get the id of client. 667 // for edge to directly get the id of client.
666 data->set("srs_pid", SrsAmf0Any::number(getpid())); 668 data->set("srs_pid", SrsAmf0Any::number(getpid()));
667 data->set("srs_id", SrsAmf0Any::number(_srs_context->get_id())); 669 data->set("srs_id", SrsAmf0Any::number(_srs_context->get_id()));
@@ -344,7 +344,8 @@ int SrsForwarder::connect_app(string ep_server, string ep_port) @@ -344,7 +344,8 @@ int SrsForwarder::connect_app(string ep_server, string ep_port)
344 data->set("srs_site", SrsAmf0Any::str(RTMP_SIG_SRS_WEB)); 344 data->set("srs_site", SrsAmf0Any::str(RTMP_SIG_SRS_WEB));
345 data->set("srs_email", SrsAmf0Any::str(RTMP_SIG_SRS_EMAIL)); 345 data->set("srs_email", SrsAmf0Any::str(RTMP_SIG_SRS_EMAIL));
346 data->set("srs_copyright", SrsAmf0Any::str(RTMP_SIG_SRS_COPYRIGHT)); 346 data->set("srs_copyright", SrsAmf0Any::str(RTMP_SIG_SRS_COPYRIGHT));
347 - data->set("srs_primary_authors", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY_AUTHROS)); 347 + data->set("srs_primary", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY));
  348 + data->set("srs_authors", SrsAmf0Any::str(RTMP_SIG_SRS_AUTHROS));
348 // for edge to directly get the id of client. 349 // for edge to directly get the id of client.
349 data->set("srs_pid", SrsAmf0Any::number(getpid())); 350 data->set("srs_pid", SrsAmf0Any::number(getpid()));
350 data->set("srs_id", SrsAmf0Any::number(_srs_context->get_id())); 351 data->set("srs_id", SrsAmf0Any::number(_srs_context->get_id()));
@@ -490,7 +490,8 @@ int SrsApiAuthors::do_process_request(SrsStSocket* skt, SrsHttpMessage* req) @@ -490,7 +490,8 @@ int SrsApiAuthors::do_process_request(SrsStSocket* skt, SrsHttpMessage* req)
490 ss << __SRS_JOBJECT_START 490 ss << __SRS_JOBJECT_START
491 << __SRS_JFIELD_ERROR(ERROR_SUCCESS) << __SRS_JFIELD_CONT 491 << __SRS_JFIELD_ERROR(ERROR_SUCCESS) << __SRS_JFIELD_CONT
492 << __SRS_JFIELD_ORG("data", __SRS_JOBJECT_START) 492 << __SRS_JFIELD_ORG("data", __SRS_JOBJECT_START)
493 - << __SRS_JFIELD_STR("primary_authors", RTMP_SIG_SRS_PRIMARY_AUTHROS) << __SRS_JFIELD_CONT 493 + << __SRS_JFIELD_STR("primary", RTMP_SIG_SRS_PRIMARY) << __SRS_JFIELD_CONT
  494 + << __SRS_JFIELD_STR("authors", RTMP_SIG_SRS_AUTHROS) << __SRS_JFIELD_CONT
494 << __SRS_JFIELD_STR("contributors_link", RTMP_SIG_SRS_CONTRIBUTORS_URL) << __SRS_JFIELD_CONT 495 << __SRS_JFIELD_STR("contributors_link", RTMP_SIG_SRS_CONTRIBUTORS_URL) << __SRS_JFIELD_CONT
495 << __SRS_JFIELD_STR("contributors", SRS_AUTO_CONSTRIBUTORS) 496 << __SRS_JFIELD_STR("contributors", SRS_AUTO_CONSTRIBUTORS)
496 << __SRS_JOBJECT_END 497 << __SRS_JOBJECT_END
@@ -957,7 +957,8 @@ int SrsSource::on_meta_data(SrsMessage* msg, SrsOnMetaDataPacket* metadata) @@ -957,7 +957,8 @@ int SrsSource::on_meta_data(SrsMessage* msg, SrsOnMetaDataPacket* metadata)
957 957
958 // add server info to metadata 958 // add server info to metadata
959 metadata->metadata->set("server", SrsAmf0Any::str(RTMP_SIG_SRS_KEY" "RTMP_SIG_SRS_VERSION" ("RTMP_SIG_SRS_URL_SHORT")")); 959 metadata->metadata->set("server", SrsAmf0Any::str(RTMP_SIG_SRS_KEY" "RTMP_SIG_SRS_VERSION" ("RTMP_SIG_SRS_URL_SHORT")"));
960 - metadata->metadata->set("authors", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY_AUTHROS)); 960 + metadata->metadata->set("primary", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY));
  961 + metadata->metadata->set("authors", SrsAmf0Any::str(RTMP_SIG_SRS_AUTHROS));
961 962
962 // version, for example, 1.0.0 963 // version, for example, 1.0.0
963 // add version to metadata, please donot remove it, for debug. 964 // add version to metadata, please donot remove it, for debug.
@@ -42,7 +42,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -42,7 +42,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
42 #define RTMP_SIG_SRS_EMAIL "winlin@vip.126.com" 42 #define RTMP_SIG_SRS_EMAIL "winlin@vip.126.com"
43 #define RTMP_SIG_SRS_LICENSE "The MIT License (MIT)" 43 #define RTMP_SIG_SRS_LICENSE "The MIT License (MIT)"
44 #define RTMP_SIG_SRS_COPYRIGHT "Copyright (c) 2013-2014 winlin" 44 #define RTMP_SIG_SRS_COPYRIGHT "Copyright (c) 2013-2014 winlin"
45 -#define RTMP_SIG_SRS_PRIMARY_AUTHROS "winlin,wenjie.zhao" 45 +#define RTMP_SIG_SRS_PRIMARY "winlin"
  46 +#define RTMP_SIG_SRS_AUTHROS "wenjie.zhao"
46 #define RTMP_SIG_SRS_CONTRIBUTORS_URL RTMP_SIG_SRS_URL"/blob/master/AUTHORS.txt" 47 #define RTMP_SIG_SRS_CONTRIBUTORS_URL RTMP_SIG_SRS_URL"/blob/master/AUTHORS.txt"
47 #define RTMP_SIG_SRS_HANDSHAKE RTMP_SIG_SRS_KEY"("RTMP_SIG_SRS_VERSION")" 48 #define RTMP_SIG_SRS_HANDSHAKE RTMP_SIG_SRS_KEY"("RTMP_SIG_SRS_VERSION")"
48 #define RTMP_SIG_SRS_RELEASE "https://github.com/winlinvip/simple-rtmp-server/tree/1.0release" 49 #define RTMP_SIG_SRS_RELEASE "https://github.com/winlinvip/simple-rtmp-server/tree/1.0release"
@@ -182,7 +182,8 @@ int main(int argc, char** argv) @@ -182,7 +182,8 @@ int main(int argc, char** argv)
182 182
183 srs_trace("srs(simple-rtmp-server) "RTMP_SIG_SRS_VERSION); 183 srs_trace("srs(simple-rtmp-server) "RTMP_SIG_SRS_VERSION);
184 srs_trace("license: "RTMP_SIG_SRS_LICENSE); 184 srs_trace("license: "RTMP_SIG_SRS_LICENSE);
185 - srs_trace("authors: "RTMP_SIG_SRS_PRIMARY_AUTHROS); 185 + srs_trace("primary: "RTMP_SIG_SRS_PRIMARY);
  186 + srs_trace("authors: "RTMP_SIG_SRS_AUTHROS);
186 srs_trace("contributors: "SRS_AUTO_CONSTRIBUTORS); 187 srs_trace("contributors: "SRS_AUTO_CONSTRIBUTORS);
187 srs_trace("uname: "SRS_AUTO_UNAME); 188 srs_trace("uname: "SRS_AUTO_UNAME);
188 srs_trace("build: %s, %s", SRS_AUTO_BUILD_DATE, srs_is_little_endian()? "little-endian":"big-endian"); 189 srs_trace("build: %s, %s", SRS_AUTO_BUILD_DATE, srs_is_little_endian()? "little-endian":"big-endian");
@@ -908,7 +908,8 @@ int SrsRtmpServer::response_connect_app(SrsRequest *req, const char* server_ip) @@ -908,7 +908,8 @@ int SrsRtmpServer::response_connect_app(SrsRequest *req, const char* server_ip)
908 data->set("srs_site", SrsAmf0Any::str(RTMP_SIG_SRS_WEB)); 908 data->set("srs_site", SrsAmf0Any::str(RTMP_SIG_SRS_WEB));
909 data->set("srs_email", SrsAmf0Any::str(RTMP_SIG_SRS_EMAIL)); 909 data->set("srs_email", SrsAmf0Any::str(RTMP_SIG_SRS_EMAIL));
910 data->set("srs_copyright", SrsAmf0Any::str(RTMP_SIG_SRS_COPYRIGHT)); 910 data->set("srs_copyright", SrsAmf0Any::str(RTMP_SIG_SRS_COPYRIGHT));
911 - data->set("srs_primary_authors", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY_AUTHROS)); 911 + data->set("srs_primary", SrsAmf0Any::str(RTMP_SIG_SRS_PRIMARY));
  912 + data->set("srs_authors", SrsAmf0Any::str(RTMP_SIG_SRS_AUTHROS));
912 913
913 if (server_ip) { 914 if (server_ip) {
914 data->set("srs_server_ip", SrsAmf0Any::str(server_ip)); 915 data->set("srs_server_ip", SrsAmf0Any::str(server_ip));