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
2014-04-29 18:27:00 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f02ac02a50ced5a70693a0e865a011a4cb3aa9a4
f02ac02a
1 parent
0f498acd
auto open atc for bravo_atc set
显示空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
35 行增加
和
1 行删除
trunk/src/app/srs_app_config.cpp
trunk/src/app/srs_app_config.hpp
trunk/src/app/srs_app_source.cpp
trunk/src/core/srs_core.hpp
trunk/src/app/srs_app_config.cpp
查看文件 @
f02ac02
...
...
@@ -2656,6 +2656,29 @@ string SrsConfig::get_vhost_http_dir(string vhost)
return
conf
->
arg0
();
}
void
SrsConfig
::
set_atc
(
std
::
string
vhost
,
bool
atc
)
{
SrsConfDirective
*
conf
=
get_vhost
(
vhost
);
if
(
!
conf
)
{
return
;
}
// create if not exists
if
(
conf
->
get
(
"atc"
)
==
NULL
)
{
SrsConfDirective
*
o
=
new
SrsConfDirective
();
o
->
name
=
"atc"
;
conf
->
directives
.
push_back
(
o
);
}
// get the atc node
conf
=
conf
->
get
(
"atc"
);
srs_assert
(
conf
);
// refresh
conf
->
directives
.
clear
();
conf
->
args
.
push_back
((
atc
?
"true"
:
"false"
));
}
bool
srs_directive_equals
(
SrsConfDirective
*
a
,
SrsConfDirective
*
b
)
{
// both NULL, equal.
...
...
trunk/src/app/srs_app_config.hpp
查看文件 @
f02ac02
...
...
@@ -269,6 +269,9 @@ public:
virtual
bool
get_vhost_http_enabled
(
std
::
string
vhost
);
virtual
std
::
string
get_vhost_http_mount
(
std
::
string
vhost
);
virtual
std
::
string
get_vhost_http_dir
(
std
::
string
vhost
);
// setter in memory
public:
virtual
void
set_atc
(
std
::
string
vhost
,
bool
atc
);
};
/**
...
...
trunk/src/app/srs_app_source.cpp
查看文件 @
f02ac02
...
...
@@ -822,6 +822,14 @@ int SrsSource::on_meta_data(SrsMessage* msg, SrsOnMetaDataPacket* metadata)
}
}
// if bravo-atc, open atc for vhost.
if
((
prop
=
metadata
->
metadata
->
get_property
(
"bravo_atc"
))
!=
NULL
)
{
if
(
prop
->
is_string
()
&&
prop
->
to_str
()
==
"true"
)
{
atc
=
true
;
_srs_config
->
set_atc
(
_req
->
vhost
,
true
);
}
}
// encode the metadata to payload
int
size
=
0
;
char
*
payload
=
NULL
;
...
...
trunk/src/core/srs_core.hpp
查看文件 @
f02ac02
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR "0"
#define VERSION_MINOR "9"
#define VERSION_REVISION "8
2
"
#define VERSION_REVISION "8
3
"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info.
#define RTMP_SIG_SRS_KEY "srs"
...
...
请
注册
或
登录
后发表评论