external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into 3.0release.srt.dev

Browse source
This commit is contained in:
runner365 2020-02-26 17:46:44 +08:00
commit ed1a3aa37c
26 changed files with 424 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/src/srt/srt_conn.cpp
View file

@ -3,6 +3,8 @@
#include "stringex.hpp"
#include <vector>
#include <srs_app_config.hpp>
bool is_streamid_valid(const std::string& streamid) {
if (streamid.empty()) {
return false;
@ -71,7 +73,7 @@ bool get_streamid_info(const std::string& streamid, int& mode, std::string& url_
if (pos != 0) {
pos = streamid.find("/");
if (pos == streamid.npos) {
url_subpath = "live/" + streamid;
url_subpath = _srs_config->get_default_app_name() + "/" + streamid;
return true;
}
url_subpath = streamid;

5
trunk/src/srt/srt_server.cpp
View file

@ -256,7 +256,12 @@ void srt_server::on_work()
}
}
}
// New API at 2020-01-28, >1.4.1
// @see https://github.com/Haivision/srt/commit/b8c70ec801a56bea151ecce9c09c4ebb720c2f68#diff-fb66028e8746fea578788532533a296bR786
#if (SRT_VERSION_MAJOR<<24 | SRT_VERSION_MINOR<<16 | SRT_VERSION_PATCH<<8) > 0x01040100
srt_epoll_clear_usocks(_pollid);
#endif
}
SrtServerAdapter::SrtServerAdapter()