Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-09-17 08:02:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Host: Use CompressHelpers for ReadCompressedResourceFile()

Browse source
This commit is contained in:
Stenzek 2024-08-26 21:33:00 +10:00
parent 19e94649f1
commit 8e11dd42b4
No known key found for this signature in database
1 changed files with 5 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/core/host.cpp
View file

@ -10,6 +10,7 @@
#include "scmversion/scmversion.h" #include "scmversion/scmversion.h"
#include "util/compress_helpers.h"
#include "util/gpu_device.h" #include "util/gpu_device.h"
#include "util/imgui_manager.h" #include "util/imgui_manager.h"
#include "util/input_manager.h" #include "util/input_manager.h"
@ -25,8 +26,6 @@
#include <cstdarg> #include <cstdarg>
#include <limits> #include <limits>
#include <zstd.h>
#include <zstd_errors.h>
Log_SetChannel(Host); Log_SetChannel(Host);
@ -50,40 +49,10 @@ std::optional<DynamicHeapArray<u8>> Host::ReadCompressedResourceFile(std::string
std::optional<DynamicHeapArray<u8>> ret = Host::ReadResourceFile(filename, allow_override); std::optional<DynamicHeapArray<u8>> ret = Host::ReadResourceFile(filename, allow_override);
if (ret.has_value()) if (ret.has_value())
{ {
const std::string_view extension = Path::GetExtension(filename); Error error;
if (StringUtil::EqualNoCase(extension, "zst")) ret = CompressHelpers::DecompressFile(filename, std::move(ret), std::nullopt, &error);
{ if (!ret.has_value())
// Need to zstd decompress. ERROR_LOG("Failed to decompress '{}': {}", Path::GetFileName(filename), error.GetDescription());
const unsigned long long decompressed_size = ZSTD_getFrameContentSize(ret->data(), ret->size());
if (decompressed_size == ZSTD_CONTENTSIZE_UNKNOWN || decompressed_size == ZSTD_CONTENTSIZE_ERROR ||
decompressed_size >= std::numeric_limits<size_t>::max()) [[unlikely]]
{
ERROR_LOG("Failed to get size of {}.", filename);
ret.reset();
return ret;
}
DEV_LOG("Decompressing resource {}: {} => {} bytes", filename, ret->size(), decompressed_size);
DynamicHeapArray<u8> decompressed_data(decompressed_size);
const size_t result =
ZSTD_decompress(decompressed_data.data(), decompressed_data.size(), ret->data(), ret->size());
if (ZSTD_isError(result)) [[unlikely]]
{
const char* errstr = ZSTD_getErrorString(ZSTD_getErrorCode(result));
ERROR_LOG("ZSTD_decompress() for {} failed: {}", filename, errstr ? errstr : "<unknown>");
ret.reset();
return ret;
}
if (result < decompressed_size) [[unlikely]]
{
ERROR_LOG("ZSTD_decompress() for {} only returned {} of {} bytes.", filename, result, decompressed_size);
ret.reset();
return ret;
}
ret = std::move(decompressed_data);
}
} }
return ret; return ret;