Changeset 1156 for OniSplit/Sound/WavExporter.cs

Timestamp:

May 8, 2021, 3:44:24 AM (4 years ago)

Author:

geyser

Message:

Fixed importing of "fact" chunk, as well as an unhandled fatal when attempting to transcode IMA4 to MS ADPCM. Also added missing padding to SNDD template and fixed the duration calculation for WAV-to-SNDD.

File:

• OniSplit/Sound/WavExporter.cs (modified) (2 diffs)

OniSplit/Sound/WavExporter.cs

@@ -154 +154 @@
             using (var writer = new BinaryWriter(stream))
             {
-                var blockSizeADPCM = sound.BlockAlignment;
-                
-                int wholeBlocks = sound.Data.Length / blockSizeADPCM;
-                int leftoverBytes = sound.Data.Length - (wholeBlocks * blockSizeADPCM);
-                int leftoverSamples = 0;
-                if(leftoverBytes > 14)
-                    leftoverSamples = 2 + (leftoverBytes - 7 * sound.ChannelCount)
-                                    * 8 / sound.BitsPerSample / sound.ChannelCount;
-                int paddingBytes = 0;
-                if (leftoverBytes > 0) // incomplete trailing block
-                    paddingBytes = blockSizeADPCM - leftoverBytes;
-                var samplesPerBlock = 2 + (blockSizeADPCM - sound.ChannelCount * 7) * 8 / sound.ChannelCount / sound.BitsPerSample;
-
-                Int32 sampleCount = wholeBlocks * samplesPerBlock + leftoverSamples;
-
+                int blockSizeADPCM, samplesPerBlock, sampleCount, paddingBytes = 0;
                 if (sound.IsIMA4) // IMA4 ADPCM format
                 {
@@ -174 +160 @@
                     samplesPerBlock = 64;
                     sampleCount = (sound.Data.Length / blockSizeADPCM) * samplesPerBlock;
+                }
+                else
+                {
+                    blockSizeADPCM = sound.BlockAlignment;
+                    int wholeBlocks = sound.Data.Length / blockSizeADPCM;
+                    int leftoverBytes = sound.Data.Length - (wholeBlocks * blockSizeADPCM);
+                    int leftoverSamples = 0;
+                    if (leftoverBytes > 7 * sound.ChannelCount)
+                        leftoverSamples = 2 + (leftoverBytes - 7 * sound.ChannelCount)
+                                        * 8 / sound.BitsPerSample / sound.ChannelCount;
+                    else
+                        Console.Error.WriteLine("Improper trailing bytes/samples!");
+                    if (leftoverBytes > 0) // incomplete trailing block
+                        paddingBytes = blockSizeADPCM - leftoverBytes;
+                    samplesPerBlock = 2 + (blockSizeADPCM - sound.ChannelCount * 7) * 8 / sound.ChannelCount / sound.BitsPerSample;
+                    sampleCount = wholeBlocks * samplesPerBlock + leftoverSamples;
                 }
                 if (!convert_to_PCM)