Changeset 1154

Timestamp:

May 3, 2021, 5:22:15 PM (4 years ago)

Author:

geyser

Message:

Implemented import/export of "fact" chunk for .wav files. Added a -demo tag for storing sounds in the PC demo format (if compatible).

Location:

OniSplit

Files:

• Program.cs (modified) (1 diff)
• Sound/WavExporter.cs (modified) (1 diff)
• Sound/WavFile.cs (modified) (6 diffs)
• Sound/WavImporter.cs (modified) (2 diffs)

OniSplit/Program.cs

@@ -844 +844 @@
                 case ".wav":
                     if (task.Type == TemplateTag.NONE || task.Type == TemplateTag.SNDD)
-                        importer = new WavImporter();
+                        importer = new WavImporter(args.Any(a => a == "-demo"));
                     break;
 

OniSplit/Sound/WavExporter.cs

@@ -154 +154 @@
             using (var writer = new BinaryWriter(stream))
             {
-                var blockSizeADPCM = 512 * sound.ChannelCount * sound.SampleRate / 22050;
+                var blockSizeADPCM = sound.BlockAlignment;
+                
                 int wholeBlocks = sound.Data.Length / blockSizeADPCM;
                 int leftoverBytes = sound.Data.Length - (wholeBlocks * blockSizeADPCM);
-                int leftoverSamples = 8 * (leftoverBytes - 7 * sound.ChannelCount)
-                                      / 4 / sound.ChannelCount + 2; // 4 bits per sample
+                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 / 4;
-
-                Int32 sampleCount = sampleCount = wholeBlocks * samplesPerBlock + leftoverSamples;
+                var samplesPerBlock = 2 + (blockSizeADPCM - sound.ChannelCount * 7) * 8 / sound.ChannelCount / sound.BitsPerSample;
+
+                Int32 sampleCount = wholeBlocks * samplesPerBlock + leftoverSamples;
 
                 if (sound.IsIMA4) // IMA4 ADPCM format

OniSplit/Sound/WavFile.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.IO;
+//using System.Runtime.Remoting.Metadata.W3cXsd2001;
 
 namespace Oni.Sound
@@ -10 +11 @@
         private const int fcc_RIFF = 0x46464952;
         private const int fcc_WAVE = 0x45564157;
-        private const int fcc_fmt = 0x20746d66;
+        private const int fcc_fmt  = 0x20746d66;
+        private const int fcc_fact = 0x74636166;
         private const int fcc_data = 0x61746164;
 
@@ -19 +21 @@
         private int blockAlign;
         private int bitsPerSample;
+        private int sampleCount;
         private byte[] extraData;
         private byte[] soundData;
@@ -35 +38 @@
                     throw new InvalidDataException("Not a WAV file");
 
-                var header = new WavFile();
+                var header = new WavFile()
+                {
+                    sampleCount = 0
+                };
 
                 for (int chunkType, chunkSize, chunkStart; reader.Position < size; reader.Position = chunkStart + chunkSize)
@@ -45 +51 @@
                     if (chunkType == fcc_fmt)
                         header.ReadFormatChunk(reader, chunkSize);
-                    else if (chunkType == fcc_data)
+                    if (chunkType == fcc_fact)
+                        header.ReadFactChunk(reader, chunkSize);
+                    if (chunkType == fcc_data)
                         header.ReadDataChunk(reader, chunkSize);
                 }
 
+                header.ValidateSampleCount();
                 return header;
             }
@@ -68 +77 @@
         }
 
+        private void ReadFactChunk(BinaryReader reader, int chunkSize)
+        {
+            sampleCount = reader.ReadInt32();
+        }
+
         private void ReadDataChunk(BinaryReader reader, int chunkSize)
         {
             soundData = reader.ReadBytes(chunkSize);
+        }
+        private void ValidateSampleCount() // TODO: ACTUAL VALIDATION/CORRECTION
+        {
+            int sampleCountFromData = 0;
+            int wholeBlocks = soundData.Length / blockAlign;
+            if(sampleCount == 0) // not explicitly set (no fact chunk present)
+            {
+                Console.WriteLine("The imported WAV file has no FACT chunk.");
+            }
+            else // TODO: calculate sampleCountFromData, compare with sampleCount
+            {
+
+            }
         }
 

OniSplit/Sound/WavImporter.cs

@@ -6 +6 @@
     internal class WavImporter : Importer
     {
+        private readonly bool convertToDemo;
+
+        public WavImporter(bool toDemo)
+            : base(toDemo?InstanceFileHeader.OniMacTemplateChecksum:InstanceFileHeader.OniPCTemplateChecksum)
+        {
+            convertToDemo = toDemo;
+        }
+
         public override void Import(string filePath, string outputDirPath)
         {
@@ -44 +52 @@
 
             var sndd = CreateInstance(TemplateTag.SNDD, name);
+            if (convertToDemo)
+            {
+                // TODO: also validate other ADPCM parameters (coefficient table)?
+                if (wav.Format != WavFormat.Adpcm) // Or is PCM supported, actually?
+                    Console.WriteLine("Cannot convert to PC demo: ADPCM format required!");
+                if (wav.SampleRate != 22050)
+                    Console.WriteLine("Cannot convert to PC demo: 22050 kHz required!");
+                if (wav.BlockAlign != 512 * wav.ChannelCount)
+                    Console.WriteLine("Cannot convert to PC demo: wrong block alignment!");
+                if (wav.BitsPerSample != 4)
+                    Console.WriteLine("Cannot convert to PC demo: wrong bits per sample!");
 
-            using (var writer = sndd.OpenWrite(8))
+                using (var writer = sndd.OpenWrite())
+                {
+                    if (wav.ChannelCount == 2)
+                        writer.WriteInt16(3);
+                    else 
+                        writer.WriteInt16(1);
+                    writer.WriteInt16(0);
+                    writer.Write((int)duration);
+                    writer.Write(wav.SoundData.Length);
+                    writer.Write(WriteRawPart(wav.SoundData));
+                }
+            }
+            else
             {
-                writer.Write((short)wav.Format);
-                writer.WriteInt16(wav.ChannelCount);
-                writer.Write(wav.SampleRate);
-                writer.Write(wav.AverageBytesPerSecond);
-                writer.WriteInt16(wav.BlockAlign);
-                writer.WriteInt16(wav.BitsPerSample);
-                writer.WriteInt16(wav.ExtraData.Length);
-                writer.Write(wav.ExtraData);
-                writer.Skip(32 - wav.ExtraData.Length);
-                writer.Write((short)duration);
-                writer.Write(wav.SoundData.Length);
-                writer.Write(WriteRawPart(wav.SoundData));
+                using (var writer = sndd.OpenWrite())
+                {
+                    if (wav.Format == WavFormat.Adpcm)
+                        writer.WriteInt16(8);
+                    else
+                        writer.WriteInt16(0);
+                    writer.WriteInt16(0);
+                    writer.Write((short)wav.Format);
+                    writer.WriteInt16(wav.ChannelCount);
+                    writer.Write(wav.SampleRate);
+                    writer.Write(wav.AverageBytesPerSecond);
+                    writer.WriteInt16(wav.BlockAlign);
+                    writer.WriteInt16(wav.BitsPerSample);
+                    writer.WriteInt16(wav.ExtraData.Length);
+                    writer.Write(wav.ExtraData);
+                    writer.Skip(32 - wav.ExtraData.Length);
+                    writer.Write((short)duration);
+                    writer.Write(wav.SoundData.Length);
+                    writer.Write(WriteRawPart(wav.SoundData));
+                }
             }
         }