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-08 18:01:14 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
9372a7065ad99dfbd98789d9903ab1275c4f2371
9372a706
1 parent
4af7b6e3
refine the ingest log
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
14 行增加
和
7 行删除
trunk/src/app/srs_app_ingest.cpp
trunk/src/app/srs_app_ingest.cpp
查看文件 @
9372a70
...
...
@@ -129,7 +129,8 @@ int SrsIngester::parse_engines(SrsConfDirective* vhost, SrsConfDirective* ingest
if
((
ret
=
initialize_ffmpeg
(
ffmpeg
,
vhost
,
ingest
,
engine
))
!=
ERROR_SUCCESS
)
{
srs_freep
(
ffmpeg
);
if
(
ret
!=
ERROR_ENCODER_LOOP
)
{
srs_error
(
"invalid ingest engine: %s %s"
,
ingest
->
arg0
().
c_str
(),
engine
->
arg0
().
c_str
());
srs_error
(
"invalid ingest engine: %s %s, ret=%d"
,
ingest
->
arg0
().
c_str
(),
engine
->
arg0
().
c_str
(),
ret
);
}
return
ret
;
}
...
...
@@ -223,7 +224,7 @@ int SrsIngester::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsConfDirective* vhost, S
output
=
srs_string_replace
(
output
,
"[port]"
,
port
);
if
(
output
.
empty
())
{
ret
=
ERROR_ENCODER_NO_OUTPUT
;
srs_trace
(
"empty
ingest output url. ret=%d"
,
ret
);
srs_trace
(
"empty
output url, ingest=%s. ret=%d"
,
ingest
->
arg0
().
c_str
()
,
ret
);
return
ret
;
}
...
...
@@ -267,7 +268,7 @@ int SrsIngester::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsConfDirective* vhost, S
std
::
string
input_type
=
_srs_config
->
get_ingest_input_type
(
ingest
);
if
(
input_type
.
empty
())
{
ret
=
ERROR_ENCODER_NO_INPUT
;
srs_trace
(
"empty in
gest intput type. ret=%d"
,
ret
);
srs_trace
(
"empty in
tput type, ingest=%s. ret=%d"
,
ingest
->
arg0
().
c_str
()
,
ret
);
return
ret
;
}
...
...
@@ -275,7 +276,7 @@ int SrsIngester::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsConfDirective* vhost, S
std
::
string
input_url
=
_srs_config
->
get_ingest_input_url
(
ingest
);
if
(
input_url
.
empty
())
{
ret
=
ERROR_ENCODER_NO_INPUT
;
srs_trace
(
"empty in
gest intput url. ret=%d"
,
ret
);
srs_trace
(
"empty in
tput url, ingest=%s. ret=%d"
,
ingest
->
arg0
().
c_str
()
,
ret
);
return
ret
;
}
...
...
@@ -289,7 +290,7 @@ int SrsIngester::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsConfDirective* vhost, S
std
::
string
input_url
=
_srs_config
->
get_ingest_input_url
(
ingest
);
if
(
input_url
.
empty
())
{
ret
=
ERROR_ENCODER_NO_INPUT
;
srs_trace
(
"empty in
gest intput url. ret=%d"
,
ret
);
srs_trace
(
"empty in
tput url, ingest=%s. ret=%d"
,
ingest
->
arg0
().
c_str
()
,
ret
);
return
ret
;
}
...
...
@@ -301,13 +302,16 @@ int SrsIngester::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsConfDirective* vhost, S
}
}
else
{
ret
=
ERROR_ENCODER_INPUT_TYPE
;
srs_error
(
"invalid ingest type=%s, ret=%d"
,
input_type
.
c_str
(),
ret
);
srs_error
(
"invalid ingest=%s type=%s, ret=%d"
,
ingest
->
arg0
().
c_str
(),
input_type
.
c_str
(),
ret
);
}
std
::
string
vcodec
=
_srs_config
->
get_engine_vcodec
(
engine
);
std
::
string
acodec
=
_srs_config
->
get_engine_acodec
(
engine
);
// whatever the engine config, use copy as default.
if
(
!
engine
||
!
_srs_config
->
get_engine_enabled
(
engine
)
||
vcodec
.
empty
()
||
acodec
.
empty
())
{
if
(
!
engine
||
vcodec
.
empty
()
||
acodec
.
empty
()
||
!
_srs_config
->
get_engine_enabled
(
engine
)
)
{
if
((
ret
=
ffmpeg
->
initialize_copy
())
!=
ERROR_SUCCESS
)
{
return
ret
;
}
...
...
@@ -317,6 +321,9 @@ int SrsIngester::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsConfDirective* vhost, S
}
}
srs_trace
(
"parse success, ingest=%s, vhost=%s"
,
ingest
->
arg0
().
c_str
(),
vhost
->
arg0
().
c_str
());
return
ret
;
}
...
...
请
注册
或
登录
后发表评论