external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

update readme

Browse source
This commit is contained in:
winlin 2014-04-07 15:04:31 +08:00
parent 3d073f9ef6
commit c11e266d5c
4 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -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 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 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 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 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: 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) * [Usage: Solution using SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/Sample)

1
trunk/conf/full.conf
View file

@ -116,6 +116,7 @@ vhost ingest.srs.com {
# @remark, the output is specified following. # @remark, the output is specified following.
engine { engine {
# @see enabled of transcode engine. # @see enabled of transcode engine.
# if disabled or vcodec/acodec not specified, use copy.
# default: off. # default: off.
enable off; enable off;
# output stream. variables: # output stream. variables:

19
trunk/conf/ingest.conf Normal file
View file

@ -0,0 +1,19 @@
# 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.200kbps.768x320.flv;
}
ffmpeg ./objs/ffmpeg/bin/ffmpeg;
engine {
enable off;
output rtmp://127.0.0.1:[port]/live?vhost=[vhost]/livestream;
}
}
}

4
trunk/src/app/srs_app_ingest.cpp
View file

@ -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); 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) { if ((ret = ffmpeg->initialize_copy()) != ERROR_SUCCESS) {
return ret; return ret;
} }