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

Corrected ts-exec: output format.

Browse source
This commit is contained in:
Thulinma 2017-09-29 14:41:07 +02:00
parent f77431d5a3
commit c466f4bcba
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/output/output_httpts.cpp
View file

@ -9,8 +9,8 @@ namespace Mist{
OutHTTPTS::OutHTTPTS(Socket::Connection & conn) : TSOutput(conn){ OutHTTPTS::OutHTTPTS(Socket::Connection & conn) : TSOutput(conn){
sendRepeatingHeaders = 500;//PAT/PMT every 500ms (DVB spec) sendRepeatingHeaders = 500;//PAT/PMT every 500ms (DVB spec)
if(config->getString("target").substr(0,10) == "ts-exec://"){ if(config->getString("target").substr(0,8) == "ts-exec:"){
std::string input = config->getString("target").substr(10); std::string input = config->getString("target").substr(8);
char *args[128]; char *args[128];
uint8_t argCnt = 0; uint8_t argCnt = 0;
char *startCh = 0; char *startCh = 0;
@ -37,7 +37,6 @@ namespace Mist{
wantRequest = false; wantRequest = false;
parseData = true; parseData = true;
INFO_MSG("ts exec stream");
} }
} }
@ -73,7 +72,7 @@ namespace Mist{
capa["methods"][0u]["type"] = "html5/video/mpeg"; capa["methods"][0u]["type"] = "html5/video/mpeg";
capa["methods"][0u]["priority"] = 1ll; capa["methods"][0u]["priority"] = 1ll;
capa["push_urls"].append("/*.ts"); capa["push_urls"].append("/*.ts");
capa["push_urls"].append("ts-exec://*"); capa["push_urls"].append("ts-exec:*");
JSON::Value opt; JSON::Value opt;
opt["arg"] = "string"; opt["arg"] = "string";

2
src/output/output_httpts.h
View file

@ -12,7 +12,7 @@ namespace Mist {
void initialSeek(); void initialSeek();
private: private:
bool isRecording(); bool isRecording();
bool isFileTarget(){return isRecording() && config->getString("target").substr(0,10) != "ts-exec://" ;} bool isFileTarget(){return isRecording() && config->getString("target").substr(0,8) != "ts-exec:";}
}; };
} }