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

change to 0.9.52, refine encoder and ffmpeg

Browse source
This commit is contained in:
winlin 2014-04-07 10:15:44 +08:00
parent 72c330d47c
commit 4f7cfeed37
5 changed files with 101 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,7 +35,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <vector>
class SrsConfDirective;
class SrsRequest;
class SrsPithyPrint;
/**
@ -52,28 +51,30 @@ private:
int log_fd;
private:
std::string ffmpeg;
std::vector<std::string> vfilter;
std::vector<std::string> vfilter;
std::string vcodec;
int vbitrate;
double vfps;
double vfps;
int vwidth;
int vheight;
int vthreads;
std::string vprofile;
std::string vpreset;
std::vector<std::string> vparams;
std::vector<std::string> vparams;
std::string acodec;
int abitrate;
int asample_rate;
int achannels;
std::vector<std::string> aparams;
std::string output;
std::vector<std::string> aparams;
std::string _output;
std::string input;
public:
SrsFFMPEG(std::string ffmpeg_bin);
virtual ~SrsFFMPEG();
public:
virtual int initialize(SrsRequest* req, SrsConfDirective* engine);
virtual std::string output();
public:
virtual int initialize(std::string in, std::string out, std::string log, SrsConfDirective* engine);
virtual int start();
virtual int cycle();
virtual void stop();