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

DASH fix

Browse source
This commit is contained in:
Thulinma 2019-04-25 17:04:05 +02:00
parent b8415d09c6
commit 74dfe6a329
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/output/output_dash_mp4.cpp
View file

@ -506,7 +506,6 @@ namespace Mist{
} }
H.SetBody(buildManifest()); H.SetBody(buildManifest());
H.SendResponse("200", "OK", myConn); H.SendResponse("200", "OK", myConn);
DEVEL_MSG("Manifest sent");
H.Clean(); H.Clean();
return; return;
} }
@ -520,7 +519,6 @@ namespace Mist{
H.Clean(); H.Clean();
return; return;
} }
DTSC::Track & Trk = myMeta.tracks[tid];
H.Clean(); H.Clean();
H.SetHeader("Content-Type", "video/mp4"); H.SetHeader("Content-Type", "video/mp4");
H.SetHeader("Cache-Control", "no-cache"); H.SetHeader("Cache-Control", "no-cache");
@ -534,7 +532,7 @@ namespace Mist{
if (url.find("init.m4s") != std::string::npos){ if (url.find("init.m4s") != std::string::npos){
//init segment //init segment
if (Trk.type == "video"){ if (myMeta.tracks[tid].type == "video"){
H.Chunkify("\000\000\000\040ftypisom\000\000\000\000isomavc1mp42dash", 32, myConn); H.Chunkify("\000\000\000\040ftypisom\000\000\000\000isomavc1mp42dash", 32, myConn);
}else{ }else{
H.Chunkify("\000\000\000\040ftypisom\000\000\000\000isomM4A mp42dash", 32, myConn); H.Chunkify("\000\000\000\040ftypisom\000\000\000\000isomM4A mp42dash", 32, myConn);
@ -548,9 +546,24 @@ namespace Mist{
//data segment //data segment
pos = url.find("_", pos + 1) + 1; pos = url.find("_", pos + 1) + 1;
uint64_t timeStamp = atoll(url.substr(pos).c_str()); uint64_t timeStamp = atoll(url.substr(pos).c_str());
uint32_t fragIndice = Trk.timeToFragnum(timeStamp); uint32_t fragIndice = myMeta.tracks[tid].timeToFragnum(timeStamp);
uint32_t fragNum = Trk.fragments[fragIndice].getNumber(); uint32_t fragNum = myMeta.tracks[tid].fragments[fragIndice].getNumber();
HIGH_MSG("Getting T%llu for track %lu, indice %lu, number %lu", timeStamp, tid, fragIndice, fragNum); HIGH_MSG("Getting T%llu for track %lu, indice %lu, number %lu", timeStamp, tid, fragIndice, fragNum);
if (myMeta.live && !myMeta.tracks[tid].fragments[fragIndice].getDuration()){
size_t ctr = 0;
do {
if (ctr){Util::sleep(250);}
updateMeta();
stats();
}while(!myMeta.tracks[tid].fragments[fragIndice].getDuration() && ++ctr < 120);
if (!myMeta.tracks[tid].fragments[fragIndice].getDuration()){
WARN_MSG("Sending zero-length segment. This should never happen.");
H.SendResponse("404", "Segment download error", myConn);
H.Clean();
return;
}
}
DTSC::Track & Trk = myMeta.tracks[tid];
H.Chunkify("\000\000\000\030stypmsdh\000\000\000\000msdhmsix", 24, myConn); H.Chunkify("\000\000\000\030stypmsdh\000\000\000\000msdhmsix", 24, myConn);
MP4::SIDX sidxBox; MP4::SIDX sidxBox;
sidxBox.setReferenceID(1); sidxBox.setReferenceID(1);