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

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/output/output.cpp
This commit is contained in:
Thulinma 2018-08-30 13:53:21 +02:00
commit c392e3f6f9
3 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/output/output.cpp
View file

@ -503,7 +503,7 @@ namespace Mist{
continue;
}
//autoSeeking and target not in bounds? Drop it too.
if (autoSeek && myMeta.tracks[*it].lastms < seekTarget - 6000){
if (autoSeek && myMeta.tracks[*it].lastms < std::max(seekTarget, 6000lu) - 6000){
toRemove.insert(*it);
}
}
@ -584,7 +584,7 @@ namespace Mist{
if (myMeta.live){
for (std::map<unsigned int, DTSC::Track>::reverse_iterator trit = myMeta.tracks.rbegin(); trit != myMeta.tracks.rend(); trit++){
if ((!byType && trit->second.codec == strRef.substr(shift)) || (byType && trit->second.type == strRef.substr(shift)) || strRef.substr(shift) == "*"){
if (autoSeek && trit->second.lastms < seekTarget - 6000){continue;}
if (autoSeek && trit->second.lastms < std::max(seekTarget, 6000lu) - 6000){continue;}
/*LTS-START*/
if (noSelAudio && trit->second.type == "audio"){continue;}
if (noSelVideo && trit->second.type == "video"){continue;}
@ -598,7 +598,7 @@ namespace Mist{
}else{
for (std::map<unsigned int, DTSC::Track>::iterator trit = myMeta.tracks.begin(); trit != myMeta.tracks.end(); trit++){
if ((!byType && trit->second.codec == strRef.substr(shift)) || (byType && trit->second.type == strRef.substr(shift)) || strRef.substr(shift) == "*"){
if (autoSeek && trit->second.lastms < seekTarget - 6000){continue;}
if (autoSeek && trit->second.lastms < std::max(seekTarget, 6000lu) - 6000){continue;}
/*LTS-START*/
if (noSelAudio && trit->second.type == "audio"){continue;}
if (noSelVideo && trit->second.type == "video"){continue;}
@ -645,6 +645,7 @@ namespace Mist{
void Output::stop(){
buffer.clear();
parseData = false;
sought = false;
}
unsigned int Output::getKeyForTime(long unsigned int trackId, long long timeStamp){