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 15:04:31 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
c11e266d5ce3c1bfc4a5640aaad7fddc77f1be1c
c11e266d
1 parent
3d073f9e
update readme
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
24 行增加
和
1 行删除
README.md
trunk/conf/full.conf
trunk/conf/ingest.conf
trunk/src/app/srs_app_ingest.cpp
README.md
查看文件 @
c11e266
...
...
@@ -110,6 +110,7 @@ cd simple-rtmp-server/trunk
*
[
Usage: How to forward stream to other server?
](
https://github.com/winlinvip/simple-rtmp-server/wiki/SampleForward
)
*
[
Usage: How to deploy low lantency application?
](
https://github.com/winlinvip/simple-rtmp-server/wiki/SampleRealtime
)
*
[
Usage: How to deploy SRS on ARM?
](
https://github.com/winlinvip/simple-rtmp-server/wiki/SampleARM
)
*
[
Usage: How to ingest file/stream/device to SRS?
](
https://github.com/winlinvip/simple-rtmp-server/wiki/SampleIngest
)
*
[
Usage: How to use SRS-HTTP-server to delivery HTTP/HLS stream?
](
https://github.com/winlinvip/simple-rtmp-server/wiki/SampleHTTP
)
*
[
Usage: How to show the demo of SRS?
](
https://github.com/winlinvip/simple-rtmp-server/wiki/SampleDemo
)
*
[
Usage: Solution using SRS?
](
https://github.com/winlinvip/simple-rtmp-server/wiki/Sample
)
...
...
trunk/conf/full.conf
查看文件 @
c11e266
...
...
@@ -116,6 +116,7 @@ vhost ingest.srs.com {
# @remark, the output is specified following.
engine
{
# @see enabled of transcode engine.
# if disabled or vcodec/acodec not specified, use copy.
# default: off.
enable
off
;
# output stream. variables:
...
...
trunk/conf/ingest.conf
0 → 100644
查看文件 @
c11e266
# use ffmpeg to ingest file/stream/device to SRS
# @see https://github.com/winlinvip/simple-rtmp-server/wiki/SampleIngest
# @see full.conf for detail config.
listen
1935
;
vhost
__
defaultVhost__
{
ingest
{
enable
on
;
input
{
type
file
;
url
./
doc
/
source
.
200
kbps
.
768
x320
.
flv
;
}
ffmpeg
./
objs
/
ffmpeg
/
bin
/
ffmpeg
;
engine
{
enable
off
;
output
rtmp
://
127
.
0
.
0
.
1
:[
port
]/
live
?
vhost
=[
vhost
]/
livestream
;
}
}
}
...
...
trunk/src/app/srs_app_ingest.cpp
查看文件 @
c11e266
...
...
@@ -303,7 +303,9 @@ int SrsIngester::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsConfDirective* vhost, S
srs_error
(
"invalid ingest type=%s, ret=%d"
,
input_type
.
c_str
(),
ret
);
}
if
(
!
engine
||
!
_srs_config
->
get_engine_enabled
(
engine
))
{
std
::
string
vcodec
=
_srs_config
->
get_engine_vcodec
(
engine
);
std
::
string
acodec
=
_srs_config
->
get_engine_acodec
(
engine
);
if
(
!
engine
||
!
_srs_config
->
get_engine_enabled
(
engine
)
||
vcodec
.
empty
()
||
acodec
.
empty
())
{
if
((
ret
=
ffmpeg
->
initialize_copy
())
!=
ERROR_SUCCESS
)
{
return
ret
;
}
...
...
请
注册
或
登录
后发表评论