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
2013-12-03 00:26:40 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
464d78b7626d29eb318cbaad14b023d65190efb8
464d78b7
1 parent
5afe746e
add todo for ffmpeg
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
6 行增加
和
3 行删除
trunk/conf/srs.conf
trunk/src/core/srs_core_encoder.cpp
trunk/conf/srs.conf
查看文件 @
464d78b
...
...
@@ -72,19 +72,18 @@ vhost __defaultVhost__ {
vhost
dev
{
enabled
on
;
gop_cache
on
;
hls
o
ff
;
hls
o
n
;
hls_path
./
objs
/
nginx
/
html
;
hls_fragment
5
;
hls_window
30
;
#forward 127.0.0.1:19350;
#forward 127.0.0.1:1936;
transcode
{
enabled
o
n
;
enabled
o
ff
;
ffmpeg
./
objs
/
ffmpeg
/
bin
/
ffmpeg
;
engine
dev
{
enabled
on
;
vfilter
{
t
10
;
}
vcodec
libx264
;
vbitrate
300
;
...
...
trunk/src/core/srs_core_encoder.cpp
查看文件 @
464d78b
...
...
@@ -374,6 +374,8 @@ int SrsFFMPEG::cycle()
return
ret
;
}
// TODO: to support rewind.
if
(
p
==
0
)
{
srs_info
(
"transcode process pid=%d is running."
,
pid
);
return
ret
;
...
...
@@ -391,6 +393,8 @@ void SrsFFMPEG::stop()
return
;
}
// TODO: kill the ffmpeg process when stop.
std
::
vector
<
std
::
string
>::
iterator
it
;
it
=
std
::
find
(
_transcoded_url
.
begin
(),
_transcoded_url
.
end
(),
output
);
if
(
it
!=
_transcoded_url
.
end
())
{
...
...
请
注册
或
登录
后发表评论