Refactor audio conversion and enhance playback experience

ds5678 · ds5678 · commit 645ed5a336ea · 2025-08-04T12:17:28.000-07:00
Updated `AudioConverter` to streamline null checks and return empty arrays. Added OGG to WAV conversion in `AssetAPI` for better audio handling. Modified `AudioTab` to preload audio automatically, improving user experience. Related: AssetRipper#1877
diff --git a/Source/AssetRipper.Export.Modules.Audio/AudioConverter.cs b/Source/AssetRipper.Export.Modules.Audio/AudioConverter.cs
@@ -8,14 +8,11 @@ public static class AudioConverter
 {
 	public static byte[] OggToWav(byte[] oggData)
 	{
-		if (oggData == null)
-		{
-			throw new ArgumentNullException(nameof(oggData));
-		}
+		ArgumentNullException.ThrowIfNull(oggData);
 
 		if (oggData.Length == 0)
 		{
-			return Array.Empty<byte>();
+			return [];
 		}
 
 		try
@@ -28,7 +25,7 @@ public static byte[] OggToWav(byte[] oggData)
 		catch (Exception ex)
 		{
 			Logger.Error(LogCategory.Export, "Failed to convert audio from OGG to WAV", ex);
-			return Array.Empty<byte>();
+			return [];
 		}
 	}
 }
diff --git a/Source/AssetRipper.GUI.Web/Pages/Assets/AssetAPI.cs b/Source/AssetRipper.GUI.Web/Pages/Assets/AssetAPI.cs
@@ -181,6 +181,15 @@ public static Task GetAudioData(HttpContext context)
 		}
 		else if (AudioClipDecoder.TryDecode(clip, out byte[]? decodedAudioData, out string? extension, out _))
 		{
+			if (extension is "ogg")
+			{
+				byte[] wavData = AudioConverter.OggToWav(decodedAudioData);
+				if (wavData.Length > 0)
+				{
+					decodedAudioData = wavData;
+					extension = "wav";
+				}
+			}
 			return Results.Bytes(decodedAudioData, $"audio/{extension}").ExecuteAsync(context);
 		}
 		else
diff --git a/Source/AssetRipper.GUI.Web/Pages/Assets/AudioTab.cs b/Source/AssetRipper.GUI.Web/Pages/Assets/AudioTab.cs
@@ -28,7 +28,7 @@ public override void Write(TextWriter writer)
 				{
 					using (new Td(writer).WithAlign("center").WithCustomAttribute("valign", "middle").End())
 					{
-						new Audio(writer).WithControls("").WithClass("mt-4").WithSrc(Source).Close();
+						new Audio(writer).WithControls("").WithPreload("auto").WithClass("mt-4").WithSrc(Source).Close();
 					}
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,11 @@ public static class AudioConverter`
`8`	`8`	`{`
`9`	`9`	`public static byte[] OggToWav(byte[] oggData)`
`10`	`10`	`{`
`11`		`- if (oggData == null)`
`12`		`- {`
`13`		`- throw new ArgumentNullException(nameof(oggData));`
`14`		`- }`
	`11`	`+ ArgumentNullException.ThrowIfNull(oggData);`
`15`	`12`
`16`	`13`	`if (oggData.Length == 0)`
`17`	`14`	`{`
`18`		`- return Array.Empty<byte>();`
	`15`	`+ return [];`
`19`	`16`	`}`
`20`	`17`
`21`	`18`	`try`
`@@ -28,7 +25,7 @@ public static byte[] OggToWav(byte[] oggData)`
`28`	`25`	`catch (Exception ex)`
`29`	`26`	`{`
`30`	`27`	`Logger.Error(LogCategory.Export, "Failed to convert audio from OGG to WAV", ex);`
`31`		`- return Array.Empty<byte>();`
	`28`	`+ return [];`
`32`	`29`	`}`
`33`	`30`	`}`
`34`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,15 @@ public static Task GetAudioData(HttpContext context)`
`181`	`181`	`}`
`182`	`182`	`else if (AudioClipDecoder.TryDecode(clip, out byte[]? decodedAudioData, out string? extension, out _))`
`183`	`183`	`{`
	`184`	`+ if (extension is "ogg")`
	`185`	`+ {`
	`186`	`+ byte[] wavData = AudioConverter.OggToWav(decodedAudioData);`
	`187`	`+ if (wavData.Length > 0)`
	`188`	`+ {`
	`189`	`+ decodedAudioData = wavData;`
	`190`	`+ extension = "wav";`
	`191`	`+ }`
	`192`	`+ }`
`184`	`193`	`return Results.Bytes(decodedAudioData, $"audio/{extension}").ExecuteAsync(context);`
`185`	`194`	`}`
`186`	`195`	`else`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public override void Write(TextWriter writer)`
`28`	`28`	`{`
`29`	`29`	`using (new Td(writer).WithAlign("center").WithCustomAttribute("valign", "middle").End())`
`30`	`30`	`{`
`31`		`- new Audio(writer).WithControls("").WithClass("mt-4").WithSrc(Source).Close();`
	`31`	`+ new Audio(writer).WithControls("").WithPreload("auto").WithClass("mt-4").WithSrc(Source).Close();`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`}`