diff options
| author | unknown <FreddyFunk@users.noreply.github.com> | 2019-02-10 10:28:04 +0100 |
|---|---|---|
| committer | FreddyFunk <FreddyFunk@users.noreply.github.com> | 2019-03-29 18:22:08 +0100 |
| commit | b4857e326fdf4c980c88ca399e7d12f99253777e (patch) | |
| tree | 5e90dbe3f86317723ee15306cdf1de38d6405790 /src/common/zstd_compression.cpp | |
| parent | aa92da205e3f975dffc3c706fb0a176f13649492 (diff) | |
common/zstd_compression: simplify decompression interface
Diffstat (limited to 'src/common/zstd_compression.cpp')
| -rw-r--r-- | src/common/zstd_compression.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/common/zstd_compression.cpp b/src/common/zstd_compression.cpp index f6cf7a791a..60a35c67cc 100644 --- a/src/common/zstd_compression.cpp +++ b/src/common/zstd_compression.cpp @@ -13,7 +13,6 @@ namespace Common::Compression { std::vector<u8> CompressDataZSTD(const u8* source, std::size_t source_size, s32 compression_level) { - compression_level = std::clamp(compression_level, 1, ZSTD_maxCLevel()); const std::size_t max_compressed_size = ZSTD_compressBound(source_size); @@ -36,17 +35,19 @@ std::vector<u8> CompressDataZSTDDefault(const u8* source, std::size_t source_siz return CompressDataZSTD(source, source_size, ZSTD_CLEVEL_DEFAULT); } -std::vector<u8> DecompressDataZSTD(const std::vector<u8>& compressed, - std::size_t uncompressed_size) { - std::vector<u8> uncompressed(uncompressed_size); +std::vector<u8> DecompressDataZSTD(const std::vector<u8>& compressed) { + const std::size_t decompressed_size = + ZSTD_getDecompressedSize(compressed.data(), compressed.size()); + std::vector<u8> decompressed(decompressed_size); + const std::size_t uncompressed_result_size = ZSTD_decompress( - uncompressed.data(), uncompressed.size(), compressed.data(), compressed.size()); + decompressed.data(), decompressed.size(), compressed.data(), compressed.size()); - if (uncompressed_size != uncompressed_result_size || ZSTD_isError(uncompressed_result_size)) { + if (decompressed_size != uncompressed_result_size || ZSTD_isError(uncompressed_result_size)) { // Decompression failed return {}; } - return uncompressed; + return decompressed; } } // namespace Common::Compression |