Trust audio descryption from manifest / stream could be wrong ([enca]

xbmc · May 10, 2018 · 9bd5bdd · 9bd5bdd
1 parent a2ec568
commit 9bd5bdd
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -484,13 +484,16 @@ class CodecHandler
     AP4_GenericAudioSampleDescription* asd(nullptr);
     if (sample_description && (asd = dynamic_cast<AP4_GenericAudioSampleDescription*>(sample_description)))
     {
-      if (asd->GetChannelCount() != info.m_Channels
-        || asd->GetSampleRate() != info.m_SampleRate
-        || asd->GetSampleSize() != info.m_BitsPerSample)
+      if ((!info.m_Channels && asd->GetChannelCount() != info.m_Channels)
+        || (!info.m_SampleRate && asd->GetSampleRate() != info.m_SampleRate)
+        || (!info.m_BitsPerSample && asd->GetSampleSize() != info.m_BitsPerSample))
       {
-        info.m_Channels = asd->GetChannelCount();
-        info.m_SampleRate = asd->GetSampleRate();
-        info.m_BitsPerSample = asd->GetSampleSize();
+        if (!info.m_Channels)
+          info.m_Channels = asd->GetChannelCount();
+        if (!info.m_SampleRate)
+          info.m_SampleRate = asd->GetSampleRate();
+        if (!info.m_BitsPerSample)
+          info.m_BitsPerSample = asd->GetSampleSize();
         return true;
       }
     }