From 44d4d8fbe66d1fea8d22326f6785bfd35e1f72b7 Mon Sep 17 00:00:00 2001 From: feixintianxia Date: Fri, 21 Jul 2023 17:32:05 +0800 Subject: [PATCH 1/6] Bugfix: repeate define _srs_rtc_manager --- trunk/src/app/srs_app_threads.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/trunk/src/app/srs_app_threads.cpp b/trunk/src/app/srs_app_threads.cpp index bbf2a40b74..b0b2f1d73b 100644 --- a/trunk/src/app/srs_app_threads.cpp +++ b/trunk/src/app/srs_app_threads.cpp @@ -64,7 +64,6 @@ extern SrsStageManager* _srs_stages; extern SrsRtcBlackhole* _srs_blackhole; extern SrsResourceManager* _srs_rtc_manager; -extern SrsResourceManager* _srs_rtc_manager; extern SrsDtlsCertificate* _srs_rtc_dtls_certificate; #endif From 0cf0456b7e9ab0cf853ca73224ac36f2575d892e Mon Sep 17 00:00:00 2001 From: feixintianxia Date: Tue, 25 Jul 2023 10:10:46 +0800 Subject: [PATCH 2/6] Bugfix: remove duplicated variable definitions --- trunk/src/app/srs_app_threads.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/trunk/src/app/srs_app_threads.cpp b/trunk/src/app/srs_app_threads.cpp index b0b2f1d73b..d1d14bfcec 100644 --- a/trunk/src/app/srs_app_threads.cpp +++ b/trunk/src/app/srs_app_threads.cpp @@ -69,10 +69,6 @@ extern SrsDtlsCertificate* _srs_rtc_dtls_certificate; #include -extern SrsPps* _srs_pps_snack2; -extern SrsPps* _srs_pps_snack3; -extern SrsPps* _srs_pps_snack4; - SrsPps* _srs_pps_aloss2 = NULL; extern SrsPps* _srs_pps_ids; From bf5859c843b9e7ffb49ae8348a67e2fa258dc898 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 24 Jul 2023 08:56:35 +0800 Subject: [PATCH 3/6] Switch stable version to SRS 5.0 --- trunk/src/core/srs_core.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 9aaa0ded83..03fbdf3f86 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -29,7 +29,7 @@ #define RTMP_SIG_SRS_DOMAIN "ossrs.net" // The current stable release. -#define VERSION_STABLE 4 +#define VERSION_STABLE 5 #define VERSION_STABLE_BRANCH SRS_XSTR(VERSION_STABLE) ".0release" // For platform specified headers and defines. From 7a50369059e2d1f153f1bd31b72a39c047ec8a90 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 26 Jul 2023 08:59:48 +0800 Subject: [PATCH 4/6] Refine CHANGELOG format. --- trunk/doc/CHANGELOG.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index e10aa0aae7..81e0ffdad8 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,7 +7,6 @@ The changelog for SRS. ## SRS 6.0 Changelog - * v6.0, 2023-07-21, Merge [#3695](https://github.com/ossrs/srs/pull/3695): API: Fix HTTPS callback issue using SNI in TLS client handshake. v6.0.61 (#3695) * v6.0, 2023-07-18, Merge [#3515](https://github.com/ossrs/srs/pull/3515): WebRTC: Support config the bitrate of transcoding AAC to Opus. v6.0.60 (#3515) * v6.0, 2023-07-09, Merge [#3615](https://github.com/ossrs/srs/pull/3615): Compile: Fix typo for 3rdparty. v6.0.59 (#3615) @@ -74,7 +73,6 @@ The changelog for SRS. ## SRS 5.0 Changelog - * v5.0, 2023-07-21, Merge [#3695](https://github.com/ossrs/srs/pull/3695): API: Fix HTTPS callback issue using SNI in TLS client handshake. v5.0.168 (#3695) * v5.0, 2023-07-18, Merge [#3515](https://github.com/ossrs/srs/pull/3515): WebRTC: Support config the bitrate of transcoding AAC to Opus. v5.0.167 (#3515) * v5.0, 2023-07-09, Merge [#3615](https://github.com/ossrs/srs/pull/3615): Compile: Fix typo for 3rdparty. v5.0.166 (#3615) @@ -233,7 +231,6 @@ The changelog for SRS. ## SRS 4.0 Changelog - * v4.0, 2023-07-21, Merge [#3695](https://github.com/ossrs/srs/pull/3695): API: Fix HTTPS callback issue using SNI in TLS client handshake. v4.0.270 (#3695) * v4.0, 2022-12-24, For [#296](https://github.com/ossrs/srs/issues/296): MP3: Fix bug for TS or HLS with mp3 codec. v4.0.269 * v4.0, 2022-11-22, Pick [#3079](https://github.com/ossrs/srs/issues/3079): WebRTC: Fix no audio and video issue for Firefox. v4.0.268 @@ -476,7 +473,6 @@ The changelog for SRS. ## SRS 3.0 Changelog - * v3.0, 2021-05-12, Fix [#2311](https://github.com/ossrs/srs/issues/2311), Copy the request for stat client. 3.0.162 * v3.0, 2021-04-28, [3.0 release5(3.0.161)](https://github.com/ossrs/srs/releases/tag/v3.0-r5) released. 122750 lines. * v3.0, 2021-04-28, Upgrade players. 3.0.161 @@ -681,7 +677,6 @@ The changelog for SRS. ## SRS 2.0 Changelog - * v2.0, 2020-01-25, [2.0 release8(2.0.272)](https://github.com/ossrs/srs/releases/tag/v2.0-r8) released. 87292 lines. * v2.0, 2020-01-08, Merge [#1554](https://github.com/ossrs/srs/issues/1554), support logrotate copytruncate. 2.0.272 * v2.0, 2020-01-05, Merge [#1551](https://github.com/ossrs/srs/issues/1551), fix memory leak in RTSP stack. 2.0.270 From 7fc479b3dfb57c4076e27b47eac97d97d8b25d5a Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 26 Jul 2023 18:14:59 +0800 Subject: [PATCH 5/6] Fix #3715: Support disable sanitizer. --- trunk/auto/options.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index e5028b58af..209abf95d3 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -70,7 +70,7 @@ SRS_LOG_LEVEL_V2=YES # Experts options. SRS_USE_SYS_SSL=NO # Use system ssl(-lssl) if required. SRS_VALGRIND=NO -SRS_SANITIZER=NO +SRS_SANITIZER=RESERVED SRS_SANITIZER_STATIC=NO SRS_SANITIZER_LOG=NO SRS_BUILD_TAG= # Set the object files tag name. @@ -521,7 +521,7 @@ function apply_auto_options() { # Enable asan, but disable for Centos # @see https://github.com/ossrs/srs/issues/3347 - if [[ $SRS_SANITIZER == NO && $OS_IS_CENTOS != YES ]]; then + if [[ $SRS_SANITIZER == RESERVED && $OS_IS_CENTOS != YES ]]; then echo "Enable asan by auto options." SRS_SANITIZER=YES fi @@ -594,6 +594,8 @@ function apply_detail_options() { if [[ $SRS_HTTP_API == NO ]]; then SRS_HTTP_API=YES; echo -e "${YELLOW}[WARN] Always enable HTTP API.${BLACK}"; fi if [[ $SRS_HLS == NO ]]; then SRS_HLS=YES; echo -e "${YELLOW}[WARN] Always enable HLS.${BLACK}"; fi if [[ $SRS_DVR == NO ]]; then SRS_DVR=YES; echo -e "${YELLOW}[WARN] Always enable DVR.${BLACK}"; fi + + if [[ $SRS_SANITIZER == RESERVED ]]; then SRS_SANITIZER == NO; fi } apply_detail_options From 05caf0cc542fcbc1c0ac5f5cf0eba6028c9b590c Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 26 Jul 2023 19:35:21 +0800 Subject: [PATCH 6/6] Update release to v5.0.169 v6.0.62 --- trunk/doc/CHANGELOG.md | 2 ++ trunk/src/core/srs_core_version5.hpp | 2 +- trunk/src/core/srs_core_version6.hpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 81e0ffdad8..723b12b1f8 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,6 +7,7 @@ The changelog for SRS. ## SRS 6.0 Changelog +* v6.0, 2023-07-26, Merge [#3699](https://github.com/ossrs/srs/pull/3699): Bugfix: Eliminate the redundant declaration of the _srs_rtc_manager variable.. v6.0.61 (#3699) * v6.0, 2023-07-21, Merge [#3695](https://github.com/ossrs/srs/pull/3695): API: Fix HTTPS callback issue using SNI in TLS client handshake. v6.0.61 (#3695) * v6.0, 2023-07-18, Merge [#3515](https://github.com/ossrs/srs/pull/3515): WebRTC: Support config the bitrate of transcoding AAC to Opus. v6.0.60 (#3515) * v6.0, 2023-07-09, Merge [#3615](https://github.com/ossrs/srs/pull/3615): Compile: Fix typo for 3rdparty. v6.0.59 (#3615) @@ -73,6 +74,7 @@ The changelog for SRS. ## SRS 5.0 Changelog +* v5.0, 2023-07-26, Merge [#3699](https://github.com/ossrs/srs/pull/3699): Bugfix: Eliminate the redundant declaration of the _srs_rtc_manager variable.. v5.0.168 (#3699) * v5.0, 2023-07-21, Merge [#3695](https://github.com/ossrs/srs/pull/3695): API: Fix HTTPS callback issue using SNI in TLS client handshake. v5.0.168 (#3695) * v5.0, 2023-07-18, Merge [#3515](https://github.com/ossrs/srs/pull/3515): WebRTC: Support config the bitrate of transcoding AAC to Opus. v5.0.167 (#3515) * v5.0, 2023-07-09, Merge [#3615](https://github.com/ossrs/srs/pull/3615): Compile: Fix typo for 3rdparty. v5.0.166 (#3615) diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp index 9085524754..8e8863f5a2 100644 --- a/trunk/src/core/srs_core_version5.hpp +++ b/trunk/src/core/srs_core_version5.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 0 -#define VERSION_REVISION 168 +#define VERSION_REVISION 169 #endif diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp index 1fd6d22523..e3b4192d53 100644 --- a/trunk/src/core/srs_core_version6.hpp +++ b/trunk/src/core/srs_core_version6.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 6 #define VERSION_MINOR 0 -#define VERSION_REVISION 61 +#define VERSION_REVISION 62 #endif