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

Fix empty segment being written, fix playlist updating at all when no data was written

Browse source
This commit is contained in:
Thulinma 2023-06-05 12:19:25 +02:00
parent c70fadd66f
commit 963d7846a8
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/output/output.cpp
View file

@ -1863,21 +1863,25 @@ namespace Mist{
} }
onFinish(); onFinish();
// Write last segment // Write last segment
if (targetParams.count("m3u8")){ if (targetParams.count("m3u8") && (firstPacketTime != 0xFFFFFFFFFFFFFFFFull) && (lastPacketTime - firstPacketTime > 0)){
// If this is a non-live source, we can finally open up the connection to the playlist file // If this is a non-live source, we can finally open up the connection to the playlist file
if (!M.getLive()){connectToFile(playlistLocationString, false, &plsConn);} if (!M.getLive()){connectToFile(playlistLocationString, false, &plsConn);}
if (plsConn){ if (plsConn){
if (lastPacketTime - currentStartTime > 0){
std::string segment = HTTP::localURIResolver().link(currentTarget).getLinkFrom(playlistLocation); std::string segment = HTTP::localURIResolver().link(currentTarget).getLinkFrom(playlistLocation);
INFO_MSG("Adding final segment `%s` of %" PRIu64 "ms to playlist '%s'", segment.c_str(), lastPacketTime - currentStartTime, playlistLocationString.c_str());
if (M.getLive()){ if (M.getLive()){
uint64_t unixMs = M.getBootMsOffset() + systemBoot + currentStartTime; uint64_t unixMs = M.getBootMsOffset() + systemBoot + currentStartTime;
playlistBuffer += "#EXT-X-PROGRAM-DATE-TIME:" + Util::getUTCStringMillis(unixMs) + "\n"; playlistBuffer += "#EXT-X-PROGRAM-DATE-TIME:" + Util::getUTCStringMillis(unixMs) + "\n";
} }
INFO_MSG("Adding final segment `%s` of %" PRIu64 "ms to playlist '%s'", segment.c_str(), lastPacketTime - currentStartTime, playlistLocationString.c_str());
// Append duration & TS filename to playlist file // Append duration & TS filename to playlist file
std::stringstream tmp; std::stringstream tmp;
tmp << "#EXTINF:" << std::fixed << std::setprecision(3) << (lastPacketTime - currentStartTime) / 1000.0 << ",\n"+ segment + "\n"; tmp << "#EXTINF:" << std::fixed << std::setprecision(3) << (lastPacketTime - currentStartTime) / 1000.0 << ",\n"+ segment + "\n";
if (!M.getLive() || (!maxEntries && !targetAge)){tmp << "#EXT-X-ENDLIST\n";}
playlistBuffer += tmp.str(); playlistBuffer += tmp.str();
}
if (!M.getLive() || (!maxEntries && !targetAge)){playlistBuffer += "#EXT-X-ENDLIST\n";}
// Remove older entries in the playlist // Remove older entries in the playlist
if (maxEntries || targetAge){ if (maxEntries || targetAge){
uint64_t unixMs = M.getBootMsOffset() + systemBoot + currentStartTime; uint64_t unixMs = M.getBootMsOffset() + systemBoot + currentStartTime;
@ -1890,7 +1894,7 @@ namespace Mist{
}else if(connectToFile(playlistLocationString, false, &plsConn)){ }else if(connectToFile(playlistLocationString, false, &plsConn)){
plsConn.SendNow(playlistBuffer); plsConn.SendNow(playlistBuffer);
} }
playlistBuffer = ""; playlistBuffer.clear();
}else{ }else{
FAIL_MSG("Lost connection to the playlist file `%s` during segmenting", playlistLocationString.c_str()); FAIL_MSG("Lost connection to the playlist file `%s` during segmenting", playlistLocationString.c_str());
Util::logExitReason("Lost connection to the playlist file `%s` during segmenting", playlistLocationString.c_str()); Util::logExitReason("Lost connection to the playlist file `%s` during segmenting", playlistLocationString.c_str());