diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index e74a1e73e..cfb8df414 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,6 +7,7 @@ The changelog for SRS. ## SRS 5.0 Changelog +* v5.0, 2023-09-28, Merge [#3816](https://github.com/ossrs/srs/pull/3816): cherry-pick from develop, for srt utest. v5.0.185 (#3816) * v5.0, 2023-09-21, Merge [#3806](https://github.com/ossrs/srs/pull/3806): Build: Support sys-ssl for srt. v5.0.184 (#3806) * v5.0, 2023-09-21, Merge [#3808](https://github.com/ossrs/srs/pull/3808): Upgrade libsrt to v1.5.3. v5.0.183 (#3808) * v5.0, 2023-09-21, Merge [#3404](https://github.com/ossrs/srs/pull/3404): WebRTC: Support WHEP for play. v5.0.182 (#3404) diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index 92386d8e5..e0e9dd1c0 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -7893,7 +7893,7 @@ unsigned short SrsConfig::get_srt_listen_port() return (unsigned short)atoi(conf->arg0().c_str()); } -int SrsConfig::get_srto_maxbw() +int64_t SrsConfig::get_srto_maxbw() { SRS_OVERWRITE_BY_ENV_INT("srs.srt_server.maxbw"); // SRS_SRT_SERVER_MAXBW @@ -7907,7 +7907,7 @@ int SrsConfig::get_srto_maxbw() if (!conf || conf->arg0().empty()) { return DEFAULT; } - return atoi(conf->arg0().c_str()); + return atoll(conf->arg0().c_str()); } int SrsConfig::get_srto_mss() diff --git a/trunk/src/app/srs_app_config.hpp b/trunk/src/app/srs_app_config.hpp index be1a35ec9..31d0b5969 100644 --- a/trunk/src/app/srs_app_config.hpp +++ b/trunk/src/app/srs_app_config.hpp @@ -673,7 +673,7 @@ public: // Get the srt service listen port virtual unsigned short get_srt_listen_port(); // Get the srt SRTO_MAXBW, max bandwith, default is -1. - virtual int get_srto_maxbw(); + virtual int64_t get_srto_maxbw(); // Get the srt SRTO_MSS, Maximum Segment Size, default is 1500. virtual int get_srto_mss(); // Get the srt SRTO_TSBPDMODE, timestamp base packet delivery mode, default is false. diff --git a/trunk/src/app/srs_app_srt_server.cpp b/trunk/src/app/srs_app_srt_server.cpp index 91840fbb4..5f0635e40 100644 --- a/trunk/src/app/srs_app_srt_server.cpp +++ b/trunk/src/app/srs_app_srt_server.cpp @@ -66,7 +66,7 @@ srs_error_t SrsSrtAcceptor::set_srt_opt() srs_error_t err = srs_success; if ((err = srs_srt_set_maxbw(listener_->fd(), _srs_config->get_srto_maxbw())) != srs_success) { - return srs_error_wrap(err, "set opt maxbw=%d failed", _srs_config->get_srto_maxbw()); + return srs_error_wrap(err, "set opt maxbw=%" PRId64 " failed", _srs_config->get_srto_maxbw()); } if ((err = srs_srt_set_mss(listener_->fd(), _srs_config->get_srto_mss())) != srs_success) { diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp index 3d6467ecb..d121b1844 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 184 +#define VERSION_REVISION 185 #endif diff --git a/trunk/src/protocol/srs_protocol_srt.cpp b/trunk/src/protocol/srs_protocol_srt.cpp index f751ac0a0..41888b2e1 100644 --- a/trunk/src/protocol/srs_protocol_srt.cpp +++ b/trunk/src/protocol/srs_protocol_srt.cpp @@ -221,7 +221,7 @@ srs_error_t srs_srt_nonblock(srs_srt_t srt_fd) return srs_success; } -srs_error_t srs_srt_set_maxbw(srs_srt_t srt_fd, int maxbw) +srs_error_t srs_srt_set_maxbw(srs_srt_t srt_fd, int64_t maxbw) { SET_SRT_OPT(srt_fd, SRTO_MAXBW, maxbw); return srs_success; @@ -311,7 +311,7 @@ srs_error_t srs_srt_set_pbkeylen(srs_srt_t srt_fd, int pbkeylen) return srs_success; } -srs_error_t srs_srt_get_maxbw(srs_srt_t srt_fd, int& maxbw) +srs_error_t srs_srt_get_maxbw(srs_srt_t srt_fd, int64_t& maxbw) { GET_SRT_OPT(srt_fd, SRTO_MAXBW, maxbw); return srs_success; diff --git a/trunk/src/protocol/srs_protocol_srt.hpp b/trunk/src/protocol/srs_protocol_srt.hpp index b3829f616..90e696763 100644 --- a/trunk/src/protocol/srs_protocol_srt.hpp +++ b/trunk/src/protocol/srs_protocol_srt.hpp @@ -34,7 +34,7 @@ extern srs_error_t srs_srt_listen(srs_srt_t srt_fd, std::string ip, int port); extern srs_error_t srs_srt_nonblock(srs_srt_t srt_fd); // Set SRT options. -extern srs_error_t srs_srt_set_maxbw(srs_srt_t srt_fd, int maxbw); +extern srs_error_t srs_srt_set_maxbw(srs_srt_t srt_fd, int64_t maxbw); extern srs_error_t srs_srt_set_mss(srs_srt_t srt_fd, int mss); extern srs_error_t srs_srt_set_payload_size(srs_srt_t srt_fd, int payload_size); extern srs_error_t srs_srt_set_connect_timeout(srs_srt_t srt_fd, int timeout); @@ -51,7 +51,7 @@ extern srs_error_t srs_srt_set_passphrase(srs_srt_t srt_fd, const std::string& p extern srs_error_t srs_srt_set_pbkeylen(srs_srt_t srt_fd, int pbkeylen); // Get SRT options. -extern srs_error_t srs_srt_get_maxbw(srs_srt_t srt_fd, int& maxbw); +extern srs_error_t srs_srt_get_maxbw(srs_srt_t srt_fd, int64_t& maxbw); extern srs_error_t srs_srt_get_mss(srs_srt_t srt_fd, int& mss); extern srs_error_t srs_srt_get_payload_size(srs_srt_t srt_fd, int& payload_size); extern srs_error_t srs_srt_get_connect_timeout(srs_srt_t srt_fd, int& timeout); diff --git a/trunk/src/utest/srs_utest_srt.cpp b/trunk/src/utest/srs_utest_srt.cpp index e945b33d0..dc9b154b2 100644 --- a/trunk/src/utest/srs_utest_srt.cpp +++ b/trunk/src/utest/srs_utest_srt.cpp @@ -74,7 +74,7 @@ VOID TEST(ServiceSrtPoller, SrtSetGetSocketOpt) HELPER_EXPECT_SUCCESS(srs_srt_socket(&srt_fd)); HELPER_EXPECT_SUCCESS(srs_srt_nonblock(srt_fd)); - int maxbw = 20000; + int64_t maxbw = 20000; int mss = 1400; int payload_size = 1316; int connect_timeout = 5000; @@ -104,10 +104,11 @@ VOID TEST(ServiceSrtPoller, SrtSetGetSocketOpt) bool b; int i = 0; + int64_t i64 = 0; std::string s; - HELPER_EXPECT_SUCCESS(srs_srt_get_maxbw(srt_fd, i)); - EXPECT_EQ(i, maxbw); + HELPER_EXPECT_SUCCESS(srs_srt_get_maxbw(srt_fd, i64)); + EXPECT_EQ(i64, maxbw); HELPER_EXPECT_SUCCESS(srs_srt_get_mss(srt_fd, i)); EXPECT_EQ(i, mss); HELPER_EXPECT_SUCCESS(srs_srt_get_payload_size(srt_fd, i));