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

support ingest stream

Browse source
This commit is contained in:
winlin 2014-04-07 14:28:06 +08:00
parent 45d8f4346f
commit 4f445f2f60
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/src/app/srs_app_config.hpp
View file

@ -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_STAGE_HLS_INTERVAL_MS 2000
#define SRS_INGEST_TYPE_FILE "file" #define SRS_INGEST_TYPE_FILE "file"
#define SRS_INGEST_TYPE_STREAM "stream"
class SrsFileBuffer; class SrsFileBuffer;

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

@ -281,6 +281,20 @@ int SrsIngester::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsConfDirective* vhost, S
// for file, set re. // for file, set re.
ffmpeg->set_iparams("-re"); ffmpeg->set_iparams("-re");
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) { if ((ret = ffmpeg->initialize(input_url, output, log_file)) != ERROR_SUCCESS) {
return ret; return ret;
} }