Add DialNorm reporting to DD+ streams.

Implements partly #13
UniqProject · Dec 25, 2018 · 877d31d · 877d31d
1 parent 6cbfe5f
commit 877d31d
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/BDInfo/BDROM/TSCodecAC3.cs b/BDInfo/BDROM/TSCodecAC3.cs
@@ -86,7 +86,8 @@ public static void Scan(TSAudioStream stream, TSStreamBuffer buffer, ref string
             uint frameSizeCode = 0;
             uint channelMode;
             uint lfeOn;
-            uint dialNorm;
+            uint dialNorm = 0;
+            uint dialNormExt = 0;
             uint numBlocks = 0;
 
             byte[] hdr = buffer.ReadBytes(4);
@@ -190,7 +191,7 @@ public static void Scan(TSAudioStream stream, TSStreamBuffer buffer, ref string
                 channelMode = buffer.ReadBits2(3);
                 lfeOn = buffer.ReadBits2(1);
                 bsid = buffer.ReadBits2(5);
-                dialNorm = buffer.ReadBits2(5);
+                dialNormExt = buffer.ReadBits2(5);
 
                 if (buffer.ReadBool())
                 {
@@ -342,10 +343,15 @@ public static void Scan(TSAudioStream stream, TSStreamBuffer buffer, ref string
             }
 
             stream.LFE = (int) lfeOn;
-            if (stream.StreamType != TSStreamType.AC3_PLUS_AUDIO &&
-                stream.StreamType != TSStreamType.AC3_PLUS_SECONDARY_AUDIO)
+            if (stream.StreamType != TSStreamType.AC3_PLUS_SECONDARY_AUDIO)
             {
-                stream.DialNorm = (int) (dialNorm - 31);
+                if ((stream.StreamType == TSStreamType.AC3_PLUS_AUDIO && bsid == 6) ||
+                    (stream.StreamType == TSStreamType.AC3_AUDIO))
+                    stream.DialNorm = (int) dialNorm * -1;
+                else if (stream.StreamType == TSStreamType.AC3_PLUS_AUDIO && secondFrame)
+                {
+                    stream.DialNorm = (int) dialNormExt * -1;
+                }
             }
             stream.IsVBR = false;
             if (stream.StreamType == TSStreamType.AC3_PLUS_AUDIO && bsid == 6 && !secondFrame)