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
2017-01-16 12:42:25 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
142a9733b2537442cdc5ad0b41df677152e1822e
142a9733
1 parent
e6eafd3b
refine encoder code for #536.
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
7 行增加
和
1 行删除
trunk/src/app/srs_app_encoder.cpp
trunk/src/app/srs_app_ffmpeg.cpp
trunk/src/app/srs_app_ffmpeg.hpp
trunk/src/app/srs_app_encoder.cpp
查看文件 @
142a973
...
...
@@ -299,6 +299,10 @@ int SrsEncoder::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsRequest* req, SrsConfDir
log_file
+=
req
->
app
;
log_file
+=
"-"
;
log_file
+=
req
->
stream
;
if
(
!
engine
->
args
.
empty
())
{
log_file
+=
"-"
;
log_file
+=
engine
->
arg0
();
}
log_file
+=
".log"
;
}
...
...
trunk/src/app/srs_app_ffmpeg.cpp
查看文件 @
142a973
...
...
@@ -102,6 +102,7 @@ int SrsFFMPEG::initialize_transcode(SrsConfDirective* engine)
{
int
ret
=
ERROR_SUCCESS
;
engine_name
=
engine
->
arg0
();
iformat
=
_srs_config
->
get_engine_iformat
(
engine
);
vfilter
=
_srs_config
->
get_engine_vfilter
(
engine
);
vcodec
=
_srs_config
->
get_engine_vcodec
(
engine
);
...
...
@@ -487,7 +488,7 @@ int SrsFFMPEG::start()
// parent.
if
(
pid
>
0
)
{
started
=
true
;
srs_trace
(
"
vfored ffmpeg encoder engine, pid=%d"
,
pid
);
srs_trace
(
"
fork encoder %s, pid=%d"
,
engine_name
.
c_str
()
,
pid
);
return
ret
;
}
...
...
trunk/src/app/srs_app_ffmpeg.hpp
查看文件 @
142a973
...
...
@@ -49,6 +49,7 @@ private:
bool
fast_stopped
;
pid_t
pid
;
private
:
std
::
string
engine_name
;
std
::
string
log_file
;
private
:
std
::
string
ffmpeg
;
...
...
请
注册
或
登录
后发表评论