diff --git a/CHANGELOG.md b/CHANGELOG.md index f241ba78d..c9bea3681 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ The changelog for SRS. ## SRS 4.0 Changelog +* v4.0, 2021-08-07, Merge [#2514](https://github.com/ossrs/srs/pull/2514), Get original client ip instead of proxy ip, for rtc api #2514. 4.0.150 * v4.0, 2021-08-07, Fix [#2508](https://github.com/ossrs/srs/pull/2508), Support features query by API. 4.0.149 * v4.0, 2021-07-25, Fix build failed. 4.0.146 * v4.0, 2021-07-24, Merge [#2373](https://github.com/ossrs/srs/pull/2373), RTC: Fix NACK negotiation bug for Firefox. 4.0.145 diff --git a/README.md b/README.md index 784941fa1..9c9554ed8 100755 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ please set the CANDIDATE ([CN][v4_CN_WebRTC#config-candidate],[EN][v4_EN_WebRTC# ```bash docker run --rm -it -p 1935:1935 -p 1985:1985 -p 8080:8080 \ --env CANDIDATE=$(ifconfig en0 inet| grep 'inet '|awk '{print $2}') -p 8000:8000/udp \ - ossrs/srs:v4.0.139 ./objs/srs -c conf/srs.conf + ossrs/srs:4 ./objs/srs -c conf/srs.conf ``` @@ -219,6 +219,7 @@ Please read [CHANGELOG](CHANGELOG.md#changelog). ## Releases +* 2020-08-07, Release [v4.0.150](https://github.com/ossrs/srs/releases/tag/v4.0.150), 4.0 dev2, v4.0.150, 145289 lines. * 2020-07-25, Release [v4.0.146](https://github.com/ossrs/srs/releases/tag/v4.0.146), 4.0 dev1, v4.0.146, 144026 lines. * 2020-07-04, Release [v4.0.139](https://github.com/ossrs/srs/releases/tag/v4.0.139), 4.0 dev0, v4.0.139, 143245 lines. * 2020-06-27, [Release v3.0-r0][r3.0r0], 3.0 release0, 3.0.141, 122674 lines. diff --git a/trunk/3rdparty/signaling/README.md b/trunk/3rdparty/signaling/README.md index f20c724f9..b534457f0 100644 --- a/trunk/3rdparty/signaling/README.md +++ b/trunk/3rdparty/signaling/README.md @@ -9,7 +9,7 @@ WebRTC signaling for https://github.com/ossrs/srs ```bash docker run --rm --env CANDIDATE=$(ifconfig en0 inet| grep 'inet '|awk '{print $2}') \ -p 1935:1935 -p 8080:8080 -p 1985:1985 -p 8000:8000/udp \ - registry.cn-hangzhou.aliyuncs.com/ossrs/srs:v4.0.95 \ + registry.cn-hangzhou.aliyuncs.com/ossrs/srs:4 \ objs/srs -c conf/rtc.conf ``` diff --git a/trunk/3rdparty/srs-bench/README.md b/trunk/3rdparty/srs-bench/README.md index d45820cc8..9fb5ff9ca 100644 --- a/trunk/3rdparty/srs-bench/README.md +++ b/trunk/3rdparty/srs-bench/README.md @@ -105,7 +105,7 @@ ffmpeg -re -i doc/source.200kbps.768x320.flv -c copy -f flv -y rtmp://localhost/ if [[ ! -z $(ifconfig en0 inet| grep 'inet '|awk '{print $2}') ]]; then docker run -p 1935:1935 -p 8080:8080 -p 1985:1985 -p 8000:8000/udp \ --rm --env CANDIDATE=$(ifconfig en0 inet| grep 'inet '|awk '{print $2}')\ - registry.cn-hangzhou.aliyuncs.com/ossrs/srs:v4.0.76 objs/srs -c conf/rtc.conf + registry.cn-hangzhou.aliyuncs.com/ossrs/srs:4 objs/srs -c conf/rtc.conf fi ``` diff --git a/trunk/src/app/srs_app_latest_version.cpp b/trunk/src/app/srs_app_latest_version.cpp index 54a08aa8c..53576dfa8 100644 --- a/trunk/src/app/srs_app_latest_version.cpp +++ b/trunk/src/app/srs_app_latest_version.cpp @@ -58,13 +58,15 @@ void srs_build_features(stringstream& ss) SrsConfDirective* conf = root->at(i); if (!rtsp && conf->is_stream_caster() && _srs_config->get_stream_caster_enabled(conf)) { - if (_srs_config->get_stream_caster_engine(conf) == "rtsp") { + string engine = _srs_config->get_stream_caster_engine(conf); + if (engine == "rtsp") { rtsp = true; } } if (conf->is_vhost() && _srs_config->get_vhost_enabled(conf)) { nn_vhosts++; + if (!forward && _srs_config->get_forward_enabled(conf)) { forward = true; } @@ -96,14 +98,19 @@ void srs_build_features(stringstream& ss) security = true; } - for (int j = 0; j < (int)conf->directives.size(); j++) { + for (int j = 0; j < (int)conf->directives.size() && j < 64; j++) { SrsConfDirective* prop = conf->directives.at(j); + if (!ingest && prop->name == "ingest" && _srs_config->get_ingest_enabled(prop)) { ingest = true; } if (!transcode && prop->name == "transcode" && _srs_config->get_transcode_enabled(prop)) { transcode = true; } + + if (ingest && transcode) { + break; + } } } } diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index ecdec4892..e856ee24a 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 0 -#define VERSION_REVISION 149 +#define VERSION_REVISION 150 #endif