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

fix the stream caster build failed bug.

Browse source
This commit is contained in:
winlin 2015-07-10 13:50:35 +08:00
parent 50feaacdde
commit b3b6df365e
3 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
trunk/src/app/srs_app_config.cpp
View file

@ -4418,3 +4418,18 @@ bool srs_config_dvr_is_plan_append(string plan)
{ {
return plan == SRS_CONF_DEFAULT_DVR_PLAN_APPEND; return plan == SRS_CONF_DEFAULT_DVR_PLAN_APPEND;
} }
bool srs_stream_caster_is_udp(string caster)
{
return caster == SRS_CONF_DEFAULT_STREAM_CASTER_MPEGTS_OVER_UDP;
}
bool srs_stream_caster_is_rtsp(string caster)
{
return caster == SRS_CONF_DEFAULT_STREAM_CASTER_RTSP;
}
bool srs_stream_caster_is_flv(string caster)
{
return caster == SRS_CONF_DEFAULT_STREAM_CASTER_FLV;
}

3
trunk/src/app/srs_app_config.hpp
View file

@ -1143,6 +1143,9 @@ extern bool srs_config_ingest_is_stream(std::string type);
extern bool srs_config_dvr_is_plan_segment(std::string plan); extern bool srs_config_dvr_is_plan_segment(std::string plan);
extern bool srs_config_dvr_is_plan_session(std::string plan); extern bool srs_config_dvr_is_plan_session(std::string plan);
extern bool srs_config_dvr_is_plan_append(std::string plan); extern bool srs_config_dvr_is_plan_append(std::string plan);
extern bool srs_stream_caster_is_udp(std::string caster);
extern bool srs_stream_caster_is_rtsp(std::string caster);
extern bool srs_stream_caster_is_flv(std::string caster);
// global config // global config
extern SrsConfig* _srs_config; extern SrsConfig* _srs_config;

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

@ -1120,11 +1120,11 @@ int SrsServer::listen_stream_caster()
SrsListener* listener = NULL; SrsListener* listener = NULL;
std::string caster = _srs_config->get_stream_caster_engine(stream_caster); std::string caster = _srs_config->get_stream_caster_engine(stream_caster);
if (caster == SRS_CONF_DEFAULT_STREAM_CASTER_MPEGTS_OVER_UDP) { if (srs_stream_caster_is_udp(caster)) {
listener = new SrsUdpCasterListener(this, SrsListenerMpegTsOverUdp, stream_caster); listener = new SrsUdpCasterListener(this, SrsListenerMpegTsOverUdp, stream_caster);
} else if (caster == SRS_CONF_DEFAULT_STREAM_CASTER_RTSP) { } else if (srs_stream_caster_is_rtsp(caster)) {
listener = new SrsRtspListener(this, SrsListenerRtsp, stream_caster); listener = new SrsRtspListener(this, SrsListenerRtsp, stream_caster);
} else if (caster == SRS_CONF_DEFAULT_STREAM_CASTER_FLV) { } else if (srs_stream_caster_is_flv(caster)) {
listener = new SrsHttpFlvListener(this, SrsListenerFlv, stream_caster); listener = new SrsHttpFlvListener(this, SrsListenerFlv, stream_caster);
} else { } else {
ret = ERROR_STREAM_CASTER_ENGINE; ret = ERROR_STREAM_CASTER_ENGINE;