Processes can no longer select tracks that they created themselves

Author: Thulinma

lib/defines.h

@@ -181,7 +181,7 @@ static inline void show_stackframe(){}
 #define META_META_RECORDSIZE 548
 
 #define META_TRACK_OFFSET 148
-#define META_TRACK_RECORDSIZE 1893
+#define META_TRACK_RECORDSIZE 1897
 
 #define TRACK_TRACK_OFFSET 200
 #define TRACK_TRACK_RECORDSIZE 1049068

lib/dtsc.cpp

@@ -915,6 +915,7 @@ namespace DTSC{
 
   /// Initialize metadata from referenced DTSC::Scan object in master mode.
   Meta::Meta(const std::string &_streamName, const DTSC::Scan &src){
+    ignoredPid = 0;
     version = DTSH_VERSION;
     streamMemBuf = 0;
     isMemBuf = false;
@@ -926,6 +927,7 @@ namespace DTSC{
   /// Initialize empty metadata, in master or slave mode.
   /// If stream name is empty, slave mode is enforced.
   Meta::Meta(const std::string &_streamName, bool master, bool autoBackOff){
+    ignoredPid = 0;
     if (!_streamName.size()){master = false;}
     version = DTSH_VERSION;
     streamMemBuf = 0;
@@ -937,6 +939,7 @@ namespace DTSC{
 
   /// Initialize metadata from given DTSH file in master mode.
   Meta::Meta(const std::string &_streamName, const std::string &fileName){
+    ignoredPid = 0;
     version = DTSH_VERSION;
     streamMemBuf = 0;
     isMemBuf = false;
@@ -1215,7 +1218,7 @@ namespace DTSC{
       trackList.addField("codec", RAX_32STRING);
       trackList.addField("page", RAX_256STRING);
       trackList.addField("lastupdate", RAX_64UINT);
-      trackList.addField("pid", RAX_32UINT);
+      trackList.addField("pid", RAX_64UINT);
       trackList.addField("minkeepaway", RAX_64UINT);
       trackList.addField("sourcetid", RAX_32UINT);
       trackList.addField("encryption", RAX_256STRING);
@@ -2449,6 +2452,7 @@ namespace DTSC{
         if (t.frames.isReady() && !t.frames.getPresent()){continue;}
         if (t.parts.isReady() && !t.parts.getPresent()){continue;}
       }
+      if (ignoredPid && trackList.getInt(trackPidField, i) == ignoredPid) { continue; }
       // Remove track this is based on, if this track is encrypted
       if (trackList.getInt(trackSourceTidField, i) != INVALID_TRACK_ID &&
           std::string(trackList.getPointer(trackEncryptionField, i)) != ""){
@@ -3675,6 +3679,10 @@ namespace DTSC{
     INFO_MSG("Applied limiter from %" PRIu64 " to %" PRIu64, min, max);
   }
 
+  void Meta::ignorePid(uint64_t ignPid) {
+    ignoredPid = ignPid;
+  }
+
   /// Returns true if the tracks idx1 and idx2 are keyframe aligned
   bool Meta::keyTimingsMatch(size_t idx1, size_t idx2) const {
     const DTSC::Track &t1 = tracks.at(idx1);

lib/dtsc.h

@@ -539,7 +539,10 @@ namespace DTSC{
     void removeLimiter();
     void applyLimiter(uint64_t min, uint64_t max);
 
+    void ignorePid(uint64_t ignPid);
+
   protected:
+    uint64_t ignoredPid;
     void sBufMem(size_t trackCount = DEFAULT_TRACK_COUNT);
     void sBufShm(const std::string &_streamName, size_t trackCount = DEFAULT_TRACK_COUNT, bool master = true, bool autoBackOff = true);
     void streamInit(size_t trackCount = DEFAULT_TRACK_COUNT);

src/process/process_av.cpp

@@ -442,6 +442,7 @@ namespace Mist{
     bool isRecording(){return false;}
 
     ProcessSource(Socket::Connection & c) : Output(c) {
+      meta.ignorePid(getpid());
       targetParams["keeptimes"] = true;
       realTime = 0;
       convertCtx = NULL;

src/process/process_exec.cpp

@@ -92,6 +92,7 @@ namespace Mist{
   public:
     bool isRecording(){return false;}
     ProcessSource(Socket::Connection &c) : OutEBML(c){
+      meta.ignorePid(getpid());
       capa["name"] = "MKVExec";
       targetParams["keeptimes"] = true;
       realTime = 0;

src/process/process_ffmpeg.cpp

@@ -111,6 +111,7 @@ namespace Mist{
   public:
     bool isRecording(){return false;}
     ProcessSource(Socket::Connection &c) : OutEBML(c){
+      meta.ignorePid(getpid());
       capa["name"] = "FFMPEG";
       targetParams["keeptimes"] = true;
       realTime = 0;

src/process/process_livepeer.cpp

@@ -66,6 +66,7 @@ namespace Mist{
     bool isRecording(){return false;}
     bool isReadyForPlay() { return true; }
     ProcessSource(Socket::Connection &c) : TSOutput(c){
+      meta.ignorePid(getpid());
       capa["name"] = "Livepeer";
       capa["codecs"][0u][0u].append("+H264");
       capa["codecs"][0u][0u].append("+HEVC");
@@ -150,7 +151,7 @@ namespace Mist{
               case 0x07: // sps
               case 0x08: // pps
                 shouldSplit = true;
-                INFO_MSG("Switching to new segment since the current keyframe contains new init data");
+                HIGH_MSG("Switching to new segment since the current keyframe contains new init data");
               default: break;
             }
           } else if (codec == "HEVC" && dataLen > 3) {
@@ -160,7 +161,7 @@ namespace Mist{
               case 33: // sps
               case 34: // pps
                 shouldSplit = true;
-                INFO_MSG("Switching to new segment since the current keyframe contains new init data");
+                HIGH_MSG("Switching to new segment since the current keyframe contains new init data");
               default: break;
             }
           }