Merge

README.md

@@ -75,14 +75,14 @@ Other important wiki:
 The [TOC(Technical Oversight Committee)](trunk/AUTHORS.md#toc) and [contributors](trunk/AUTHORS.md#contributors):
 
 * [Winlin](https://github.com/winlinvip): Focus on [issues/PR](https://github.com/ossrs/srs/issues) and tests now.
-* [Wenjie](https://github.com/wenjiegit): Focus on [HDS](https://github.com/simple-rtmp-server/srs/wiki/v4_CN_DeliveryHDS) module.
+* [ZhaoWenjie](https://github.com/wenjiegit): Focus on [HDS](https://github.com/simple-rtmp-server/srs/wiki/v4_CN_DeliveryHDS) module.
-* [Runner365](https://github.com/runner365): Focus on [SRT](https://github.com/simple-rtmp-server/srs/wiki/v4_CN_SRTWiki) module.
+* [ShiWei](https://github.com/runner365): Focus on [SRT](https://github.com/simple-rtmp-server/srs/wiki/v4_CN_SRTWiki) module.
-* [HongdaXiao](https://github.com/xiaozhihong): Focus on [WebRTC](https://github.com/simple-rtmp-server/srs/wiki/v4_CN_WebRTC) module.
+* [XiaoZhihong](https://github.com/xiaozhihong): Focus on [WebRTC](https://github.com/simple-rtmp-server/srs/wiki/v4_CN_WebRTC) module.
-* [Bepartofyou](https://github.com/Bepartofyou): Focus on [WebRTC](https://github.com/simple-rtmp-server/srs/wiki/v4_CN_WebRTC) module.
+* [WuPengqiang](https://github.com/Bepartofyou): Focus on [WebRTC](https://github.com/simple-rtmp-server/srs/wiki/v4_CN_WebRTC) module.
 * [XiaLixin](https://github.com/xialixin): Focus on [GB28181](https://github.com/ossrs/srs/issues/1500) module.
 * [LiPeng](https://github.com/lipeng19811218): Focus on [WebRTC](https://github.com/simple-rtmp-server/srs/wiki/v4_CN_WebRTC) module.
 * [ChenGuanghua](https://github.com/chen-guanghua): Focus on [WebRTC](https://github.com/simple-rtmp-server/srs/wiki/v4_CN_WebRTC) module.
-* [HaiboChen](https://github.com/duiniuluantanqin): Focus on [GB28181](https://github.com/ossrs/srs/issues/1500) and [API](https://github.com/ossrs/srs/issues/1657) module.
+* [ChenHaibo](https://github.com/duiniuluantanqin): Focus on [GB28181](https://github.com/ossrs/srs/issues/1500) and [API](https://github.com/ossrs/srs/issues/1657) module.
 
 A big `THANK YOU` also goes to:
 

trunk/AUTHORS.md

@@ -2,25 +2,26 @@
 
 The TOC(Technical Oversight Committee):
 
-- `winlinvip<winlin@vip.126.com>`
+- `Winlin<winlin@vip.126.com>`
-- `wenjiegit<zhaowenjie@tal.com>`
+- `ZhaoWenjie<zhaowenjie@tal.com>`
-- `xialixin<xialixin@kanzhun.com>`
+- `ShiWei<shiwei05@kuaishou.com>`
-- `runner365<shiwei05@kuaishou.com>`
+- `XiaoZhihong<hondaxiao@tencent.com>`
-- `xiaozhihong<hondaxiao@tencent.com>`
+- `WuPengqiang<pengqiang.wpq@alibaba-inc.com>`
-- `Bepartofyou<pengqiang.wpq@alibaba-inc.com>`
+- `XiaLixin<xialixin@kanzhun.com>`
-- `chen-guanghua<jinxue.cgh@alibaba-inc.com>`
+- `LiPeng<mozhan.lp@alibaba-inc.com>`
-- `lipeng19811218<mozhan.lp@alibaba-inc.com>`
+- `ChenGuanghua<jinxue.cgh@alibaba-inc.com>`
+- `ChenHaibo<nmgchenhaibo@foxmail.com>`
 
 ## CONTRIBUTORS
 
 CONTRIBUTORS ordered by first contribution.
 
-* `winlinvip<winlin@vip.126.com>`
+* `Winlin<winlin@vip.126.com>`
-* `winlinvip<winterserver@126.com>`
+* `Winlin<winterserver@126.com>`
-* `winlinvip<chengli.ycl@alibaba-inc.com>`
+* `Winlin<chengli.ycl@alibaba-inc.com>`
-* `wenjiegit<zhaowenjie@tal.com>`
+* `ZhaoWenjie<zhaowenjie@tal.com>`
-* `wenjiegit<740936897@qq.com>`
+* `ZhaoWenjie<740936897@qq.com>`
-* `wenjiegit<wenjie.zhao@chinacache.com>`
+* `ZhaoWenjie<wenjie.zhao@chinacache.com>`
 * `xiangcheng.liu<liuxc0116@foxmail.com>`
 * `naijia.liu<youngcow@youngcow.net>`
 * `alcoholyi<alcoholyi@qq.com>`
@@ -69,33 +70,34 @@ CONTRIBUTORS ordered by first contribution.
 * `qiang.li<qiang.li@verycdn.com.cn>`
 * `HungMingWu<u9089000@gmail.com>`
 * `Himer<xishizhaohua@qq.com>`
-* `xialixin<xialixin@kanzhun.com>`
+* `XiaLixin<xialixin@kanzhun.com>`
-* `xialixin<68469352@qq.com>`
+* `XiaLixin<68469352@qq.com>`
-* `xialixin<xlx0625@163.com>`
+* `XiaLixin<xlx0625@163.com>`
-* `xialixin<xialx@yuntongxun.com>`
+* `XiaLixin<xialx@yuntongxun.com>`
 * `alphonsetai<tyh_123@163.com>`
 * `Michael.Ma<wnpllr@gmail.com>`
 * `lam2003<linmin3@yy.com>`
-* `runner365<shiwei05@kuaishou.com>`
+* `ShiWei<shiwei05@kuaishou.com>`
-* `runner365<shi.weibd@hotmail.com>`
+* `ShiWei<shi.weibd@hotmail.com>`
 * `XiaofengWang<wasphin@gmail.com>`
-* `xiaozhihong<hondaxiao@tencent.com>`
+* `XiaoZhihong<hondaxiao@tencent.com>`
-* `xiaozhihong<xiaozhihong8@gmail.com>`
+* `XiaoZhihong<xiaozhihong8@gmail.com>`
-* `xiaozhihong<xiaozhihong@huya.com>`
+* `XiaoZhihong<xiaozhihong@huya.com>`
 * `yanghuiwen<cainiaodj@qq.com>`
-* `Bepartofyou<309554135@qq.com>`
+* `WuPengqiang<309554135@qq.com>`
-* `Bepartofyou<pengqiang.wpq@alibaba-inc.com>`
+* `WuPengqiang<pengqiang.wpq@alibaba-inc.com>`
 * `l<22312935+lam2003@users.noreply.github.com>`
 * `xfalcon<x-falcon@users.noreply.github.com>`
-* `chen-guanghua<jinxue.cgh@alibaba-inc.com>`
+* `ChenGuanghua<jinxue.cgh@alibaba-inc.com>`
-* `chen-guanghua<chengh_math@126.com>`
+* `ChenGuanghua<chengh_math@126.com>`
-* `lipeng19811218<mozhan.lp@alibaba-inc.com>`
+* `LiPeng<mozhan.lp@alibaba-inc.com>`
-* `lipeng19811218<lipeng19811218@gmail.com>`
+* `LiPeng<lipeng19811218@gmail.com>`
 * `yajun18<yajun18@staff.sina.com.cn>`
 * `liulichuan<liulichuan@kuaishou.com>`
 * `yapingcat<caoyapingneu@163.com>`
 * `chenchengbin<chenchengbin@yy.com>`
-* `duiniuluantanqin<nmgchenhaibo@foxmail.com>`
+* `ChenHaibo<495810242@qq.com>`
+* `ChenHaibo<nmgchenhaibo@foxmail.com>`
 * `jasongwq<jasongwq@gmail.com>`
 * `yinjiaoyuan<yinjiaoyuan@163.com>`
 * `PieerePi<pihuibin@hotmail.com>`
@@ -107,4 +109,6 @@ CONTRIBUTORS ordered by first contribution.
 * `stone<bluestn@163.com>`
 * `cfw11<34058899+cfw11@users.noreply.github.com>`
 * `Hung-YiChen<gaod.chen@gmail.com>`
-* `long<liyalong12345@126.com>`
+* `long<liyalong12345@126.com>`
+* `matthew1838<77285055+matthew1838@users.noreply.github.com>`
+* `rise<rise.worlds@outlook.com>`

trunk/scripts/new_authors.sh

@@ -12,5 +12,5 @@ for author in $authors; do
   username=$(echo $author |awk -F '@' '{print $1}')
   grep $username $AFILE 1>/dev/null 2>/dev/null && continue;
 
-  git log -1 --author="$author" --format='%an<%ae>'| sed 's/ //g'
+  echo "* $(git log -1 --author="$author" --format='`%an<%ae>`'| sed 's/ //g')"
 done

trunk/src/app/srs_app_config.cpp

@@ -3526,7 +3526,7 @@ srs_error_t SrsConfig::parse_argv(int& i, char** argv)
 void SrsConfig::print_help(char** argv)
 {
     printf(
-           "%s, %s, %s, created by %s\n\n"
+           "%s, %s, %s, created by %sand %s\n\n"
            "Usage: %s <-h?vVgG>|<[-t] -c filename>\n"
            "Options:\n"
            "   -?, -h              : Show this help and exit 0.\n"
@@ -3539,7 +3539,7 @@ void SrsConfig::print_help(char** argv)
            "   %s -t -c %s\n"
            "   %s -c %s\n",
            RTMP_SIG_SRS_SERVER, RTMP_SIG_SRS_URL, RTMP_SIG_SRS_LICENSE,
-           RTMP_SIG_SRS_AUTHORS,
+           RTMP_SIG_SRS_AUTHORS, SRS_CONSTRIBUTORS,
            argv[0], argv[0], argv[0], SRS_CONF_DEFAULT_COFNIG_FILE,
            argv[0], SRS_CONF_DEFAULT_COFNIG_FILE);
 }

trunk/src/main/srs_main_server.cpp

@@ -119,8 +119,7 @@ srs_error_t do_main(int argc, char** argv)
     
     // config already applied to log.
     srs_trace2(TAG_MAIN, "%s, %s", RTMP_SIG_SRS_SERVER, RTMP_SIG_SRS_LICENSE);
-    srs_trace("authors: %s", RTMP_SIG_SRS_AUTHORS);
+    srs_trace("authors: %sand %s", RTMP_SIG_SRS_AUTHORS, SRS_CONSTRIBUTORS);
-    srs_trace("contributors: %s", SRS_CONSTRIBUTORS);
     srs_trace("cwd=%s, work_dir=%s, build: %s, configure: %s, uname: %s, osx: %d",
         _srs_config->cwd().c_str(), cwd.c_str(), SRS_BUILD_DATE, SRS_USER_CONFIGURE, SRS_UNAME, SRS_OSX_BOOL);
     srs_trace("configure detail: " SRS_CONFIGURE);