ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DiscIO: Fix creation of rvz with > 2mb chunk size

This commit is contained in:
TellowKrinkle 2022-05-31 04:41:35 -05:00
parent 70bf89fa59
commit 26fc167a44
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/DiscIO/WIABlob.cpp
View File

@ -1142,8 +1142,8 @@ static bool AllSame(const u8* begin, const u8* end)
template <typename OutputParametersEntry> template <typename OutputParametersEntry>
static void RVZPack(const u8* in, OutputParametersEntry* out, u64 bytes_per_chunk, size_t chunks, static void RVZPack(const u8* in, OutputParametersEntry* out, u64 bytes_per_chunk, size_t chunks,
u64 total_size, u64 data_offset, u64 in_offset, bool multipart, u64 total_size, u64 data_offset, bool multipart, bool allow_junk_reuse,
bool allow_junk_reuse, bool compression, const FileSystem* file_system) bool compression, const FileSystem* file_system)
{ {
using Seed = std::array<u32, LaggedFibonacciGenerator::SEED_SIZE>; using Seed = std::array<u32, LaggedFibonacciGenerator::SEED_SIZE>;
struct JunkInfo struct JunkInfo
@ -1162,7 +1162,7 @@ static void RVZPack(const u8* in, OutputParametersEntry* out, u64 bytes_per_chun
{ {
// Skip the 0 to 32 zero bytes that typically come after a file // Skip the 0 to 32 zero bytes that typically come after a file
size_t zeroes = 0; size_t zeroes = 0;
while (position + zeroes < total_size && in[in_offset + position + zeroes] == 0) while (position + zeroes < total_size && in[position + zeroes] == 0)
++zeroes; ++zeroes;
// If there are very many zero bytes (perhaps the PRNG junk data has been scrubbed?) // If there are very many zero bytes (perhaps the PRNG junk data has been scrubbed?)
@ -1182,7 +1182,7 @@ static void RVZPack(const u8* in, OutputParametersEntry* out, u64 bytes_per_chun
Seed seed; Seed seed;
const size_t bytes_reconstructed = LaggedFibonacciGenerator::GetSeed( const size_t bytes_reconstructed = LaggedFibonacciGenerator::GetSeed(
in + in_offset + position, bytes_to_read, data_offset_mod, seed.data()); in + position, bytes_to_read, data_offset_mod, seed.data());
if (bytes_reconstructed > 0) if (bytes_reconstructed > 0)
junk_info.emplace(position + bytes_reconstructed, JunkInfo{position, seed}); junk_info.emplace(position + bytes_reconstructed, JunkInfo{position, seed});
@ -1248,7 +1248,7 @@ static void RVZPack(const u8* in, OutputParametersEntry* out, u64 bytes_per_chun
if (next_junk_start == end_offset) if (next_junk_start == end_offset)
{ {
// Storing this chunk without RVZ packing would be inefficient, so store it without // Storing this chunk without RVZ packing would be inefficient, so store it without
PushBack(&entry.main_data, in + in_offset + current_offset, in + in_offset + end_offset); PushBack(&entry.main_data, in + current_offset, in + end_offset);
break; break;
} }
@ -1258,7 +1258,7 @@ static void RVZPack(const u8* in, OutputParametersEntry* out, u64 bytes_per_chun
const u64 non_junk_bytes = next_junk_start - current_offset; const u64 non_junk_bytes = next_junk_start - current_offset;
if (non_junk_bytes > 0) if (non_junk_bytes > 0)
{ {
const u8* ptr = in + in_offset + current_offset; const u8* ptr = in + current_offset;
PushBack(&entry.main_data, Common::swap32(static_cast<u32>(non_junk_bytes))); PushBack(&entry.main_data, Common::swap32(static_cast<u32>(non_junk_bytes)));
PushBack(&entry.main_data, ptr, ptr + non_junk_bytes); PushBack(&entry.main_data, ptr, ptr + non_junk_bytes);
@ -1284,8 +1284,7 @@ template <typename OutputParametersEntry>
static void RVZPack(const u8* in, OutputParametersEntry* out, u64 size, u64 data_offset, static void RVZPack(const u8* in, OutputParametersEntry* out, u64 size, u64 data_offset,
bool allow_junk_reuse, bool compression, const FileSystem* file_system) bool allow_junk_reuse, bool compression, const FileSystem* file_system)
{ {
RVZPack(in, out, size, 1, size, data_offset, 0, false, allow_junk_reuse, compression, RVZPack(in, out, size, 1, size, data_offset, false, allow_junk_reuse, compression, file_system);
file_system);
} }
template <bool RVZ> template <bool RVZ>
@ -1473,8 +1472,8 @@ WIARVZFileReader<RVZ>::ProcessAndCompress(CompressThreadState* state, CompressPa
const u64 data_offset = parameters.data_offset + write_offset_of_group; const u64 data_offset = parameters.data_offset + write_offset_of_group;
RVZPack(state->decryption_buffer[0].data(), output_entries.data() + first_chunk, RVZPack(state->decryption_buffer[0].data(), output_entries.data() + first_chunk,
bytes_per_chunk, chunks, total_size, data_offset, write_offset_of_group, bytes_per_chunk, chunks, total_size, data_offset, groups > 1, allow_junk_reuse,
groups > 1, allow_junk_reuse, compression, file_system); compression, file_system);
} }
else else
{ {