external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 03:41:55 +00:00
Code Issues Releases Wiki Activity

refine encoder code for #536.

Browse source
This commit is contained in:
winlin 2017-01-16 12:42:25 +08:00
parent e6eafd3b97
commit 142a9733b2
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -299,6 +299,10 @@ int SrsEncoder::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsRequest* req, SrsConfDir
log_file += req->app; log_file += req->app;
log_file += "-"; log_file += "-";
log_file += req->stream; log_file += req->stream;
if (!engine->args.empty()) {
log_file += "-";
log_file += engine->arg0();
}
log_file += ".log"; log_file += ".log";
} }

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

@ -102,6 +102,7 @@ int SrsFFMPEG::initialize_transcode(SrsConfDirective* engine)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
engine_name = engine->arg0();
iformat = _srs_config->get_engine_iformat(engine); iformat = _srs_config->get_engine_iformat(engine);
vfilter = _srs_config->get_engine_vfilter(engine); vfilter = _srs_config->get_engine_vfilter(engine);
vcodec = _srs_config->get_engine_vcodec(engine); vcodec = _srs_config->get_engine_vcodec(engine);
@ -487,7 +488,7 @@ int SrsFFMPEG::start()
// parent. // parent.
if (pid > 0) { if (pid > 0) {
started = true; started = true;
srs_trace("vfored ffmpeg encoder engine, pid=%d", pid); srs_trace("fork encoder %s, pid=%d", engine_name.c_str(), pid);
return ret; return ret;
} }

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

@ -49,6 +49,7 @@ private:
bool fast_stopped; bool fast_stopped;
pid_t pid; pid_t pid;
private: private:
std::string engine_name;
std::string log_file; std::string log_file;
private: private:
std::string ffmpeg; std::string ffmpeg;