Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated to support UE5.5, TOC format updated #56

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated to support UE5.5, TOC format updated #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 46 additions & 6 deletions PakAnalyzer/Private/IoStoreAnalyzer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ bool FIoStoreAnalyzer::InitializeReaders(const TArray<FString>& InPaks, const TA
TSharedPtr<FIoStoreReader>& Reader = ContainerInfo.Reader;

TIoStatusOr<FIoStoreTocChunkInfo> ChunkInfo = Reader->GetChunkInfo(PackageInfo.ChunkId);
PackageInfo.ChunkInfo = ChunkInfo.ValueOrDie();
PackageInfo.ChunkInfo = FIoStoreTocChunkInfo(ChunkInfo.ValueOrDie());

FIoStoreTocResourceInfo* TocResource = TocResources.Find(ContainerInfo.Id.Value());
if (TocResource)
Expand Down Expand Up @@ -1002,8 +1002,20 @@ bool FIoStoreAnalyzer::PreLoadIoStore(const FString& InTocPath, const FString& I

for (int32 ChunkIndex = 0; ChunkIndex < TocResource.ChunkIds.Num(); ++ChunkIndex)
{
TocResource.ChunkIdToIndex.Add(TocResource.ChunkIds[ChunkIndex], ChunkIndex);
int32 PerfectHashSeedIndex = TocResource.ChunkPerfectHashSeeds.IsValidIndex(ChunkIndex) ? TocResource.ChunkPerfectHashSeeds[ChunkIndex] : INDEX_NONE;

if (PerfectHashSeedIndex != INDEX_NONE)
{
// If a perfect hash seed exists, use it for indexing
int32 HashIndex = TocResource.ChunkPerfectHashSeeds[ChunkIndex];
}
else
{
// If no perfect hash seed, fall back to a standard index lookup
int32 FallbackIndex = TocResource.ChunkIndicesWithoutPerfectHash.Find(ChunkIndex);
}
}

DataPtr += Header.TocEntryCount * sizeof(FIoChunkId);

// Chunk offsets
Expand Down Expand Up @@ -1219,7 +1231,7 @@ bool FIoStoreAnalyzer::TryDecryptIoStore(const FIoStoreTocResourceInfo& TocResou
Dst += SizeInBlock;
}

FIoChunkHash ChunkHash = FIoChunkHash::HashBuffer(RawData.GetData(), RawData.Num());
FIoHash ChunkHash = FIoHash::HashBuffer(RawData.GetData(), RawData.Num());
if (ChunkHash != Meta.ChunkHash)
{
return false;
Expand Down Expand Up @@ -1256,10 +1268,38 @@ bool FIoStoreAnalyzer::FillPackageInfo(const FIoStoreTocResourceInfo& TocResourc
OutPackageInfo.CompressionBlockCount += 1;
}

const int32* Index = TocResource.ChunkIdToIndex.Find(OutPackageInfo.ChunkId);
if (Index && TocResource.ChunkMetas.IsValidIndex(*Index))
int32 Index = INDEX_NONE;

// First, try to find the chunk using the Perfect Hash system
if (TocResource.ChunkPerfectHashSeeds.Num() > 0)
{
int32 Seed = FIoStoreTocResourceInfo::HashChunkIdWithSeed(OutPackageInfo.ChunkId, TocResource.ChunkPerfectHashSeeds);
Index = TocResource.ChunkPerfectHashSeeds.IsValidIndex(Seed) ? Seed : INDEX_NONE;
}

// If the perfect hash lookup fails, fallback to a linear search
if (Index == INDEX_NONE)
{
int32 FallbackIndex = INDEX_NONE;
for (int32 i = 0; i < TocResource.ChunkIds.Num(); ++i)
{
if (TocResource.ChunkIds[i] == OutPackageInfo.ChunkId)
{
FallbackIndex = i;
break;
}
}

if (FallbackIndex != INDEX_NONE)
{
Index = FallbackIndex;
}
}

// Check if the index is valid and assign the chunk hash
if (Index != INDEX_NONE && TocResource.ChunkMetas.IsValidIndex(Index))
{
OutPackageInfo.ChunkHash = TocResource.ChunkMetas[*Index].ChunkHash.ToString();
OutPackageInfo.ChunkHash = LexToString(TocResource.ChunkMetas[Index].ChunkHash);
}

return true;
Expand Down
36 changes: 32 additions & 4 deletions PakAnalyzer/Private/IoStoreDefines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,13 @@ enum class EIoStoreTocVersion : uint8
PerfectHash,
PerfectHashWithOverflow,
OnDemandMetaData,
RemovedOnDemandMetaData,
ReplaceIoChunkHashWithIoHash,
LatestPlusOne,
Latest = LatestPlusOne - 1
};


/**
* I/O Store TOC header.
*/
Expand Down Expand Up @@ -195,16 +198,22 @@ enum class FIoStoreTocEntryMetaFlags : uint8

ENUM_CLASS_FLAGS(FIoStoreTocEntryMetaFlags);


/**
* TOC entry meta data
*/
struct FIoStoreTocEntryMeta
{
// Source data hash (i.e. not the on disk data)
FIoChunkHash ChunkHash;
FIoStoreTocEntryMetaFlags Flags;
FIoHash ChunkHash;
FIoStoreTocEntryMetaFlags Flags = FIoStoreTocEntryMetaFlags::None;
uint8 Pad[3] = { 0 };
};


/**
* Container TOC data.
*/
struct FIoStoreTocResourceInfo
{
enum { CompressionMethodNameLen = 32 };
Expand All @@ -213,13 +222,32 @@ struct FIoStoreTocResourceInfo
int64 TocFileSize = 0;

TArray<FIoChunkId> ChunkIds;
TMap<FIoChunkId, int32> ChunkIdToIndex;
TArray<FIoOffsetAndLength> ChunkOffsetLengths; // Added field
TArray<int32> ChunkPerfectHashSeeds; // Used for Perfect Hash lookups
TArray<int32> ChunkIndicesWithoutPerfectHash; // Fallback lookup

TArray<FIoStoreTocCompressedBlockEntry> CompressionBlocks;
TArray<FName> CompressionMethods;

FSHAHash SignatureHash; // Added field
TArray<FSHAHash> ChunkBlockSignatures;

TArray<uint8> DirectoryIndexBuffer;
TArray<FIoStoreTocEntryMeta> ChunkMetas;

TArray<FName> CompressionMethods;
static int32 HashChunkIdWithSeed(const FIoChunkId& ChunkId, const TArray<int32>& Seeds)
{
if (Seeds.Num() == 0)
{
return INDEX_NONE;
}

uint32 HashValue = GetTypeHash(ChunkId); // Hash the chunk ID
return HashValue % Seeds.Num(); // Get index using modulus
}
};


struct FScriptObjectDesc
{
FName Name;
Expand Down