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

Fixed a bug where non-video pageswitches were calculated wrong

Browse source
This commit is contained in:
Erik Zandvliet 2015-01-20 10:01:14 +01:00 • committed by Thulinma
parent 4a51a0e60e
commit c99e0bc3ef
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/output/output.cpp
View file

@ -564,6 +564,7 @@ namespace Mist {
} }
void Output::prepareNext(){ void Output::prepareNext(){
static int nonVideoCount = 0;
if (!sought){ if (!sought){
if (myMeta.live){ if (myMeta.live){
long unsigned int mainTrack = getMainSelectedTrack(); long unsigned int mainTrack = getMainSelectedTrack();
@ -661,7 +662,7 @@ namespace Mist {
if (currentPacket.getTime() != nxt.time && nxt.time){ if (currentPacket.getTime() != nxt.time && nxt.time){
DEBUG_MSG(DLVL_MEDIUM, "ACTUALLY Loaded track %ld (next=%lu), %llu ms", currentPacket.getTrackId(), nxtKeyNum[nxt.tid], currentPacket.getTime()); DEBUG_MSG(DLVL_MEDIUM, "ACTUALLY Loaded track %ld (next=%lu), %llu ms", currentPacket.getTrackId(), nxtKeyNum[nxt.tid], currentPacket.getTime());
} }
if (currentPacket.getFlag("keyframe")){ if ((myMeta.tracks[nxt.tid].type == "video" && currentPacket.getFlag("keyframe")) || (++nonVideoCount % 30 == 0)){
if (myMeta.live){ if (myMeta.live){
updateMeta(); updateMeta();
} }