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

Fixed HLS (some more)

Browse source
This commit is contained in:
Erik Zandvliet 2014-10-06 14:54:19 +02:00
parent 480bda3f67
commit b6e4e0243e
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/output/output_hls.cpp
View file

@ -57,7 +57,11 @@ namespace Mist {
for (std::deque<DTSC::Fragment>::iterator it = myMeta.tracks[tid].fragments.begin(); it != myMeta.tracks[tid].fragments.end(); it++){ for (std::deque<DTSC::Fragment>::iterator it = myMeta.tracks[tid].fragments.begin(); it != myMeta.tracks[tid].fragments.end(); it++){
long long int starttime = myMeta.tracks[tid].getKey(it->getNumber()).getTime(); long long int starttime = myMeta.tracks[tid].getKey(it->getNumber()).getTime();
std::stringstream line; std::stringstream line;
line << "#EXTINF:" << ((it->getDuration() + 500) / 1000) << ", no desc\r\n" << starttime << "_" << it->getDuration() + starttime << ".ts\r\n"; long long duration = it->getDuration();
if (duration < 0){
duration = myMeta.tracks[tid].lastms - starttime;
}
line << "#EXTINF:" << ((duration + 500) / 1000) << ", no desc\r\n" << starttime << "_" << duration + starttime << ".ts\r\n";
lines.push_back(line.str()); lines.push_back(line.str());
} }
@ -293,6 +297,10 @@ namespace Mist {
continue; continue;
} //crossdomain.xml } //crossdomain.xml
if (HTTP_R.url.find("hls") == std::string::npos){
myConn.close();
continue;
}
AppleCompat = (HTTP_R.GetHeader("User-Agent").find("Apple") != std::string::npos); AppleCompat = (HTTP_R.GetHeader("User-Agent").find("Apple") != std::string::npos);
initialize(); initialize();