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

MP4 keyframe problem fixed

Browse source
This commit is contained in:
ozzay 2015-10-27 10:34:35 +01:00 • committed by Thulinma
parent d504bbe720
commit e0ab83e61c
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/input/input_mp4.cpp
View file

@ -585,13 +585,14 @@ namespace Mist {
curPositions.erase(curPositions.begin()); curPositions.erase(curPositions.begin());
bool isKeyframe = false; bool isKeyframe = false;
if(nextKeyframe[curPart.trackID] < myMeta.tracks[curPart.trackID].keys.size()){ if(nextKeyframe[curPart.trackID] < myMeta.tracks[curPart.trackID].keys.size()){//should almost always be true, simple check to make sure we are not checking outside the keyframe array table
///\todo These 2 ifs are practically the same check, merge these when we are busy cleaning up the code.
//checking if this is a keyframe //checking if this is a keyframe
if (myMeta.tracks[curPart.trackID].type == "video" && (long long int) curPart.time == myMeta.tracks[curPart.trackID].keys[(nextKeyframe[curPart.trackID])].getTime()){ if (myMeta.tracks[curPart.trackID].type == "video" && (long long int) curPart.time == myMeta.tracks[curPart.trackID].keys[(nextKeyframe[curPart.trackID])].getTime()){
isKeyframe = true; isKeyframe = true;
} }
//if a keyframe has passed, we find the next keyframe //if a keyframe has passed, we find the next keyframe
if (myMeta.tracks[curPart.trackID].keys[(nextKeyframe[curPart.trackID])].getTime() < (long long int)curPart.time){ if (myMeta.tracks[curPart.trackID].keys[(nextKeyframe[curPart.trackID])].getTime() <= (long long int)curPart.time){
nextKeyframe[curPart.trackID] ++; nextKeyframe[curPart.trackID] ++;
} }
} }