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

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2019-04-26 11:06:33 +02:00
commit 51a65209fa
20 changed files with 59389 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/output/output_hls.cpp
View file

@ -612,4 +612,19 @@ namespace Mist {
void OutHLS::sendTS(const char * tsData, unsigned int len) {
H.Chunkify(tsData, len, myConn);
}
void OutHLS::onFail(const std::string & msg, bool critical){
if (H.url.find(".m3u") == std::string::npos){
HTTPOutput::onFail(msg, critical);
return;
}
H.Clean(); //make sure no parts of old requests are left in any buffers
H.SetHeader("Server", "MistServer/" PACKAGE_VERSION);
H.setCORSHeaders();
H.SetHeader("Content-Type", "application/vnd.apple.mpegurl");
H.SetHeader("Cache-Control", "no-cache");
H.SetBody("#EXTM3U\r\n#EXT-X-ERROR: "+msg+"\r\n#EXT-X-ENDLIST\r\n");
H.SendResponse("200", "OK", myConn);
Output::onFail(msg, critical);
}
}

1
src/output/output_hls.h
View file

@ -11,6 +11,7 @@ namespace Mist {
void sendNext();
void onHTTP();
bool isReadyForPlay();
virtual void onFail(const std::string & msg, bool critical = false);
protected:
std::string h264init(const std::string & initData);
std::string h265init(const std::string & initData);