General cleanup:

- Use Json serialization context/code gen
- Allow trimming
- Fix LoadFsbFromByteArray not being thread-safe

Author: SamboyCoding

Fmod5Sharp.Tests/Fmod5Sharp.Tests.csproj

@@ -48,6 +48,8 @@
         <None Remove="TestResources\broken_imaad.fsb" />
         <None Remove="TestResources\previously_unrecoverable_vorbis.fsb" />
         <EmbeddedResource Include="TestResources\previously_unrecoverable_vorbis.fsb" />
+        <None Remove="TestResources\xbox_imaad.fsb" />
+        <EmbeddedResource Include="TestResources\xbox_imaad.fsb" />
     </ItemGroup>
 
 </Project>

Fmod5Sharp/Fmod5Sharp.csproj

@@ -14,6 +14,7 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
         <LangVersion>10</LangVersion>
+        <IsTrimmable>true</IsTrimmable>
     </PropertyGroup>
 
     <ItemGroup>

Fmod5Sharp/FmodAudioHeader.cs

@@ -7,6 +7,8 @@ namespace Fmod5Sharp
 {
 	public class FmodAudioHeader
 	{
+		private static readonly object ChunkReadingLock = new();
+		
 		public FmodAudioType AudioType;
 		public uint Version;
 		public uint NumSamples;
@@ -46,28 +48,37 @@ public FmodAudioHeader(BinaryReader reader)
 			var sampleHeadersStart = reader.Position();
 			for (var i = 0; i < NumSamples; i++)
 			{
-				FmodSampleMetadata sampleMetadata = reader.ReadEndian<FmodSampleMetadata>();
+				var sampleMetadata = reader.ReadEndian<FmodSampleMetadata>();
 
-				FmodSampleChunk.CurrentSample = sampleMetadata;
-				var continueReadingChunks = sampleMetadata.HasAnyChunks;
-				List<FmodSampleChunk> chunks = new();
-				while (continueReadingChunks)
+				if (!sampleMetadata.HasAnyChunks)
 				{
-					FmodSampleChunk nextChunk = reader.ReadEndian<FmodSampleChunk>();
-					continueReadingChunks = nextChunk.MoreChunks;
-					chunks.Add(nextChunk);
+					Samples.Add(sampleMetadata);
+					continue;
 				}
-				
-				FmodSampleChunk.CurrentSample = null;
 
-				if (chunks.FirstOrDefault(c => c.ChunkType == FmodSampleChunkType.FREQUENCY) is { ChunkData: FrequencyChunkData fcd })
+				lock (ChunkReadingLock)
 				{
-					sampleMetadata.FrequencyId = fcd.ActualFrequencyId;
-				}
+					List<FmodSampleChunk> chunks = new();
+					FmodSampleChunk.CurrentSample = sampleMetadata;
+					
+					FmodSampleChunk nextChunk;
+					do
+					{
+						nextChunk = reader.ReadEndian<FmodSampleChunk>();
+						chunks.Add(nextChunk);
+					} while (nextChunk.MoreChunks);
 
-				sampleMetadata.Chunks = chunks;
+					FmodSampleChunk.CurrentSample = null;
+					
+					if (chunks.FirstOrDefault(c => c.ChunkType == FmodSampleChunkType.FREQUENCY) is { ChunkData: FrequencyChunkData fcd })
+					{
+						sampleMetadata.FrequencyId = fcd.ActualFrequencyId;
+					}
+
+					sampleMetadata.Chunks = chunks;
 
-				Samples.Add(sampleMetadata);
+					Samples.Add(sampleMetadata);
+				}
 			}
 
 			var actualSampleHeadersLength = reader.Position() - sampleHeadersStart;

Fmod5Sharp/FmodGcadPcmRebuilder.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Linq;
 using Fmod5Sharp.ChunkData;
+using Fmod5Sharp.Util;
 using NAudio.Wave;
 
 namespace Fmod5Sharp

Fmod5Sharp/FmodImaAdPcmRebuilder.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Fmod5Sharp.Util;
 using NAudio.Wave;
 
 namespace Fmod5Sharp

Fmod5Sharp/FmodVorbis/FmodVorbisData.cs

@@ -5,12 +5,22 @@
 
 namespace Fmod5Sharp.FmodVorbis;
 
-public class FmodVorbisData
+internal class FmodVorbisData
 {
-    public byte[] headerBytes { get; set; }
-    public int seekBit { get; set; }
+    [JsonPropertyName("headerBytes")]
+    public byte[] HeaderBytes { get; set; }
+    
+    [JsonPropertyName("seekBit")]
+    public int SeekBit { get; set; }
+    
+    [JsonConstructor]
+    public FmodVorbisData(byte[] headerBytes, int seekBit)
+    {
+        HeaderBytes = headerBytes;
+        SeekBit = seekBit;
+    }
 
-    [JsonIgnore] public byte[] blockFlags { get; private set; } = Array.Empty<byte>();
+    [JsonIgnore] public byte[] BlockFlags { get; private set; } = Array.Empty<byte>();
 
     private bool _initialized;
 
@@ -21,7 +31,7 @@ internal void InitBlockFlags()
 
         _initialized = true;
 
-        var bitStream = new BitStream(headerBytes);
+        var bitStream = new BitStream(HeaderBytes);
 
         if (bitStream.ReadByte() != 5) //packing type 5 == books
             return;
@@ -30,13 +40,13 @@ internal void InitBlockFlags()
             return;
 
         //Whole bytes, bit remainder
-        bitStream.Seek(seekBit / 8, seekBit % 8);
+        bitStream.Seek(SeekBit / 8, SeekBit % 8);
 
         //Read 6 bits and add one
         var numModes = bitStream.ReadByte(6) + 1; 
 
         //Read the first bit of each mode and skip the rest of the mode data. These are our flags.
-        blockFlags = Enumerable.Range(0, numModes).Select(_ =>
+        BlockFlags = Enumerable.Range(0, numModes).Select(_ =>
         {
             var flag = (byte)bitStream.ReadBit();
 
@@ -58,10 +68,10 @@ public int GetPacketBlockSize(byte[] packetBytes)
 
         var mode = 0;
 
-        if (blockFlags.Length > 0)
-            mode = bitStream.ReadByte(blockFlags.Length - 1);
+        if (BlockFlags.Length > 0)
+            mode = bitStream.ReadByte(BlockFlags.Length - 1);
 
-        if (blockFlags[mode] == 1)
+        if (BlockFlags[mode] == 1)
             return 2048;
 
         return 256;

Fmod5Sharp/FmodVorbis/FmodVorbisRebuilder.cs

@@ -5,6 +5,7 @@
 using System.Reflection;
 using System.Text.Json;
 using Fmod5Sharp.ChunkData;
+using Fmod5Sharp.Util;
 using OggVorbisEncoder;
 
 namespace Fmod5Sharp.FmodVorbis
@@ -20,7 +21,7 @@ private static void LoadVorbisHeaders()
             using StreamReader reader = new(stream);
 
             var jsonString = reader.ReadToEnd();
-            headers = JsonSerializer.Deserialize<Dictionary<uint, FmodVorbisData>>(jsonString);
+            headers = JsonSerializer.Deserialize(jsonString, Fmod5SharpJsonContext.Default.DictionaryUInt32FmodVorbisData);
         }
 
         public static byte[] RebuildOggFile(FmodSample sample)
@@ -46,13 +47,12 @@ public static byte[] RebuildOggFile(FmodSample sample)
 
             var infoPacket = BuildInfoPacket((byte)sample.Metadata.Channels, sample.Metadata.Frequency);
             var commentPacket = BuildCommentPacket("Fmod5Sharp (Samboy063)");
-            var setupPacket = new OggPacket(vorbisData.headerBytes, false, 0, 2);
+            var setupPacket = new OggPacket(vorbisData.HeaderBytes, false, 0, 2);
 
             //Begin building the final stream
             var oggStream = new OggStream(1);
             using var outputStream = new MemoryStream();
 
-            //TODO Do we need to flush pages between these packets?
             oggStream.PacketIn(infoPacket);
             oggStream.PacketIn(commentPacket);
             oggStream.PacketIn(setupPacket);

Fmod5Sharp/Util/Fmod5SharpJsonContext.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using Fmod5Sharp.FmodVorbis;
+
+namespace Fmod5Sharp.Util;
+
+[JsonSerializable(typeof(Dictionary<uint, FmodVorbisData>))]
+internal partial class Fmod5SharpJsonContext : JsonSerializerContext
+{
+    
+}

Fmod5Sharp/Utils.cs Fmod5Sharp/Util/Utils.csFmod5Sharp/Utils.cs renamed to Fmod5Sharp/Util/Utils.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Fmod5Sharp
+namespace Fmod5Sharp.Util
 {
     internal static class Utils
     {