Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-07-10 13:50:35 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
b3b6df365e4f8d42b1eedd8f76916f77d5e35c3e
b3b6df36
1 parent
50feaacd
fix the stream caster build failed bug.
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
21 行增加
和
3 行删除
trunk/src/app/srs_app_config.cpp
trunk/src/app/srs_app_config.hpp
trunk/src/app/srs_app_server.cpp
trunk/src/app/srs_app_config.cpp
查看文件 @
b3b6df3
...
...
@@ -4418,3 +4418,18 @@ bool srs_config_dvr_is_plan_append(string plan)
{
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
;
}
...
...
trunk/src/app/srs_app_config.hpp
查看文件 @
b3b6df3
...
...
@@ -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_session
(
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
extern
SrsConfig
*
_srs_config
;
...
...
trunk/src/app/srs_app_server.cpp
查看文件 @
b3b6df3
...
...
@@ -1120,11 +1120,11 @@ int SrsServer::listen_stream_caster()
SrsListener
*
listener
=
NULL
;
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
);
}
else
if
(
caster
==
SRS_CONF_DEFAULT_STREAM_CASTER_RTSP
)
{
}
else
if
(
srs_stream_caster_is_rtsp
(
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
);
}
else
{
ret
=
ERROR_STREAM_CASTER_ENGINE
;
...
...
请
注册
或
登录
后发表评论