From 04d0620ddeffeb640167e0a7ee7877bdae25d6ca Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 25 Feb 2020 13:45:05 +0800 Subject: [PATCH] For #1615, fix build failed and srt api issue --- trunk/src/core/srs_core_mem_watch.cpp | 2 +- trunk/src/protocol/srs_protocol_utility.cpp | 2 +- trunk/src/srt/srt_server.cpp | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/trunk/src/core/srs_core_mem_watch.cpp b/trunk/src/core/srs_core_mem_watch.cpp index 701795fa9..dbc6c9411 100644 --- a/trunk/src/core/srs_core_mem_watch.cpp +++ b/trunk/src/core/srs_core_mem_watch.cpp @@ -74,7 +74,7 @@ void srs_memory_report() std::map::iterator it; for (it = _srs_ptrs.begin(); it != _srs_ptrs.end(); ++it) { SrsMemoryObject* obj = it->second; - printf(" %s: %#"PRIx64", %dB\n", obj->category.c_str(), (int64_t)obj->ptr, obj->size); + printf(" %s: %#" PRIx64 ", %dB\n", obj->category.c_str(), (int64_t)obj->ptr, obj->size); total += obj->size; } diff --git a/trunk/src/protocol/srs_protocol_utility.cpp b/trunk/src/protocol/srs_protocol_utility.cpp index 28141f625..251d69854 100644 --- a/trunk/src/protocol/srs_protocol_utility.cpp +++ b/trunk/src/protocol/srs_protocol_utility.cpp @@ -122,7 +122,7 @@ void srs_discovery_tc_url(string tcUrl, string& schema, string& host, string& vh srs_vhost_resolve(vhost, stream, param); // Ignore when the param only contains the default vhost. - if (param == "?vhost="SRS_CONSTS_RTMP_DEFAULT_VHOST) { + if (param == "?vhost=" SRS_CONSTS_RTMP_DEFAULT_VHOST) { param = ""; } } diff --git a/trunk/src/srt/srt_server.cpp b/trunk/src/srt/srt_server.cpp index 3a17a0a8b..eb41866e0 100644 --- a/trunk/src/srt/srt_server.cpp +++ b/trunk/src/srt/srt_server.cpp @@ -256,7 +256,11 @@ void srt_server::on_work() } } } + + // @see 2020-01-28 https://github.com/Haivision/srt/commit/b8c70ec801a56bea151ecce9c09c4ebb720c2f68#diff-fb66028e8746fea578788532533a296bR786 +#if SRT_VERSION_MAJOR > 1 || SRT_VERSION_MINOR > 4 || SRT_VERSION_PATCH > 1 srt_epoll_clear_usocks(_pollid); +#endif } SrtServerAdapter::SrtServerAdapter()