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

Use macro to disable SRT in code

Browse source
This commit is contained in:
winlin 2020-01-23 14:23:09 +08:00
parent fb29096505
commit f143757429
4 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/auto/auto_headers.sh
View file

@ -70,6 +70,12 @@ else
srs_undefine_macro "SRS_AUTO_HDS" $SRS_AUTO_HEADERS_H srs_undefine_macro "SRS_AUTO_HDS" $SRS_AUTO_HEADERS_H
fi fi
if [ $SRS_SRT = YES ]; then
srs_define_macro "SRS_AUTO_SRT" $SRS_AUTO_HEADERS_H
else
srs_undefine_macro "SRS_AUTO_SRT" $SRS_AUTO_HEADERS_H
fi
if [ $SRS_MEM_WATCH = YES ]; then if [ $SRS_MEM_WATCH = YES ]; then
srs_define_macro "SRS_AUTO_MEM_WATCH" $SRS_AUTO_HEADERS_H srs_define_macro "SRS_AUTO_MEM_WATCH" $SRS_AUTO_HEADERS_H
else else

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

@ -688,9 +688,11 @@ srs_error_t SrsServer::listen()
if ((err = conn_manager->start()) != srs_success) { if ((err = conn_manager->start()) != srs_success) {
return srs_error_wrap(err, "connection manager"); return srs_error_wrap(err, "connection manager");
} }
#ifdef SRS_AUTO_SRT
if ((err = listen_srt()) != srs_success) { if ((err = listen_srt()) != srs_success) {
return srs_error_wrap(err, "srt listen"); return srs_error_wrap(err, "srt listen");
} }
#endif
return err; return err;
} }
@ -1007,6 +1009,7 @@ srs_error_t SrsServer::do_cycle()
return err; return err;
} }
#ifdef SRS_AUTO_SRT
srs_error_t SrsServer::listen_srt() { srs_error_t SrsServer::listen_srt() {
srs_error_t err = srs_success; srs_error_t err = srs_success;
@ -1030,6 +1033,7 @@ srs_error_t SrsServer::listen_srt() {
} }
return err; return err;
} }
#endif
srs_error_t SrsServer::listen_rtmp() srs_error_t SrsServer::listen_rtmp()
{ {

9
trunk/src/app/srs_app_server.hpp
View file

@ -36,8 +36,10 @@
#include <srs_app_listener.hpp> #include <srs_app_listener.hpp>
#include <srs_app_conn.hpp> #include <srs_app_conn.hpp>
#include <srs_service_st.hpp> #include <srs_service_st.hpp>
#ifdef SRS_AUTO_SRT
#include "../srt/srt_server.hpp" #include "../srt/srt_server.hpp"
#include "../srt/srt_to_rtmp.hpp" #include "../srt/srt_to_rtmp.hpp"
#endif
class SrsServer; class SrsServer;
class SrsConnection; class SrsConnection;
@ -211,11 +213,10 @@ private:
SrsHttpHeartbeat* http_heartbeat; SrsHttpHeartbeat* http_heartbeat;
SrsIngester* ingester; SrsIngester* ingester;
SrsCoroutineManager* conn_manager; SrsCoroutineManager* conn_manager;
#ifdef SRS_AUTO_SRT
private:
//srt server //srt server
SRT_SERVER_PTR srt_ptr; SRT_SERVER_PTR srt_ptr;
#endif
private: private:
// The pid file fd, lock the file write when server is running. // The pid file fd, lock the file write when server is running.
// @remark the init.d script should cleanup the pid file, when stop service, // @remark the init.d script should cleanup the pid file, when stop service,
@ -286,8 +287,10 @@ private:
virtual srs_error_t listen_http_api(); virtual srs_error_t listen_http_api();
virtual srs_error_t listen_http_stream(); virtual srs_error_t listen_http_stream();
virtual srs_error_t listen_stream_caster(); virtual srs_error_t listen_stream_caster();
#ifdef SRS_AUTO_SRT
//start listen srt udp port //start listen srt udp port
virtual srs_error_t listen_srt(); virtual srs_error_t listen_srt();
#endif
// Close the listeners for specified type, // Close the listeners for specified type,
// Remove the listen object from manager. // Remove the listen object from manager.
virtual void close_listeners(SrsListenerType type); virtual void close_listeners(SrsListenerType type);

1
trunk/src/main/srs_main_server.cpp
View file

@ -214,6 +214,7 @@ void show_macro_features()
ss << ", dash:" << "on"; ss << ", dash:" << "on";
ss << ", hls:" << srs_bool2switch(true); ss << ", hls:" << srs_bool2switch(true);
ss << ", hds:" << srs_bool2switch(SRS_AUTO_HDS_BOOL); ss << ", hds:" << srs_bool2switch(SRS_AUTO_HDS_BOOL);
ss << ", srt:" << srs_bool2switch(SRS_AUTO_SRT_BOOL);
// hc(http callback) // hc(http callback)
ss << ", hc:" << srs_bool2switch(true); ss << ", hc:" << srs_bool2switch(true);
// ha(http api) // ha(http api)