Fix bug in Output::seek() when seeking to a timestamp that is between the last part of a key and the first part of the next key

src/input/input_dtsc.cpp

@@ -394,7 +394,7 @@ namespace Mist{
       tmpPos.seekTime = 0;
     }
     DTSC::Keys keys(M.keys(trackIdx));
-    uint32_t keyNum = keys.getNumForTime(ms);
+    uint32_t keyNum = M.getKeyNumForTime(trackIdx, ms);
     if (keys.getTime(keyNum) > tmpPos.seekTime){
       tmpPos.seekTime = keys.getTime(keyNum);
       tmpPos.bytePos = keys.getBpos(keyNum);

src/input/input_flv.cpp

@@ -163,7 +163,7 @@ namespace Mist{
     // keyframe. Flv files are never multi-track, so track 1 is video, track 2 is audio.
     size_t seekTrack = (idx == INVALID_TRACK_ID ? M.mainTrack() : idx);
     DTSC::Keys keys(M.keys(seekTrack));
-    uint32_t keyNum = keys.getNumForTime(seekTime);
+    uint32_t keyNum = M.getKeyNumForTime(seekTrack, seekTime);
     Util::fseek(inFile, keys.getBpos(keyNum), SEEK_SET);
   }
 }// namespace Mist

src/input/input_mp3.cpp

@@ -150,7 +150,7 @@ namespace Mist{
 
   void inputMP3::seek(uint64_t seekTime, size_t idx){
     DTSC::Keys keys(M.keys(idx));
-    uint32_t keyNum = keys.getNumForTime(seekTime);
+    uint32_t keyNum = M.getKeyNumForTime(idx, seekTime);
     fseek(inFile, keys.getBpos(keyNum), SEEK_SET);
     timestamp = keys.getTime(keyNum);
   }

src/input/input_ts.cpp

@@ -457,14 +457,14 @@ namespace Mist{
     readPMT();
     uint64_t seekPos = 0xFFFFFFFFull;
     if (idx != INVALID_TRACK_ID){
+      uint32_t keyNum = M.getKeyNumForTime(idx, seekTime);
       DTSC::Keys keys(M.keys(idx));
-      uint32_t keyNum = keys.getNumForTime(seekTime);
       seekPos = keys.getBpos(keyNum);
     }else{
       std::set<size_t> tracks = M.getValidTracks();
       for (std::set<size_t>::iterator it = tracks.begin(); it != tracks.end(); it++){
+        uint32_t keyNum = M.getKeyNumForTime(*it, seekTime);
         DTSC::Keys keys(M.keys(*it));
-        uint32_t keyNum = keys.getNumForTime(seekTime);
         uint64_t thisBPos = keys.getBpos(keyNum);
         if (thisBPos < seekPos){seekPos = thisBPos;}
       }

src/output/output.cpp

@@ -491,11 +491,11 @@ namespace Mist{
     }
     //Abort if the track is not loaded
     if (!M.trackLoaded(trk)){return 0;}
-    DTSC::Keys keys(M.keys(trk));
+    const DTSC::Keys &keys = M.keys(trk);
     //Abort if there are no keys
     if (!keys.getValidCount()){return 0;}
     //Get the key for the current time
-    size_t keyNum = keys.getNumForTime(lastPacketTime);
+    size_t keyNum = M.getKeyNumForTime(trk, lastPacketTime);
     if (keys.getEndValid() <= keyNum+1){return 0;}
     //Return the next key
     return keys.getTime(keyNum+1);
@@ -687,7 +687,7 @@ namespace Mist{
       }
       if (M.getType(mainTrack) == "video"){
         DTSC::Keys keys(M.keys(mainTrack));
-        size_t keyNum = keys.getNumForTime(pos);
+        size_t keyNum = M.getKeyNumForTime(mainTrack, pos);
         pos = keys.getTime(keyNum);
       }
     }
@@ -732,7 +732,7 @@ namespace Mist{
       return false;
     }
     DTSC::Keys keys(M.keys(tid));
-    size_t keyNum = keys.getNumForTime(pos);
+    size_t keyNum = M.getKeyNumForTime(tid, pos);
     uint64_t actualKeyTime = keys.getTime(keyNum);
     HIGH_MSG("Seeking to track %zu key %zu => time %" PRIu64, tid, keyNum, pos);
     if (actualKeyTime > pos){
@@ -1419,7 +1419,7 @@ namespace Mist{
     userSelect[mainTrack].reload(streamName, mainTrack);
     // now, seek to the exact timestamp of the keyframe
     DTSC::Keys keys(M.keys(mainTrack));
-    unsigned int targetKey = keys.getNumForTime(currTime);
+    size_t targetKey = M.getKeyNumForTime(mainTrack, currTime);
     seek(keys.getTime(targetKey));
     // attempt to load the key into thisPacket
     bool ret = prepareNext();
@@ -1547,11 +1547,11 @@ namespace Mist{
         dropTrack(nxt.tid, "end of VoD track reached", false);
         return true;
       }
-      DTSC::Keys keys(M.keys(nxt.tid));
-      size_t thisKey = keys.getNumForTime(nxt.time);
+      size_t thisKey = M.getKeyNumForTime(nxt.tid, nxt.time);
       //Check if there exists a different page for the next key
       size_t nextKeyPage = M.getPageNumberForKey(nxt.tid, thisKey + 1);
       if (nextKeyPage != INVALID_KEY_NUM && nextKeyPage != currentPage[nxt.tid]){
+        DTSC::Keys keys(M.keys(nxt.tid));
         // If so, the next key is our next packet
         nextTime = keys.getTime(thisKey + 1);
       }else{
@@ -1617,8 +1617,7 @@ namespace Mist{
     //Update keynum only when the second flips over in the timestamp
     //We do this because DTSC::Keys is pretty CPU-heavy
     if (nxt.time / 1000 < nextTime/1000){
-      DTSC::Keys keys(M.keys(nxt.tid));
-      size_t thisKey = keys.getNumForTime(nxt.time);
+      size_t thisKey = M.getKeyNumForTime(nxt.tid, nxt.time);
       userSelect[nxt.tid].setKeyNum(thisKey);
     }