Merge branch 'development' into LTS_development

# Conflicts:
#	src/input/input_buffer.cpp
#	src/output/output.cpp

src/input/input_buffer.cpp

@@ -327,7 +327,7 @@ namespace Mist {
         return false;
       }
     }
-    DEBUG_MSG(DLVL_HIGH, "Erasing key %d:%lu", tid, myMeta.tracks[tid].keys[0].getNumber());
+    HIGH_MSG("Erasing key %d:%lu", tid, myMeta.tracks[tid].keys[0].getNumber());
     //remove all parts of this key
     for (int i = 0; i < myMeta.tracks[tid].keys[0].getParts(); i++) {
       myMeta.tracks[tid].parts.pop_front();
@@ -346,7 +346,7 @@ namespace Mist {
     if (bufferLocations[tid].size() > 1) {
       //Check if the first key starts on the second page or higher
       if (myMeta.tracks[tid].keys[0].getNumber() >= (++(bufferLocations[tid].begin()))->first || !config->is_active){
-        DEBUG_MSG(DLVL_DEVEL, "Erasing track %d, keys %lu-%lu from buffer", tid, bufferLocations[tid].begin()->first, bufferLocations[tid].begin()->first + bufferLocations[tid].begin()->second.keyNum - 1);
+        HIGH_MSG("Erasing track %d, keys %lu-%lu from buffer", tid, bufferLocations[tid].begin()->first, bufferLocations[tid].begin()->first + bufferLocations[tid].begin()->second.keyNum - 1);
         bufferRemove(tid, bufferLocations[tid].begin()->first);
 
         nProxy.curPageNum.erase(tid);
@@ -358,7 +358,7 @@ namespace Mist {
 
         bufferLocations[tid].erase(bufferLocations[tid].begin());
       } else {
-        DEBUG_MSG(DLVL_HIGH, "%lu still on first page (%lu - %lu)", myMeta.tracks[tid].keys[0].getNumber(), bufferLocations[tid].begin()->first, bufferLocations[tid].begin()->first + bufferLocations[tid].begin()->second.keyNum - 1);
+        VERYHIGH_MSG("%lu still on first page (%lu - %lu)", myMeta.tracks[tid].keys[0].getNumber(), bufferLocations[tid].begin()->first, bufferLocations[tid].begin()->first + bufferLocations[tid].begin()->second.keyNum - 1);
       }
     }
     return true;

src/io.cpp

@@ -298,6 +298,10 @@ namespace Mist {
   void negotiationProxy::bufferNext(DTSC::Packet & pack, DTSC::Meta & myMeta) {
     //Save the trackid of the track for easier access
     unsigned long tid = pack.getTrackId();
+    if (pack.getTime() < myMeta.tracks[tid].lastms){
+      INFO_MSG("Wrong order packet ignored: %lu < %lu", pack.getTime(), myMeta.tracks[tid].lastms);
+      return;
+    }
     unsigned long mapTid = trackMap[tid];
     //Do nothing if no page is opened for this track
     if (!curPage.count(tid)) {
@@ -524,7 +528,7 @@ namespace Mist {
       if (tmpIt->second.curOffset > FLIP_DATA_PAGE_SIZE || packet.getTime() - tmpIt->second.firstTime > FLIP_TARGET_DURATION) { 
         //Create the book keeping data for the new page
         nextPageNum = tmpIt->second.pageNum + tmpIt->second.keyNum;
-        INFO_MSG("We should go to next page now, transition from %lu to %d", tmpIt->second.pageNum, nextPageNum);
+        HIGH_MSG("We should go to next page now, transition from %lu to %d", tmpIt->second.pageNum, nextPageNum);
         pagesByTrack[tid][nextPageNum].dataSize = DEFAULT_DATA_PAGE_SIZE;
         pagesByTrack[tid][nextPageNum].pageNum = nextPageNum;
         pagesByTrack[tid][nextPageNum].firstTime = packet.getTime();

src/output/output.cpp

@@ -20,6 +20,10 @@
 #include <netdb.h>
 /*LTS-END*/
 
+#ifndef MIN_DELAY
+#define MIN_DELAY 2500
+#endif
+
 namespace Mist {
   JSON::Value Output::capa = JSON::Value();
 
@@ -538,6 +542,12 @@ namespace Mist {
     VERYHIGH_MSG("Page %s loaded for %s", id, streamName.c_str());
   }
 
+  ///Return the current time of the media buffer, or 0 if no buffer available.
+  uint64_t Output::currentTime(){
+    if (!buffer.size()){return 0;}
+    return buffer.begin()->time;
+  }
+  
   /// Prepares all tracks from selectedTracks for seeking to the specified ms position.
   void Output::seek(unsigned long long pos){
     sought = true;
@@ -883,7 +893,7 @@ namespace Mist {
 
   /// This function decides where in the stream initial playback starts.
   /// The default implementation calls seek(0) for VoD.
-  /// For live, it seeks to the last sync'ed keyframe of the main track, no closer than 2.5s from the end.
+  /// For live, it seeks to the last sync'ed keyframe of the main track, no closer than MIN_DELAY ms from the end.
   /// Unless lastms < 5000, then it seeks to the first keyframe of the main track.
   /// Aborts if there is no main track or it has no keyframes.
   void Output::initialSeek(){
@@ -899,7 +909,7 @@ namespace Mist {
         bool good = true;
         //check if all tracks have data for this point in time
         for (std::set<unsigned long>::iterator ti = selectedTracks.begin(); ti != selectedTracks.end(); ++ti){
-          if (myMeta.tracks[*ti].lastms < seekPos+2500){good = false; break;}
+          if (myMeta.tracks[*ti].lastms < seekPos+MIN_DELAY){good = false; break;}
           if (mainTrack == *ti){continue;}//skip self
           if (!myMeta.tracks.count(*ti)){
             HIGH_MSG("Skipping track %lu, not in tracks", *ti);
@@ -1039,8 +1049,8 @@ namespace Mist {
       }
       stats();
     }
-    onFinish();
     MEDIUM_MSG("MistOut client handler shutting down: %s, %s, %s", myConn.connected() ? "conn_active" : "conn_closed", wantRequest ? "want_request" : "no_want_request", parseData ? "parsing_data" : "not_parsing_data");
+    onFinish();
     
     /*LTS-START*/
     if(Triggers::shouldTrigger("CONN_CLOSE", streamName)){
@@ -1233,12 +1243,12 @@ namespace Mist {
     if (thisPacket.getTime() != nxt.time && nxt.time && !atLivePoint){
       static int warned = 0;
       if (warned < 5){
-        WARN_MSG("Loaded %s track %ld@%llu in stead of %u@%llu (%dms, %s)", streamName.c_str(), thisPacket.getTrackId(), thisPacket.getTime(), nxt.tid, nxt.time, (int)((long long)thisPacket.getTime() - (long long)nxt.time), myMeta.tracks[nxt.tid].codec.c_str());
+        WARN_MSG("Loaded %s track %ld@%llu instead of %u@%llu (%dms, %s, offset %lu)", streamName.c_str(), thisPacket.getTrackId(), thisPacket.getTime(), nxt.tid, nxt.time, (int)((long long)thisPacket.getTime() - (long long)nxt.time), myMeta.tracks[nxt.tid].codec.c_str(), nxt.offset);
         if (++warned == 5){
           WARN_MSG("Further warnings about time mismatches printed on HIGH level.");
         }
       }else{
-        HIGH_MSG("Loaded %s track %ld@%llu in stead of %u@%llu (%dms, %s)", streamName.c_str(), thisPacket.getTrackId(), thisPacket.getTime(), nxt.tid, nxt.time, (int)((long long)thisPacket.getTime() - (long long)nxt.time), myMeta.tracks[nxt.tid].codec.c_str());
+        HIGH_MSG("Loaded %s track %ld@%llu instead of %u@%llu (%dms, %s, offset %lu)", streamName.c_str(), thisPacket.getTrackId(), thisPacket.getTime(), nxt.tid, nxt.time, (int)((long long)thisPacket.getTime() - (long long)nxt.time), myMeta.tracks[nxt.tid].codec.c_str(), nxt.offset);
       }
     }
 
@@ -1257,7 +1267,9 @@ namespace Mist {
         nxtKeyNum[nxt.tid] = getKeyForTime(nxt.tid, thisPacket.getTime());
       }
       if (myMeta.tracks[nxt.tid].getKey(nxtKeyNum[nxt.tid]).getTime() != thisPacket.getTime()){
-        WARN_MSG("Keyframe value is not correct - state will now be inconsistent.");
+        WARN_MSG("Keyframe value is not correct (%llu != %llu) - state will now be inconsistent; resetting", myMeta.tracks[nxt.tid].getKey(nxtKeyNum[nxt.tid]).getTime(), thisPacket.getTime());
+        initialSeek();
+        return false;
       }
       EXTREME_MSG("Track %u @ %llums = key %lu", nxt.tid, thisPacket.getTime(), nxtKeyNum[nxt.tid]);
     }

src/output/output.h

@@ -58,6 +58,7 @@ namespace Mist {
       void seek(unsigned long long pos);
       bool seek(unsigned int tid, unsigned long long pos, bool getNextKey = false);
       void stop();
+      uint64_t currentTime();
       void setBlocking(bool blocking);
       long unsigned int getMainSelectedTrack();
       void updateMeta();

src/output/output_rtmp.cpp

@@ -657,6 +657,7 @@ namespace Mist {
       amfreply.getContentP(3)->addContent(AMF::Object("details", "DDV"));
       amfreply.getContentP(3)->addContent(AMF::Object("clientid", (double)1337));
       sendCommand(amfreply, 20, 1);
+      stop();
       return;
     }
     if (amfData.getContentP(0)->StrValue() == "deleteStream") {
@@ -896,13 +897,8 @@ namespace Mist {
       amfreply.getContentP(3)->addContent(AMF::Object("description", "Playing!"));
       amfreply.getContentP(3)->addContent(AMF::Object("details", "DDV"));
       amfreply.getContentP(3)->addContent(AMF::Object("clientid", (double)1337));
-      uint64_t earliestTime = 0xffffffffffffffff;
+      initialSeek();
-      for (std::set<unsigned long>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){
+      rtmpOffset = currentTime();
-        if (myMeta.tracks.count(*it) && myMeta.tracks[*it].firstms < earliestTime){
-          earliestTime = myMeta.tracks[*it].firstms;
-        }
-      }
-      rtmpOffset = earliestTime;
       amfreply.getContentP(3)->addContent(AMF::Object("timecodeOffset", (double)rtmpOffset));
       sendCommand(amfreply, playMessageType, playStreamId);
       RTMPStream::chunk_snd_max = 10240000; //10000KiB
@@ -961,13 +957,8 @@ namespace Mist {
       amfreply.getContentP(3)->addContent(AMF::Object("description", "Playing!"));
       amfreply.getContentP(3)->addContent(AMF::Object("details", "DDV"));
       amfreply.getContentP(3)->addContent(AMF::Object("clientid", (double)1337));
-      uint64_t earliestTime = 0xffffffffffffffff;
+      initialSeek();
-      for (std::set<unsigned long>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){
+      rtmpOffset = currentTime();
-        if (myMeta.tracks.count(*it) && myMeta.tracks[*it].firstms < earliestTime){
-          earliestTime = myMeta.tracks[*it].firstms;
-        }
-      }
-      rtmpOffset = earliestTime;
       amfreply.getContentP(3)->addContent(AMF::Object("timecodeOffset", (double)rtmpOffset));
       sendCommand(amfreply, playMessageType, playStreamId);
       RTMPStream::chunk_snd_max = 10240000; //10000KiB