Merge branch 'master' of https://github.com/justdan96/tsMuxer

justdan96 · Nov 24, 2023 · ebbe832 · ebbe832
2 parents 0cbe9e0 + 0c55f71
commit ebbe832
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tsMuxer/hevcStreamReader.cpp b/tsMuxer/hevcStreamReader.cpp
@@ -395,7 +395,7 @@ unsigned HEVCStreamReader::getStreamHeight() const { return m_sps ? m_sps->pic_h
 
 int HEVCStreamReader::getStreamHDR() const
 {
-    return (m_hdr->isDVEL) ? 4 : (m_hdr->isHDR10plus ? 16 : (m_hdr->isHDR10 ? 2 : 1));
+    return (m_hdr->isDVRPU || m_hdr->isDVEL) ? 4 : (m_hdr->isHDR10plus ? 16 : (m_hdr->isHDR10 ? 2 : 1));
 }
 
 double HEVCStreamReader::getStreamFPS(void* curNalUnit)

diff --git a/tsMuxer/tsMuxer.cpp b/tsMuxer/tsMuxer.cpp
@@ -323,7 +323,7 @@ void TSMuxer::intAddStream(const std::string& streamName, const std::string& cod
             streamType = StreamType::AUDIO_TRUE_HD;
         else if (ac3Reader->isEAC3() && !ac3Reader->getDownconvertToAC3())
         {
-            if (m_bluRayMode)
+            if (m_bluRayMode || m_m2tsMode)
             {
                 if (ac3Reader->isSecondary())
                     streamType = StreamType::AUDIO_EAC3_SECONDARY;