external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity

SRT: Rebase develop.

Browse source
This commit is contained in:
winlin 2022-06-14 20:17:00 +08:00
parent 0957cdb944
commit 93fed3874b
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
trunk/src/app/srs_app_srt_conn.cpp
View file

@ -12,7 +12,7 @@ using namespace std;
#include <srs_kernel_flv.hpp>
#include <srs_kernel_stream.hpp>
#include <srs_core_autofree.hpp>
#include <srs_rtmp_stack.hpp>
#include <srs_protocol_rtmp_stack.hpp>
#include <srs_protocol_srt.hpp>
#include <srs_app_config.hpp>
#include <srs_app_http_hooks.hpp>
@ -341,7 +341,7 @@ srs_error_t SrsMpegtsSrtConn::acquire_publish()
return srs_error_wrap(err, "create bridger");
}
srt_source_->set_bridger(bridger);
srt_source_->set_bridge(bridger);
}
if ((err = srt_source_->on_publish()) != srs_success) {

2
trunk/src/app/srs_app_srt_server.cpp
View file

@ -10,7 +10,7 @@ using namespace std;
#include <srs_kernel_log.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_service_log.hpp>
#include <srs_protocol_log.hpp>
#include <srs_app_config.hpp>
#include <srs_app_srt_conn.hpp>

4
trunk/src/app/srs_app_srt_source.cpp
View file

@ -14,8 +14,8 @@ using namespace std;
#include <srs_kernel_buffer.hpp>
#include <srs_kernel_stream.hpp>
#include <srs_core_autofree.hpp>
#include <srs_raw_avc.hpp>
#include <srs_rtmp_stack.hpp>
#include <srs_protocol_raw_avc.hpp>
#include <srs_protocol_rtmp_stack.hpp>
#include <srs_app_source.hpp>
#include <srs_app_statistic.hpp>

4
trunk/src/app/srs_app_srt_source.hpp
View file

@ -13,7 +13,7 @@
#include <vector>
#include <srs_kernel_ts.hpp>
#include <srs_service_st.hpp>
#include <srs_protocol_st.hpp>
#include <srs_app_source.hpp>
class SrsSharedPtrMessage;
@ -154,7 +154,7 @@ public:
// Update the authentication information in request.
virtual void update_auth(SrsRequest* r);
public:
void set_bridger(ISrsSrtSourceBridge *bridger);
void set_bridge(ISrsSrtSourceBridge *bridger);
public:
// Create consumer
// @param consumer, output the create consumer.

4
trunk/src/app/srs_app_srt_utility.cpp
View file

@ -13,7 +13,7 @@ using namespace std;
#include <srs_kernel_utility.hpp>
#include <srs_kernel_error.hpp>
#include <srs_protocol_utility.hpp>
#include <srs_rtmp_stack.hpp>
#include <srs_protocol_rtmp_stack.hpp>
#include <srs_kernel_utility.hpp>
// See streamid of https://github.com/ossrs/srs/issues/2893
@ -107,7 +107,7 @@ bool srs_srt_streamid_info(const std::string& streamid, SrtMode& mode, std::stri
if (!params.empty()) {
url_subpath.append("?");
url_subpath.append(params);
url_subpath.pop_back(); // remove last '&'
url_subpath = url_subpath.substr(0, url_subpath.length() - 1); // remove last '&'
}
return true;

2
trunk/src/app/srs_app_srt_utility.hpp
View file

@ -12,7 +12,7 @@
#include <string>
#include <srs_kernel_log.hpp>
#include <srs_service_utility.hpp>
#include <srs_protocol_utility.hpp>
class SrsRequest;

2
trunk/src/protocol/srs_protocol_srt.hpp
View file

@ -8,7 +8,7 @@
#define SRS_PROTOCOL_SRT_HPP
#include <srs_core.hpp>
#include <srs_service_st.hpp>
#include <srs_protocol_st.hpp>
#include <map>
#include <vector>