From 7e4647912a9a4a8086e7dfc925ad29913550cd09 Mon Sep 17 00:00:00 2001 From: Jacob Su Date: Mon, 4 Mar 2024 14:46:43 +0800 Subject: [PATCH 1/4] issue #3971: fix misspell coroutine. --- trunk/src/app/srs_app_st.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trunk/src/app/srs_app_st.hpp b/trunk/src/app/srs_app_st.hpp index 2f221f6e88..51282bca25 100644 --- a/trunk/src/app/srs_app_st.hpp +++ b/trunk/src/app/srs_app_st.hpp @@ -54,7 +54,7 @@ class ISrsCoroutineHandler virtual srs_error_t cycle() = 0; }; -// Start the object, generally a croutine. +// Start the object, generally a coroutine. class ISrsStartable { public: From e969a4b37c1f3552932b8475b62b543620f70cec Mon Sep 17 00:00:00 2001 From: Jacob Su Date: Wed, 6 Mar 2024 22:09:23 +0800 Subject: [PATCH 2/4] issue #3976: fix time unit problem. --- trunk/src/core/srs_core_time.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/src/core/srs_core_time.hpp b/trunk/src/core/srs_core_time.hpp index c10c7c9b1b..c0134032e1 100644 --- a/trunk/src/core/srs_core_time.hpp +++ b/trunk/src/core/srs_core_time.hpp @@ -25,12 +25,12 @@ typedef int64_t srs_utime_t; // Convert srs_utime_t as second. #define srsu2s(us) ((us) / SRS_UTIME_SECONDS) -#define srsu2si(us) ((us) / SRS_UTIME_SECONDS) +#define srsu2si(us) int((us) / SRS_UTIME_SECONDS) // Them time duration = end - start. return 0, if start or end is 0. srs_utime_t srs_duration(srs_utime_t start, srs_utime_t end); -// The time unit in ms, for example 120 * SRS_UTIME_SECONDS means 120s. +// The time unit in seconds, for example 120 * SRS_UTIME_SECONDS means 120s. #define SRS_UTIME_SECONDS 1000000LL // The time unit in minutes, for example 3 * SRS_UTIME_MINUTES means 3m. From ece23d6d9a05209f0581cc466d54b964a9a1af14 Mon Sep 17 00:00:00 2001 From: Jacob Su Date: Sat, 9 Mar 2024 18:20:12 +0800 Subject: [PATCH 3/4] issue #3982: fix setup cygwin action. --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ea5e3c1f4..ebde479763 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -55,11 +55,12 @@ jobs: # See https://github.com/cygwin/cygwin-install-action#parameters # Note that https://github.com/egor-tensin/setup-cygwin fails to install packages. - name: Setup Cygwin - uses: cygwin/cygwin-install-action@db475590d56881c6cef7b3f96f6f3dd9532ea1f4 # master + uses: cygwin/cygwin-install-action@006ad0b0946ca6d0a3ea2d4437677fa767392401 # master with: platform: x86_64 packages: bash make gcc-g++ cmake automake patch pkg-config tcl unzip install-dir: C:\cygwin64 + check-sig: false ################################################################################################################## - name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 From c94f5c4cbc909b238ff8177eeb445af2106b807f Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 18 Mar 2024 09:35:01 +0800 Subject: [PATCH 4/4] Update release to v6.0.114 --- trunk/doc/CHANGELOG.md | 1 + trunk/src/core/srs_core_version6.hpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 34e358167b..a8b15b585a 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, 2024-03-18, Merge [#3973](https://github.com/ossrs/srs/pull/3973): Typo: Fix some typo for #3973 #3976 #3982. v6.0.114 (#3973) * v6.0, 2024-02-06, Merge [#3920](https://github.com/ossrs/srs/pull/3920): WHIP: Fix bug for converting WHIP to RTMP/HLS. v6.0.113 (#3920) * v6.0, 2024-02-05, Merge [#3924](https://github.com/ossrs/srs/pull/3924): Upgrade hls.js and set in low latency mode. v6.0.112 (#3924) * v6.0, 2024-02-05, Merge [#3925](https://github.com/ossrs/srs/pull/3925): RTC: Fix video and audio track pt_ is not change in player before publisher. v6.0.111 (#3925) diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp index d19e4628a1..62a539cf2b 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 113 +#define VERSION_REVISION 114 #endif