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

Working live HLS.

Browse source
This commit is contained in:
Thulinma 2013-03-05 17:23:31 +01:00
parent d1e26d6848
commit de1b9441ef
1 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/conn_http_live.cpp
View file

@ -59,7 +59,7 @@ namespace Connector_HTTP {
longestFragment = fragDuration; longestFragment = fragDuration;
} }
} }
if (metadata.isMember("length") && metadata["length"].asInt() > 0){ if (metadata.isMember("vod")){
Result << "#EXTM3U\r\n" Result << "#EXTM3U\r\n"
//"#EXT-X-VERSION:1\r\n" //"#EXT-X-VERSION:1\r\n"
//"#EXT-X-ALLOW-CACHE:YES\r\n" //"#EXT-X-ALLOW-CACHE:YES\r\n"
@ -74,19 +74,17 @@ namespace Connector_HTTP {
} }
Result << "#EXT-X-ENDLIST"; Result << "#EXT-X-ENDLIST";
}else{ }else{
std::cerr << metadata["frags"].toPrettyString() << std::endl;
Result << "#EXTM3U\r\n" Result << "#EXTM3U\r\n"
"#EXT-X-MEDIA-SEQUENCE:0\r\n" "#EXT-X-MEDIA-SEQUENCE:" << metadata["missed_frags"].asInt() <<"\r\n"
"#EXT-X-TARGETDURATION:" << (longestFragment / 1000) + 1 << "\r\n"; "#EXT-X-TARGETDURATION:10\r\n";
int lastDuration = 0; for (JSON::ArrIter ai = metadata["frags"].ArrBegin(); ai != metadata["frags"].ArrEnd(); ai++){
for (int i = 0; i < fragIndices.size() - 1; i++){ Result << "#EXTINF:" << (*ai)["dur"].asInt() / 1000 << ", no desc\r\n" << (*ai)["num"].asInt() << "_" << (*ai)["len"].asInt() << ".ts\r\n";
Result << "#EXTINF:" << (metadata["keytime"][fragIndices[i + 1]].asInt() - lastDuration) / 1000 << ", no desc\r\n" << fragIndices[i] + 1
<< "_" << fragIndices[i + 1] - fragIndices[i] << ".ts\r\n";
lastDuration = metadata["keytime"][fragIndices[i + 1]].asInt();
} }
} }
#if DEBUG >= 8 //#if DEBUG >= 8
std::cerr << "Sending this index:" << std::endl << Result.str() << std::endl; std::cerr << "Sending this index:" << std::endl << Result.str() << std::endl;
#endif //#endif
return Result.str(); return Result.str();
} //BuildIndex } //BuildIndex
@ -241,16 +239,6 @@ namespace Connector_HTTP {
} }
if (ss.spool()){ if (ss.spool()){
while (Strm.parsePacket(ss.Received())){ while (Strm.parsePacket(ss.Received())){
if (Strm.getPacket(0).isMember("time")){
if ( !Strm.metadata.isMember("firsttime")){
Strm.metadata["firsttime"] = Strm.getPacket(0)["time"];
}else{
if ( !Strm.metadata.isMember("length") || Strm.metadata["length"].asInt() == 0){
Strm.getPacket(0)["time"] = Strm.getPacket(0)["time"].asInt() - Strm.metadata["firsttime"].asInt();
}
}
Strm.metadata["lasttime"] = Strm.getPacket(0)["time"];
}
if (pending_manifest){ if (pending_manifest){
HTTP_S.Clean(); HTTP_S.Clean();
HTTP_S.protocol = "HTTP/1.1"; HTTP_S.protocol = "HTTP/1.1";