Merge pull request #254 from jcdr428/patch-4

For double video track, DV EL stream type = 0x06
justdan96 · Mar 22, 2020 · eaf35b4 · eaf35b4
2 parents 1d4ac18 + 286ccfe
commit eaf35b4
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/tsMuxer/tsMuxer.cpp b/tsMuxer/tsMuxer.cpp
@@ -300,9 +300,15 @@ void TSMuxer::intAddStream(const std::string& streamName, const std::string& cod
                                                         descriptorLen, codecReader, lang, isSecondary)));
     }
     else if (codecName == "V_MPEGH/ISO/HEVC")
-        m_pmt.pidList.insert(
-            std::make_pair(tsStreamIndex, PMTStreamInfo(STREAM_TYPE_VIDEO_H265, tsStreamIndex, descrBuffer,
-                                                        descriptorLen, codecReader, lang, isSecondary)));
+    {
+        int stream_type = STREAM_TYPE_VIDEO_H265;
+        // For non-bluray DV with two HEVC tracks, the DV EL track must be type 06
+        if (!m_bluRayMode && tsStreamIndex == 0x1015 && V3_flags & NON_DV_TRACK)
+            stream_type = STREAM_TYPE_PRIVATE_DATA;
+        m_pmt.pidList.insert(std::make_pair(
+            tsStreamIndex,
+            PMTStreamInfo(stream_type, tsStreamIndex, descrBuffer, descriptorLen, codecReader, lang, isSecondary)));
+    }
     else if (codecName == "V_MS/VFW/WVC1")
         m_pmt.pidList.insert(
             std::make_pair(tsStreamIndex, PMTStreamInfo(STREAM_TYPE_VIDEO_VC1, tsStreamIndex, descrBuffer,