diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE index a797cb02c..fa6f266ec 100644 --- a/.github/ISSUE_TEMPLATE +++ b/.github/ISSUE_TEMPLATE @@ -16,6 +16,10 @@ assignees: '' ``` xxxxxxxxxxxx ``` +1. SRS的配置如下(Config): +``` +xxxxxxxxxxxx +``` **重现(Replay)** diff --git a/README.md b/README.md index 04ba70062..f6aa614e9 100755 --- a/README.md +++ b/README.md @@ -153,12 +153,15 @@ For previous versions, please read: ## V4 changes +* v4.0, 2020-02-13, SRT supports detail config for [DynamicEncoding](https://github.com/runner365/srt_encoder). 4.0.4 * v4.0, 2020-02-04, Update project code. 4.0.3 * v4.0, 2020-01-26, Allow use libsrt.so for SRT is MPL license. 4.0.2 * v4.0, 2020-01-24, Fix [#1147][bug #1147], support SRT(Secure Reliable Transport). 4.0.1 ## V3 changes +* v3.0, 2020-02-14, [3.0 beta1(3.0.117)][r3.0b1] released. 121964 lines. +* v3.0, 2020-02-14, For [#1595][bug #1595], migrating streaming from ossrs.net to r.ossrs.net. 3.0.117 * v3.0, 2020-02-05, For [#665][bug #665], fix HTTP-FLV reloading bug. 3.0.116 * v3.0, 2020-02-05, For [#1592][bug #1592], fix terminal echo off by redirect process stdin. 3.0.115 * v3.0, 2020-02-04, For [#1186][bug #1186], refactor security check. 3.0.114 @@ -750,6 +753,7 @@ For previous versions, please read: ## Releases +* 2020-02-14, [Release v3.0-b1][r3.0b1], 3.0 beta1, 3.0.117, 121964 lines. * 2020-02-02, [Release v3.0-b0][r3.0b0], 3.0 beta0, 3.0.112, 121709 lines. * 2020-01-21, [Release v3.0-a9][r3.0a9], 3.0 alpha9, 3.0.105, 121577 lines. * 2020-01-10, [Release v3.0-a8][r3.0a8], 3.0 alpha8, 3.0.97, 121555 lines. @@ -1099,21 +1103,20 @@ Remark: There are two types of people that have contributed to the SRS project: -* AUTHORS: Contribute important features. Names of all authors responsed in NetConnection.connect and metadata. -* CONTRIBUTORS: Submit patches, report bugs, add translations, help answer newbie questions, and generally make SRS much better. +* Maintainers: Contribute important features. Names of all authors responsed in NetConnection.connect and metadata. +* [Contributors][authors]: Submit patches, report bugs, add translations, help answer newbie questions, and generally make SRS much better. -About all AUTHORS and CONTRIBUTORS, read [AUTHORS.txt][authors]. +Maintainers of SRS project: + +* Winlin: All areas of streaming server and documents. +* Wenjie: The focus of his work is on the [HDS](https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHDS) module. +* Runner365: The focus of his work is on the [SRT](https://github.com/simple-rtmp-server/srs/wiki/v4_CN_SRTWiki) module. A big THANK YOU goes to: * All friends of SRS for [big supports][bigthanks]. * Genes amd Mabbott for creating [st][st]([state-threads][st2]). -* Michael Talyanksy for introducing us to use st. -* Roman Arutyunyan for creating [nginx-rtmp][nginx-rtmp] for SRS to refer to. -* Joyent for creating [http-parser][http-parser] for http-api for SRS. -* Igor Sysoev for creating [nginx][nginx] for SRS to refer to. -* [FFMPEG][FFMPEG] and [libx264][libx264] group for SRS to use as transcoder. -* Guido van Rossum for creating Python for api-server for SRS. +* Michael Talyanksy for introducing ST to us. ## Mirrors @@ -1668,10 +1671,12 @@ Winlin [bug #1186]: https://github.com/ossrs/srs/issues/1186 [bug #1592]: https://github.com/ossrs/srs/issues/1592 [bug #665]: https://github.com/ossrs/srs/issues/665 +[bug #1595]: https://github.com/ossrs/srs/issues/1595 [bug #xxxxxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxxxxx [exo #828]: https://github.com/google/ExoPlayer/pull/828 +[r3.0b1]: https://github.com/ossrs/srs/releases/tag/v3.0-b1 [r3.0b0]: https://github.com/ossrs/srs/releases/tag/v3.0-b0 [r3.0a9]: https://github.com/ossrs/srs/releases/tag/v3.0-a9 [r3.0a8]: https://github.com/ossrs/srs/releases/tag/v3.0-a8 diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index 0348a9433..bbfce255f 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -262,6 +262,13 @@ srt_server { enabled on; # The UDP listen port for SRT. listen 10080; + # For detail parameters, please read wiki: + # https://github.com/ossrs/srs/wiki/v4_CN_SRTParams + # https://github.com/ossrs/srs/wiki/v4_EN_SRTParams + maxbw 1000000000; + connect_timeout 4000; + peerlatency 300; + recvlatency 300; } ############################################################################################# diff --git a/trunk/src/core/srs_core_version3.hpp b/trunk/src/core/srs_core_version3.hpp index 7b51a0991..c8793a0a8 100644 --- a/trunk/src/core/srs_core_version3.hpp +++ b/trunk/src/core/srs_core_version3.hpp @@ -24,6 +24,6 @@ #ifndef SRS_CORE_VERSION3_HPP #define SRS_CORE_VERSION3_HPP -#define SRS_VERSION3_REVISION 116 +#define SRS_VERSION3_REVISION 117 #endif diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index 747be972f..208807ee9 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -24,6 +24,6 @@ #ifndef SRS_CORE_VERSION4_HPP #define SRS_CORE_VERSION4_HPP -#define SRS_VERSION4_REVISION 3 +#define SRS_VERSION4_REVISION 4 #endif diff --git a/trunk/src/libs/srs_librtmp.hpp b/trunk/src/libs/srs_librtmp.hpp index 9184c1840..9f2044647 100644 --- a/trunk/src/libs/srs_librtmp.hpp +++ b/trunk/src/libs/srs_librtmp.hpp @@ -1105,6 +1105,7 @@ extern void srs_hijack_io_destroy(srs_hijack_io_t ctx); * create socket, not connect yet. * @param owner, the rtmp context which create this socket. * @return 0, success; otherswise, failed. + * TODO: FIXME: Incompatible API for https://github.com/ossrs/srs/blob/2.0release/trunk/src/libs/srs_librtmp.hpp#L989 */ extern int srs_hijack_io_create_socket(srs_hijack_io_t ctx, srs_rtmp_t owner); /** @@ -1156,6 +1157,7 @@ extern int srs_hijack_io_writev(srs_hijack_io_t ctx, const iovec *iov, int iov_s /** * whether the timeout is never timeout in ms. * @return 0, with timeout specified; otherwise, never timeout. + * TODO: FIXME: Incompatible API for https://github.com/ossrs/srs/blob/2.0release/trunk/src/libs/srs_librtmp.hpp#L1039 */ extern int srs_hijack_io_is_never_timeout(srs_hijack_io_t ctx, int64_t tm); /** diff --git a/trunk/src/srt/srt_to_rtmp.cpp b/trunk/src/srt/srt_to_rtmp.cpp index 729e3e970..13e83056d 100644 --- a/trunk/src/srt/srt_to_rtmp.cpp +++ b/trunk/src/srt/srt_to_rtmp.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -207,11 +208,22 @@ rtmp_client::rtmp_client(std::string key_path):_key_path(key_path) } char url_sz[128]; + std::vector ip_ports = _srs_config->get_listens(); + int port = 0; + std::string ip; + + for (auto item : ip_ports) { + srs_parse_endpoint(item, ip, port); + if (port != 0) { + break; + } + } + port = (port == 0) ? 1935 : port; if (_vhost == DEF_VHOST) { - sprintf(url_sz, "rtmp://127.0.0.1/%s/%s", + sprintf(url_sz, "rtmp://127.0.0.1:%d/%s/%s", port, _appname.c_str(), _streamname.c_str()); } else { - sprintf(url_sz, "rtmp://127.0.0.1/%s?vhost=%s/%s", + sprintf(url_sz, "rtmp://127.0.0.1:%d/%s?vhost=%s/%s", port, _appname.c_str(), _vhost.c_str(), _streamname.c_str()); }