From 10b7e84ffbd2dcbfc17b541e93786a78ef94864c Mon Sep 17 00:00:00 2001 From: VaDiM Date: Wed, 8 Mar 2023 17:16:16 +0300 Subject: [PATCH] [CLI] More debugging info for audio --- AssetStudioCLI/Exporter.cs | 13 ++++++++----- AssetStudioGUI/GUILogger.cs | 2 ++ AssetStudioUtility/AudioClipConverter.cs | 7 ++++++- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/AssetStudioCLI/Exporter.cs b/AssetStudioCLI/Exporter.cs index 1606aca..26e306a 100644 --- a/AssetStudioCLI/Exporter.cs +++ b/AssetStudioCLI/Exporter.cs @@ -3,6 +3,7 @@ using AssetStudioCLI.Options; using Newtonsoft.Json; using System.IO; using System.Linq; +using System.Text; namespace AssetStudioCLI { @@ -60,11 +61,13 @@ namespace AssetStudioCLI if (!TryExportFile(exportPath, item, ".wav", out exportFullPath)) return false; - Logger.Debug($"Converting \"{m_AudioClip.m_Name}\" to wav..\n" + - $"AudioClip sound compression: {m_AudioClip.m_CompressionFormat}\n" + - $"AudioClip channel count: {m_AudioClip.m_Channels}\n" + - $"AudioClip sample rate: {m_AudioClip.m_Frequency}\n" + - $"AudioClip bit depth: {m_AudioClip.m_BitsPerSample}"); + var sb = new StringBuilder(); + sb.AppendLine($"Converting \"{m_AudioClip.m_Name}\" to wav.."); + sb.AppendLine(m_AudioClip.version[0] < 5 ? $"AudioClip type: {m_AudioClip.m_Type}" : $"AudioClip compression format: {m_AudioClip.m_CompressionFormat}"); + sb.AppendLine($"AudioClip channel count: {m_AudioClip.m_Channels}"); + sb.AppendLine($"AudioClip sample rate: {m_AudioClip.m_Frequency}"); + sb.AppendLine($"AudioClip bit depth: {m_AudioClip.m_BitsPerSample}"); + Logger.Debug(sb.ToString()); var buffer = converter.ConvertToWav(m_AudioData); if (buffer == null) diff --git a/AssetStudioGUI/GUILogger.cs b/AssetStudioGUI/GUILogger.cs index ee5b782..f4693ca 100644 --- a/AssetStudioGUI/GUILogger.cs +++ b/AssetStudioGUI/GUILogger.cs @@ -31,6 +31,8 @@ namespace AssetStudioGUI action("An error has occurred. Turn on \"Show all error messages\" to see details next time."); } break; + case LoggerEvent.Debug: + break; default: action(message); break; diff --git a/AssetStudioUtility/AudioClipConverter.cs b/AssetStudioUtility/AudioClipConverter.cs index e288a72..1cde7aa 100644 --- a/AssetStudioUtility/AudioClipConverter.cs +++ b/AssetStudioUtility/AudioClipConverter.cs @@ -51,9 +51,14 @@ namespace AssetStudio public byte[] SoundToWav(Sound sound) { - var result = sound.getFormat(out _, out _, out int channels, out int bits); + Logger.Debug($"[Fmod] Detecting sound format..\n"); + var result = sound.getFormat(out SOUND_TYPE soundType, out SOUND_FORMAT soundFormat, out int channels, out int bits); if (result != RESULT.OK) return null; + Logger.Debug($"Detected sound type: {soundType}\n" + + $"Detected sound format: {soundFormat}\n" + + $"Detected channels: {channels}\n" + + $"Detected bit depth: {bits}"); result = sound.getDefaults(out var frequency, out _); if (result != RESULT.OK) return null;