hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added support for pulling media files through ffmpeg, added MistFLV2DTSC converter to binaries.

Browse source
This commit is contained in:
Thulinma 2012-05-01 23:56:13 +02:00
parent 54b5bfbea1
commit 2ea5250c15
5 changed files with 139 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Controller/main.cpp
View file

@ -222,19 +222,24 @@ void startStream(std::string name, JSON::Value & data){
Log("BUFF", "(re)starting stream buffer "+name);
std::string URL = data["channel"]["URL"];
std::string preset = data["preset"]["cmd"];
std::string cmd1, cmd2;
std::string cmd1, cmd2, cmd3;
if (URL.substr(0, 4) == "push"){
std::string pusher = URL.substr(7);
cmd2 = "MistBuffer "+name+" "+pusher;
Util::Procs::Start(name, cmd2);
}else{
if (preset == "" || preset == "copy"){
if (URL.substr(0, 1) == "/"){
cmd1 = "cat "+URL;
}else{
cmd1 = "ffmpeg -re -async 2 -i "+URL+" "+preset+" -f flv -";
cmd2 = "MistFLV2DTSC";
}
cmd3 = "MistBuffer 500 "+name;
if (cmd2 != ""){
Util::Procs::Start(name, cmd1, cmd2, cmd3);
}else{
Util::Procs::Start(name, cmd1, cmd3);
}
cmd2 = "MistBuffer 500 "+name;
Util::Procs::Start(name, cmd1, cmd2);
}
}