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

Fixed various HLS problems with LQ/short inputs

Browse source
This commit is contained in:
Thulinma 2015-03-06 11:19:32 +01:00
parent ff049f4ea2
commit 260a0ceb68
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/output/output_hls.cpp
View file

@ -20,6 +20,9 @@ namespace Mist {
for (std::map<unsigned int,DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++){ for (std::map<unsigned int,DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++){
if (it->second.codec == "H264"){ if (it->second.codec == "H264"){
int bWidth = it->second.bps * 2; int bWidth = it->second.bps * 2;
if (bWidth < 5){
bWidth = 5;
}
if (audioId != -1){ if (audioId != -1){
bWidth += myMeta.tracks[audioId].bps * 2; bWidth += myMeta.tracks[audioId].bps * 2;
} }
@ -49,6 +52,9 @@ namespace Mist {
longestFragment = it->getDuration(); longestFragment = it->getDuration();
} }
} }
if ((myMeta.tracks[tid].lastms - myMeta.tracks[tid].firstms) / myMeta.tracks[tid].fragments.size() > longestFragment){
longestFragment = (myMeta.tracks[tid].lastms - myMeta.tracks[tid].firstms) / myMeta.tracks[tid].fragments.size();
}
result << "#EXTM3U\r\n#EXT-X-TARGETDURATION:" << (longestFragment / 1000) + 1 << "\r\n"; result << "#EXTM3U\r\n#EXT-X-TARGETDURATION:" << (longestFragment / 1000) + 1 << "\r\n";
std::deque<std::string> lines; std::deque<std::string> lines;