mirror of
https://github.com/aelurum/AssetStudio.git
synced 2026-11-17 03:38:48 -05:00
Some improvements to wav export for Unity 1.x - 2.5
This commit is contained in:
@@ -156,13 +156,15 @@ namespace AssetStudioCLI
|
|||||||
{
|
{
|
||||||
if (m_AudioClip.IsLegacyRawWav())
|
if (m_AudioClip.IsLegacyRawWav())
|
||||||
{
|
{
|
||||||
var buffer = converter.WrapWavData(ref debugLog);
|
if (m_AudioClip.m_AudioData.Endian == EndianType.BigEndian)
|
||||||
file.Write(buffer, 0, buffer.Length);
|
{
|
||||||
}
|
AudioClipConverter.LegacyRawWavSwapEndian(audioBuff, m_AudioClip.m_AudioData.Size, (LegacyAudioType)m_AudioClip.m_Format);
|
||||||
else
|
}
|
||||||
{
|
var wavHeaderBuff = AudioClipConverter.LegacyRawWavGenerateHeader(m_AudioClip, ref debugLog);
|
||||||
file.Write(audioBuff, 0, m_AudioClip.m_AudioData.Size);
|
file.Write(wavHeaderBuff, 0, wavHeaderBuff.Length);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
file.Write(audioBuff, 0, m_AudioClip.m_AudioData.Size);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
debugLog += $"{item.TypeString} \"{item.Text}\" exported to \"{exportFullPath}\"";
|
debugLog += $"{item.TypeString} \"{item.Text}\" exported to \"{exportFullPath}\"";
|
||||||
|
|||||||
@@ -1081,9 +1081,9 @@ namespace AssetStudioGUI
|
|||||||
exinfo.numchannels = m_AudioClip.m_Channels;
|
exinfo.numchannels = m_AudioClip.m_Channels;
|
||||||
exinfo.defaultfrequency = m_AudioClip.m_Frequency;
|
exinfo.defaultfrequency = m_AudioClip.m_Frequency;
|
||||||
mode |= FMOD.MODE.OPENRAW;
|
mode |= FMOD.MODE.OPENRAW;
|
||||||
if (m_AudioClip.m_AudioData.Endian == EndianType.BigEndian && exinfo.format == FMOD.SOUND_FORMAT.PCM16)
|
if (m_AudioClip.m_AudioData.Endian == EndianType.BigEndian)
|
||||||
{
|
{
|
||||||
AudioClipConverter.SwapPcm16Endian(soundBuff.AsSpan(0, m_AudioClip.m_AudioData.Size));
|
AudioClipConverter.LegacyRawWavSwapEndian(soundBuff, m_AudioClip.m_AudioData.Size, (LegacyAudioType)m_AudioClip.m_Format);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -155,13 +155,15 @@ namespace AssetStudioGUI
|
|||||||
{
|
{
|
||||||
if (m_AudioClip.IsLegacyRawWav())
|
if (m_AudioClip.IsLegacyRawWav())
|
||||||
{
|
{
|
||||||
var buffer = converter.WrapWavData(ref debugLog);
|
if (m_AudioClip.m_AudioData.Endian == EndianType.BigEndian)
|
||||||
file.Write(buffer, 0, buffer.Length);
|
{
|
||||||
}
|
AudioClipConverter.LegacyRawWavSwapEndian(audioBuff, m_AudioClip.m_AudioData.Size, (LegacyAudioType)m_AudioClip.m_Format);
|
||||||
else
|
}
|
||||||
{
|
var wavHeaderBuff = AudioClipConverter.LegacyRawWavGenerateHeader(m_AudioClip, ref debugLog);
|
||||||
file.Write(audioBuff, 0, m_AudioClip.m_AudioData.Size);
|
file.Write(wavHeaderBuff, 0, wavHeaderBuff.Length);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
file.Write(audioBuff, 0, m_AudioClip.m_AudioData.Size);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
debugLog += $"{item.TypeString} \"{item.Text}\" exported to \"{exportFullPath}\"";
|
debugLog += $"{item.TypeString} \"{item.Text}\" exported to \"{exportFullPath}\"";
|
||||||
|
|||||||
@@ -71,9 +71,9 @@ namespace AssetStudio
|
|||||||
if (isLegacyRawWav)
|
if (isLegacyRawWav)
|
||||||
{
|
{
|
||||||
mode |= MODE.OPENRAW;
|
mode |= MODE.OPENRAW;
|
||||||
if (m_AudioClip.m_AudioData.Endian == EndianType.BigEndian && exinfo.format == SOUND_FORMAT.PCM16)
|
if (m_AudioClip.m_AudioData.Endian == EndianType.BigEndian)
|
||||||
{
|
{
|
||||||
SwapPcm16Endian(audioBuff.AsSpan(0, (int)m_AudioClip.m_Size));
|
LegacyRawWavSwapEndian(audioBuff, m_AudioClip.m_AudioData.Size, (LegacyAudioType)m_AudioClip.m_Format);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var result = system.createSound(audioBuff, mode, ref exinfo, out var sound);
|
var result = system.createSound(audioBuff, mode, ref exinfo, out var sound);
|
||||||
@@ -185,40 +185,37 @@ namespace AssetStudio
|
|||||||
debugLog += "Finished FMOD_PCMFLOAT -> PCM16 converting\n";
|
debugLog += "Finished FMOD_PCMFLOAT -> PCM16 converting\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#region LegacyRawWav
|
||||||
//For raw wav data in unity 1.x - 2.5
|
//For raw wav data in unity 1.x - 2.5
|
||||||
//we can handle it with fmod as well, but this way should be better, I guess
|
//we can handle it with fmod as well, but this way should be better, I guess
|
||||||
public byte[] WrapWavData(ref string debugLog)
|
public static byte[] LegacyRawWavGenerateHeader(AudioClip m_AudioClip, ref string debugLog)
|
||||||
{
|
{
|
||||||
if (!isLegacyRawWav)
|
var audioSize = (uint)m_AudioClip.m_AudioData.Size;
|
||||||
return null;
|
|
||||||
|
|
||||||
var legacyType = (LegacyAudioType)m_AudioClip.m_Format;
|
|
||||||
var audioSize = (int)m_AudioClip.m_Size;
|
|
||||||
var channels = m_AudioClip.m_Channels;
|
var channels = m_AudioClip.m_Channels;
|
||||||
var sampleRate = m_AudioClip.m_Frequency;
|
var sampleRate = (uint)m_AudioClip.m_Frequency;
|
||||||
var audioFormat = WavAudioFormat.PCM;
|
var audioFormat = WavAudioFormat.PCM;
|
||||||
var bits = legacyType == LegacyAudioType.RawWavU8Mono ? 8 : 16;
|
var bits = (LegacyAudioType)m_AudioClip.m_Format == LegacyAudioType.RawWavU8Mono ? 8 : 16;
|
||||||
|
|
||||||
debugLog += "[Legacy AudioClip] Generating wav header..\n";
|
debugLog += "[Legacy AudioClip] Generating wav header..\n";
|
||||||
if (m_AudioClip.m_AudioData.Endian == EndianType.BigEndian && bits == 16)
|
var headerBuff = new byte[44];
|
||||||
{
|
var wavHeader = new WavHeader(audioSize, audioFormat, channels, sampleRate, bits);
|
||||||
SwapPcm16Endian(audioBuff.AsSpan(0, audioSize));
|
wavHeader.WriteToArray(headerBuff);
|
||||||
}
|
|
||||||
var wavBuffer = new byte[audioSize + 44];
|
|
||||||
var wavHeader = new WavHeader((uint)audioSize, audioFormat, channels, (uint)sampleRate, bits);
|
|
||||||
wavHeader.WriteToArray(wavBuffer);
|
|
||||||
audioBuff.AsSpan(0, audioSize).CopyTo(wavBuffer.AsSpan(44));
|
|
||||||
|
|
||||||
return wavBuffer;
|
return headerBuff;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void SwapPcm16Endian(Span<byte> buffer)
|
public static void LegacyRawWavSwapEndian(byte[] audioData, int audioSize, LegacyAudioType legacyType)
|
||||||
{
|
{
|
||||||
for (var i = 0; i < buffer.Length; i += 2)
|
if (legacyType == LegacyAudioType.RawWavS16Mono || legacyType == LegacyAudioType.RawWavS16Stereo)
|
||||||
{
|
{
|
||||||
buffer.Slice(i, 2).Reverse();
|
var dataSpan = audioData.AsSpan(0, audioSize);
|
||||||
|
for (var i = 0; i < audioSize; i += 2)
|
||||||
|
{
|
||||||
|
dataSpan.Slice(i, 2).Reverse();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
private static bool ErrorCheck(RESULT result, ref string log)
|
private static bool ErrorCheck(RESULT result, ref string log)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -55,7 +55,9 @@
|
|||||||
|
|
||||||
public static bool IsLegacyRawWav(this AudioClip m_AudioClip)
|
public static bool IsLegacyRawWav(this AudioClip m_AudioClip)
|
||||||
{
|
{
|
||||||
return m_AudioClip.version < (2, 6) && m_AudioClip.m_Format > 0 && (LegacyAudioType)m_AudioClip.m_Format < LegacyAudioType.CompressedAudio;
|
return m_AudioClip.version < (2, 6)
|
||||||
|
&& m_AudioClip.m_Format > 0
|
||||||
|
&& (LegacyAudioType)m_AudioClip.m_Format < LegacyAudioType.CompressedAudio;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user