Merge branch 'development' into LTS_development

lib/dtsc.h

@@ -353,6 +353,8 @@ namespace DTSC {
       void toPrettyString(std::ostream & str, int indent = 0, int verbosity = 0);
       //members:
       std::map<unsigned int, Track> tracks;
+      Track & mainTrack();
+      uint32_t biggestFragment();
       bool vod;
       bool live;
       bool merged;

lib/dtscmeta.cpp

@@ -1417,6 +1417,28 @@ namespace DTSC {
     }
   }
 
+  /// Returns a reference to the first video track, or the first track.
+  /// Beware: returns a reference to invalid memory if there are no tracks!
+  /// Will print a WARN-level message if this is the case.
+  Track & Meta::mainTrack(){
+    if (!tracks.size()){
+      WARN_MSG("Returning nonsense reference - crashing is likely");
+      return tracks.begin()->second;
+    }
+    for (std::map<unsigned int, Track>::iterator it = tracks.begin(); it != tracks.end(); it++) {
+      if (it->second.type == "video"){
+        return it->second;
+      }
+    }
+    return tracks.begin()->second;
+  }
+
+  /// Returns 0 if there are no tracks, otherwise calls mainTrack().biggestFragment().
+  uint32_t Meta::biggestFragment(){
+    if (!tracks.size()){return 0;}
+    return mainTrack().biggestFragment();
+  }
+
   ///\brief Converts a track to a human readable string
   ///\param str The stringstream to append to
   ///\param indent the amount of indentation needed

src/input/input.cpp

