From ccc30c70c4b866ea017d9f83f8b7202994434f05 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 17 Feb 2015 21:01:44 +0800 Subject: [PATCH 1/5] the join maybe failed, should use a variable to ensure thread terminated. 1.0.28. --- README.md | 1 + trunk/src/app/srs_app_thread.cpp | 4 +++- trunk/src/core/srs_core.hpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6964e43ef..2f1bf6958 100755 --- a/README.md +++ b/README.md @@ -388,6 +388,7 @@ Supported operating systems and hardware: ## History +* v1.0, 2015-02-17, the join maybe failed, should use a variable to ensure thread terminated. 1.0.28. * v1.0, 2015-02-12, [1.0r2 release(1.0.27)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r2) released. 59507 lines. * v1.0, 2015-02-11, dev code HuKaiqun for 1.0.27. * v1.0, 2015-02-10, for [#310](https://github.com/winlinvip/simple-rtmp-server/issues/310), the aac profile must be object plus one. 1.0.26 diff --git a/trunk/src/app/srs_app_thread.cpp b/trunk/src/app/srs_app_thread.cpp index bc18333f0..4785d6987 100644 --- a/trunk/src/app/srs_app_thread.cpp +++ b/trunk/src/app/srs_app_thread.cpp @@ -120,7 +120,9 @@ void SrsThread::stop() st_thread_interrupt(tid); // wait the thread to exit. - st_thread_join(tid, NULL); + int ret = st_thread_join(tid, NULL); + // TODO: FIXME: the join maybe failed, should use a variable to ensure thread terminated. + srs_assert(ret == 0); tid = NULL; } diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 6109a6454..89e2f8071 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 27 +#define VERSION_REVISION 28 // server info. #define RTMP_SIG_SRS_KEY "SRS" From 6d64e38656ba7df416d8f3035109865ee8e82d40 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 10 Mar 2015 14:35:20 +0800 Subject: [PATCH 2/5] warning when join thread failed. 1.0.29 --- trunk/src/app/srs_app_thread.cpp | 4 +++- trunk/src/core/srs_core.hpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/trunk/src/app/srs_app_thread.cpp b/trunk/src/app/srs_app_thread.cpp index 4785d6987..99fc70028 100644 --- a/trunk/src/app/srs_app_thread.cpp +++ b/trunk/src/app/srs_app_thread.cpp @@ -122,7 +122,9 @@ void SrsThread::stop() // wait the thread to exit. int ret = st_thread_join(tid, NULL); // TODO: FIXME: the join maybe failed, should use a variable to ensure thread terminated. - srs_assert(ret == 0); + if (ret != 0) { + srs_warn("join thread failed. code=%d", ret); + } tid = NULL; } diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 89e2f8071..635781d20 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 28 +#define VERSION_REVISION 29 // server info. #define RTMP_SIG_SRS_KEY "SRS" From 5dbe8d5bd318979d5d9ba46463060b323f360f40 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 14 Mar 2015 22:12:56 +0800 Subject: [PATCH 3/5] add qq and weixin image. --- README.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2f1bf6958..d51729956 100755 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ SRS定位是运营级的互联网直播服务器集群，追求更好的概念 下载发布版(国内阿里云镜像): [Centos6-x86_64](http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-1.0.27.zip) 其他[more...](http://www.ossrs.net/srs.release/releases/)
-QQ群: 365936885, by wenjie
+腾讯QQ和微信：[Contact](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Contact)
同类产品：[BLS](https://github.com/wenjiegit/Bull-Live-Server)/[BLE](https://github.com/wenjiegit/Bull-Live-Encoder), [NGINX-RTMP](https://github.com/arut/nginx-rtmp-module), [CRTMPD](http://www.rtmpd.com/), [RED5](http://www.red5.org/), [WOWZA](http://www.wowza.com/), [FMS/AMS](http://www.adobe.com/products/adobe-media-server-standard.html) 获得源码(github): [https://github.com/winlinvip/simple-rtmp-server](https://github.com/winlinvip/simple-rtmp-server) [GIT使用方法](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Git) @@ -163,6 +163,16 @@ StreamServers：[BLS](https://github.com/wenjiegit/Bull-Live-Server)/[BLE](https [RED5](http://www.red5.org/), [WOWZA](http://www.wowza.com/), [FMS/AMS](http://www.adobe.com/products/adobe-media-server-standard.html) +## Contact + +![腾讯QQ群](http://winlinvip.github.io/srs.release/wiki/images/srs_qq_95.png) + +或者加入腾讯QQ群：365936885，你可以在QQ群获取大家实时的帮助。 + +![微信号](http://winlinvip.github.io/srs.release/wiki/images/srs_weixin_430.jpg) + +或者加微信号：srs-server，我会在公众号上发布最新的消息。 + ## AUTHORS There are three types of people that have contributed to the SRS project: From 13299ac03a9543da9bcc15721d6a9e74821b7d7d Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 15 Mar 2015 22:00:24 +0800 Subject: [PATCH 4/5] remove the contact from index. --- README.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/README.md b/README.md index d51729956..9bf6f4d92 100755 --- a/README.md +++ b/README.md @@ -163,16 +163,6 @@ StreamServers：[BLS](https://github.com/wenjiegit/Bull-Live-Server)/[BLE](https [RED5](http://www.red5.org/), [WOWZA](http://www.wowza.com/), [FMS/AMS](http://www.adobe.com/products/adobe-media-server-standard.html) -## Contact - -![腾讯QQ群](http://winlinvip.github.io/srs.release/wiki/images/srs_qq_95.png) - -或者加入腾讯QQ群：365936885，你可以在QQ群获取大家实时的帮助。 - -![微信号](http://winlinvip.github.io/srs.release/wiki/images/srs_weixin_430.jpg) - -或者加微信号：srs-server，我会在公众号上发布最新的消息。 - ## AUTHORS There are three types of people that have contributed to the SRS project: From c991c2c92c32b44addc8df07f8a6f2900cec0499 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 17 Mar 2015 21:00:28 +0800 Subject: [PATCH 5/5] remove osx support for 1.0.30 --- README.md | 1 + trunk/auto/depends.sh | 5 +++++ trunk/auto/options.sh | 2 -- trunk/src/core/srs_core.hpp | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9bf6f4d92..ff77ac112 100755 --- a/README.md +++ b/README.md @@ -388,6 +388,7 @@ Supported operating systems and hardware: ## History +* v1.0, 2015-03-17, remove the osx for 1.0.30. * v1.0, 2015-02-17, the join maybe failed, should use a variable to ensure thread terminated. 1.0.28. * v1.0, 2015-02-12, [1.0r2 release(1.0.27)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r2) released. 59507 lines. * v1.0, 2015-02-11, dev code HuKaiqun for 1.0.27. diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 05ccc196d..b5659d2da 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -299,6 +299,11 @@ function OSX_prepare() } OSX_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "OSX prepare failed, ret=$ret"; exit $ret; fi +# by winlin, disable other system. +if [[ $OS_IS_UBUNTU = NO && $OS_IS_CENTOS = NO && $SRS_EMBEDED_CPU = NO ]]; then + echo "only support Centos and Ubuntu, actual is `uname -s`" + exit 1 +fi ##################################################################################### # st-1.9 diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index 66d358edd..8110b5f3b 100644 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -161,7 +161,6 @@ Options: Presets: --x86-x64 [default] for x86/x64 cpu, common pc and servers. - --osx for IOS(darwin) to build SRS. --pi for raspberry-pi(directly build), open features hls/ssl/static. --cubie for cubieboard(directly build), open features except ffmpeg/nginx. --arm alias for --with-arm-ubuntu12, for ubuntu12, arm crossbuild @@ -252,7 +251,6 @@ function parse_user_option() { --log-trace) SRS_LOG_TRACE=YES ;; --x86-x64) SRS_X86_X64=YES ;; - --osx) SRS_OSX=YES ;; --arm) SRS_ARM_UBUNTU12=YES ;; --mips) SRS_MIPS_UBUNTU12=YES ;; --pi) SRS_PI=YES ;; diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 635781d20..10f705ee2 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 29 +#define VERSION_REVISION 30 // server info. #define RTMP_SIG_SRS_KEY "SRS"