chizui/AssetStudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for Zstd block compression

Browse Source
This commit is contained in:
VaDiM
2024-03-07 03:49:06 +03:00
parent afdc81bca8
commit f54cc004bd
8 changed files with 156 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AssetStudio/AssetStudio.csproj
View File

@@ -9,12 +9,14 @@
<ItemGroup Condition=" '$(TargetFramework)' != 'net472' ">
<PackageReference Include="K4os.Compression.LZ4" Version="1.3.6" />
<PackageReference Include="ZstdSharp.Port" Version="0.7.5" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
<PackageReference Include="System.Memory" Version="4.5.4" />
<PackageReference Include="System.IO.Compression" Version="4.0.0" />
<PackageReference Include="K4os.Compression.LZ4" Version="1.1.11" />
<PackageReference Include="ZstdSharp.Port" Version="0.6.5" />
</ItemGroup>
<ItemGroup>

3
AssetStudio/AssetsManager.cs
View File

@@ -11,6 +11,7 @@ namespace AssetStudio
public class AssetsManager
{
public string SpecifyUnityVersion;
public bool ZstdEnabled = true;
public List<SerializedFile> assetsFileList = new List<SerializedFile>();
private HashSet<ClassIDType> filteredAssetTypesList = new HashSet<ClassIDType>();
@@ -267,7 +268,7 @@ namespace AssetStudio
Logger.Info("Loading " + reader.FullPath);
try
{
var bundleFile = new BundleFile(reader, SpecifyUnityVersion);
var bundleFile = new BundleFile(reader, ZstdEnabled, SpecifyUnityVersion);
foreach (var file in bundleFile.fileList)
{
var dummyPath = Path.Combine(Path.GetDirectoryName(reader.FullPath), file.fileName);

41
AssetStudio/BundleFile.cs
View File

@@ -1,4 +1,5 @@
using K4os.Compression.LZ4;
using ZstdSharp;
using System;
using System.IO;
using System.Linq;
@@ -36,7 +37,8 @@ namespace AssetStudio
Lzma,
Lz4,
Lz4HC,
Lzham
Lzham,
Custom,
}
public class BundleFile
@@ -74,7 +76,7 @@ namespace AssetStudio
public StreamFile[] fileList;
public BundleFile(FileReader reader, string specUnityVer = "")
public BundleFile(FileReader reader, bool useZstd, string specUnityVer = "")
{
m_Header = new Header();
m_Header.signature = reader.ReadStringToNull();
@@ -127,7 +129,7 @@ namespace AssetStudio
ReadBlocksInfoAndDirectory(reader, ver);
using (var blocksStream = CreateBlocksStream(reader.FullPath))
{
ReadBlocks(reader, blocksStream);
ReadBlocks(reader, blocksStream, useZstd);
ReadFiles(blocksStream, reader.FullPath);
}
break;
@@ -325,7 +327,7 @@ namespace AssetStudio
break;
}
default:
throw new IOException($"Unsupported compression type {compressionType}");
throw new IOException($"Unsupported block info compression type {compressionType}");
}
using (var blocksInfoReader = new EndianBinaryReader(blocksInfoUncompressedStream))
@@ -362,8 +364,10 @@ namespace AssetStudio
}
}
private void ReadBlocks(FileReader reader, Stream blocksStream)
private void ReadBlocks(FileReader reader, Stream blocksStream, bool useZstd)
{
var zstdCodec = new Decompressor();
var i = 0;
foreach (var blockInfo in m_BlocksInfo)
{
var compressionType = (CompressionType)(blockInfo.flags & StorageBlockFlags.CompressionTypeMask);
@@ -381,6 +385,7 @@ namespace AssetStudio
}
case CompressionType.Lz4:
case CompressionType.Lz4HC:
case CompressionType.Custom:
{
var compressedSize = (int)blockInfo.compressedSize;
var compressedBytes = BigArrayPool<byte>.Shared.Rent(compressedSize);
@@ -389,10 +394,30 @@ namespace AssetStudio
var uncompressedBytes = BigArrayPool<byte>.Shared.Rent(uncompressedSize);
try
{
var numWrite = LZ4Codec.Decode(compressedBytes, 0, compressedSize, uncompressedBytes, 0, uncompressedSize);
var compTypeStr = compressionType.ToString();
if (compressionType == CompressionType.Custom)
{
compTypeStr = useZstd ? "Zstd" : "Lz4";
if (i == 0)
{
Logger.Debug($"Custom block compression type was detected. Trying to decompress as {compTypeStr} archive..");
i++;
}
}
int numWrite;
if (compressionType == CompressionType.Custom && useZstd)
{
numWrite = zstdCodec.Unwrap(compressedBytes, 0, compressedSize, uncompressedBytes, 0, uncompressedSize);
}
else
{
numWrite = LZ4Codec.Decode(compressedBytes, 0, compressedSize, uncompressedBytes, 0, uncompressedSize);
}
if (numWrite != uncompressedSize)
{
throw new IOException($"Lz4 decompression error, write {numWrite} bytes but expected {uncompressedSize} bytes");
throw new IOException($"{compTypeStr} block decompression error, write {numWrite} bytes but expected {uncompressedSize} bytes");
}
blocksStream.Write(uncompressedBytes, 0, uncompressedSize);
}
@@ -404,7 +429,7 @@ namespace AssetStudio
break;
}
default:
throw new IOException($"Unsupported compression type {compressionType}");
throw new IOException($"Unsupported block compression type {compressionType}");
}
}
blocksStream.Position = 0;