@@ -207,7 +207,7 @@ namespace Mist {
     DEBUG_MSG(DLVL_DEVEL, "Input for stream %s started", streamName.c_str());
 
     long long int activityCounter = Util::bootSecs();
-    while ((Util::bootSecs() - activityCounter) < INPUT_TIMEOUT && config->is_active) { //15 second timeout
+    while (((Util::bootSecs() - activityCounter) < INPUT_TIMEOUT || (myMeta.live && (Util::bootSecs() - activityCounter) < myMeta.biggestFragment()/500)) && config->is_active) { //15 second timeout
       userPage.parseEach(callbackWrapper);
       removeUnused();
       if (userPage.connectedUsers) {

src/input/input_buffer.cpp

@@ -289,14 +289,14 @@ namespace Mist {
       return false;
     }
     if (config->is_active && Trk.fragments.size() > 2){
-      ///Make sure we have at least 3X the target duration.
+      ///Make sure we have at least 8X the target duration.
       //The target duration is the biggest fragment, rounded up to whole seconds.
       uint32_t targetDuration = (Trk.biggestFragment() / 1000 + 1) * 1000;
       //The start is the third fragment's begin
       uint32_t fragStart = Trk.getKey((++(++Trk.fragments.begin()))->getNumber()).getTime();
       //The end is the last fragment's begin
       uint32_t fragEnd = Trk.getKey(Trk.fragments.rbegin()->getNumber()).getTime();
-      if ((fragEnd - fragStart) < targetDuration * 3){
+      if ((fragEnd - fragStart) < targetDuration * 8){
         return false;
       }
     }
@@ -915,7 +915,7 @@ namespace Mist {
     }
     //if the new value is different, print a message and apply it
     if (resumeMode != (bool)tmpNum) {
-      DEBUG_MSG(DLVL_DEVEL, "Setting resume mode from %s to new value of %s", resumeMode ? "enabled" : "disabled", tmpNum ? "enabled" : "disabled");
+      INFO_MSG("Setting resume mode from %s to new value of %s", resumeMode ? "enabled" : "disabled", tmpNum ? "enabled" : "disabled");
       resumeMode = tmpNum;
     }
 

src/input/input_dtsc.cpp

@@ -26,6 +26,20 @@ namespace Mist {
     capa["codecs"][0u][1u].append("AAC");
     capa["codecs"][0u][1u].append("MP3");
     capa["codecs"][0u][1u].append("vorbis");
+
+
+    JSON::Value option;
+    option["arg"] = "integer";
+    option["long"] = "buffer";
+    option["short"] = "b";
+    option["help"] = "Live stream DVR buffer time in ms";
+    option["value"].append(50000LL);
+    config->addOption("bufferTime", option);
+    capa["optional"]["DVR"]["name"] = "Buffer time (ms)";
+    capa["optional"]["DVR"]["help"] = "The target available buffer time for this live stream, in milliseconds. This is the time available to seek around in, and will automatically be extended to fit whole keyframes as well as the minimum duration needed for stable playback.";
+    capa["optional"]["DVR"]["option"] = "--buffer";
+    capa["optional"]["DVR"]["type"] = "uint";
+    capa["optional"]["DVR"]["default"] = 50000LL;
   }
 
   bool inputDTSC::needsLock(){

src/io.cpp

@@ -189,6 +189,7 @@ namespace Mist {
       }
       if (!inserted){
         FAIL_MSG("Could not insert page in track index. Aborting.");
+        curPage[tid].master = true;//set this page for instant-deletion when we're done with it
         return false;
       }
     }
@@ -303,6 +304,7 @@ namespace Mist {
     static bool multiWrong = false;
     //Save the trackid of the track for easier access
     unsigned long tid = pack.getTrackId();
+    //these checks were already done in bufferSinglePacket, but we check again just to be sure
     if (myMeta.live && pack.getTime() > 0xFFFF0000 && !myMeta.tracks[tid].lastms){
       return;//ignore bullshit timestamps
     }
@@ -435,14 +437,17 @@ namespace Mist {
 
     //Print a message about registering the page or not.
     if (!inserted) {
-      FAIL_MSG("Can't register page %lu on the metaPage of track %lu~>%lu, No empty spots left within 'should be' amount of slots", curPageNum[tid], tid, mapTid);
+      FAIL_MSG("Can't register %lu on the metaPage of %s track %lu~>%lu, No empty spots left. Deleting.", curPageNum[tid], streamName.c_str(), tid, mapTid);
+      //Since the buffer can't see it - we should delete it ourselves, now.
+      curPage[tid].master = true;
     } else {
-      HIGH_MSG("Succesfully registered page %lu on the metaPage of track %lu~>%lu.", curPageNum[tid], tid, mapTid);
+      HIGH_MSG("Registered %lu on the metaPage of %s track %lu~>%lu.", curPageNum[tid], streamName.c_str(), tid, mapTid);
+#if defined(__CYGWIN__) || defined(_WIN32)
+      IPC::preservePage(curPage[tid].name);
+#endif
     }
     //Close our link to the page. This will NOT destroy the shared page, as we've set master to false upon construction
-#if defined(__CYGWIN__) || defined(_WIN32)
-    IPC::preservePage(curPage[tid].name);
-#endif
+    //Note: if there was a registering failure above, this WILL destroy the shared page, to prevent a memory leak
     curPage.erase(tid);
     curPageNum.erase(tid);
   }
@@ -522,6 +527,19 @@ namespace Mist {
         }
       }
     }
+
+    //For live streams, ignore packets that make no sense
+    //This also happens in bufferNext, with the same rules
+    if (myMeta.live){
+      if (packet.getTime() > 0xFFFF0000 && !myMeta.tracks[tid].lastms){
+        return;//ignore bullshit timestamps
+      }
+      if (packet.getTime() < myMeta.tracks[tid].lastms){
+        HIGH_MSG("Wrong order on track %lu ignored: %lu < %lu", tid, packet.getTime(), myMeta.tracks[tid].lastms);
+        return;
+      }
+    }
+
     //Determine if we need to open the next page
     int nextPageNum = -1;
     if (isKeyframe && trackState[tid] == FILL_ACC) {
@@ -566,7 +584,11 @@ namespace Mist {
         bufferFinalize(tid, myMeta);
       }
       //Open the new page
-      bufferStart(tid, nextPageNum, myMeta);
+      if (!bufferStart(tid, nextPageNum, myMeta)){
+        //if this fails, return instantly without actually buffering the packet
+        WARN_MSG("Dropping packet %s:%llu@%llu", streamName.c_str(), tid, packet.getTime());
+        return;
+      }
     }
     //Buffer the packet
     bufferNext(packet, myMeta);