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-07 14:28:06 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
4f445f2f60212f71fc06a4b9ec4c1f3222d562a1
4f445f2f
1 parent
45d8f434
support ingest stream
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
15 行增加
和
0 行删除
trunk/src/app/srs_app_config.hpp
trunk/src/app/srs_app_ingest.cpp
trunk/src/app/srs_app_config.hpp
查看文件 @
4f445f2
...
...
@@ -70,6 +70,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SRS_STAGE_HLS_INTERVAL_MS 2000
#define SRS_INGEST_TYPE_FILE "file"
#define SRS_INGEST_TYPE_STREAM "stream"
class
SrsFileBuffer
;
...
...
trunk/src/app/srs_app_ingest.cpp
查看文件 @
4f445f2
...
...
@@ -284,6 +284,20 @@ int SrsIngester::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsConfDirective* vhost, S
if
((
ret
=
ffmpeg
->
initialize
(
input_url
,
output
,
log_file
))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
}
else
if
(
input_type
==
SRS_INGEST_TYPE_STREAM
)
{
std
::
string
input_url
=
_srs_config
->
get_ingest_input_url
(
ingest
);
if
(
input_url
.
empty
())
{
ret
=
ERROR_ENCODER_NO_INPUT
;
srs_trace
(
"empty ingest intput url. ret=%d"
,
ret
);
return
ret
;
}
// for stream, no re.
ffmpeg
->
set_iparams
(
""
);
if
((
ret
=
ffmpeg
->
initialize
(
input_url
,
output
,
log_file
))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
}
else
{
ret
=
ERROR_ENCODER_INPUT_TYPE
;
srs_error
(
"invalid ingest type=%s, ret=%d"
,
input_type
.
c_str
(),
ret
);
...
...
请
注册
或
登录
后发表评论