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

setstreamVodField and streamLiveField no longer mutually exclusive

Browse source 
Removed curPage map from IO. bufferFrame now creates this variable locally and passes it to bufferStart, bufferFinalize and bufferNext
Fix keyNum selection with mixed live & VoD data
Fix bufferframe to handle mixed VoD and live
Added check to bufferFrame to not start the countdown timer for removing live pages
Fixed countdown timer being set using keyNum rather than pageNumber, which resulted in the wrong pages being deleted
livePage variable moved from static to private variable to correctly handle multithreaded inputs

# Conflicts:
#	src/io.cpp
#	src/output/output.cpp
This commit is contained in:
Marco van Dijk 2021-11-22 10:47:34 +01:00 • committed by Thulinma
parent d1358400f7
commit 3d9ed39396
13 changed files with 241 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/output/output_mp4.cpp
View file

@ -243,7 +243,7 @@ namespace Mist{
+ 8 // MINF Box
+ 36 // DINF Box
+ 8; // STBL Box
if (M.getVod() && M.getFirstms(it->first) != firstms){
if (!M.getLive() && M.getFirstms(it->first) != firstms){
tmpRes += 12; // EDTS entry extra
}
@ -379,7 +379,7 @@ namespace Mist{
// Construct with duration of -1, as this is the default for fragmented
MP4::MVHD mvhdBox(-1);
// Then override it when we are not sending a VoD asset
if (M.getVod()){
if (!M.getLive()){
// calculating longest duration
uint64_t lastms = 0;
for (std::map<size_t, Comms::Users>::const_iterator it = userSelect.begin();
@ -413,7 +413,7 @@ namespace Mist{
MP4::ELST elstBox;
elstBox.setVersion(0);
elstBox.setFlags(0);
if (M.getVod() && M.getFirstms(it->first) != firstms){
if (!M.getLive() && M.getFirstms(it->first) != firstms){
elstBox.setCount(2);
elstBox.setSegmentDuration(0, M.getFirstms(it->first) - firstms);
@ -1161,7 +1161,7 @@ namespace Mist{
H.StartResponse("206", "Partial content", req, myConn);
}
}else{
if (M.getVod()){H.SetHeader("Content-Length", byteEnd - byteStart + 1);}
if (!M.getLive()){H.SetHeader("Content-Length", byteEnd - byteStart + 1);}
H.StartResponse("200", "OK", req, myConn);
}