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

fix #119: use iformat and oformat for ffmpeg transcode.

Browse source
This commit is contained in:
winlin 2014-07-19 10:54:38 +08:00
parent 2f0a72d7d1
commit 9bf7b722db
5 changed files with 61 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -96,6 +96,7 @@ int SrsFFMPEG::initialize_transcode(SrsConfDirective* engine)
{
int ret = ERROR_SUCCESS;
iformat = _srs_config->get_engine_iformat(engine);
vfilter = _srs_config->get_engine_vfilter(engine);
vcodec = _srs_config->get_engine_vcodec(engine);
vbitrate = _srs_config->get_engine_vbitrate(engine);
@ -111,6 +112,7 @@ int SrsFFMPEG::initialize_transcode(SrsConfDirective* engine)
asample_rate = _srs_config->get_engine_asample_rate(engine);
achannels = _srs_config->get_engine_achannels(engine);
aparams = _srs_config->get_engine_aparams(engine);
oformat = _srs_config->get_engine_oformat(engine);
// ensure the size is even.
vwidth -= vwidth % 2;
@ -241,8 +243,10 @@ int SrsFFMPEG::start()
}
// input.
params.push_back("-f");
params.push_back("flv");
if (iformat != "off") {
params.push_back("-f");
params.push_back(iformat);
}
params.push_back("-i");
params.push_back(input);
@ -342,8 +346,10 @@ int SrsFFMPEG::start()
}
// output
params.push_back("-f");
params.push_back("flv");
if (oformat != "off") {
params.push_back("-f");
params.push_back(oformat);
}
params.push_back("-y");
params.push_back(_output);