From 768fe68ca3e16434b54fa3b0fdc69e004fe8dce3 Mon Sep 17 00:00:00 2001 From: RocFang Date: Mon, 8 Oct 2018 07:14:14 +0800 Subject: [PATCH 1/2] fix st_usleep param from us to ms. (#1236) fix st_usleep param from us to ms. --- trunk/src/app/srs_app_http_stream.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trunk/src/app/srs_app_http_stream.cpp b/trunk/src/app/srs_app_http_stream.cpp index edf0d8c563..53f21b1bc1 100755 --- a/trunk/src/app/srs_app_http_stream.cpp +++ b/trunk/src/app/srs_app_http_stream.cpp @@ -596,7 +596,7 @@ int SrsLiveStream::do_serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r) if (count <= 0) { srs_info("http: sleep %dms for no msg", SRS_CONSTS_RTMP_PULSE_TIMEOUT_US); // directly use sleep, donot use consumer wait. - st_usleep(mw_sleep); + st_usleep(mw_sleep * 1000); // ignore when nothing got. continue; From a5b452f9650350829aa20151551e9092537f9128 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 8 Oct 2018 07:16:07 +0800 Subject: [PATCH 2/2] Merge #1236, Fix sleep bug in us. 2.0.257 --- README.md | 2 ++ trunk/src/core/srs_core.hpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index cb25e4a4d2..d312d5bd54 100755 --- a/README.md +++ b/README.md @@ -334,6 +334,7 @@ Remark: ## History +* v2.0, 2018-10-08, Merge [#1236][bug #1236], Fix sleep bug in us. 2.0.257 * v2.0, 2018-10-08, Merge [#1237][bug #1237], Support param for transcoder. 2.0.256 * v2.0, 2018-08-12, [2.0 release4(2.0.255)][r2.0r4] released. 86915 lines. * v2.0, 2018-08-12, For [#1202][bug #1202], Support edge/forward to Aliyun CDN. 2.0.255 @@ -1329,6 +1330,7 @@ Winlin [bug #910]: https://github.com/ossrs/srs/issues/910 [bug #1202]: https://github.com/ossrs/srs/issues/1202 [bug #1237]: https://github.com/ossrs/srs/issues/1237 +[bug #1236]: https://github.com/ossrs/srs/issues/1236 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx [exo #828]: https://github.com/google/ExoPlayer/pull/828 diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 841780e184..c4083e310f 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 2 #define VERSION_MINOR 0 -#define VERSION_REVISION 256 +#define VERSION_REVISION 257 // generated by configure, only macros. #include