diff options
Diffstat (limited to 'src/common/lz4_compression.cpp')
| -rw-r--r-- | src/common/lz4_compression.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/common/lz4_compression.cpp b/src/common/lz4_compression.cpp index ade6759bb..8e2e4094b 100644 --- a/src/common/lz4_compression.cpp +++ b/src/common/lz4_compression.cpp | |||
| @@ -10,14 +10,14 @@ | |||
| 10 | 10 | ||
| 11 | namespace Common::Compression { | 11 | namespace Common::Compression { |
| 12 | 12 | ||
| 13 | std::vector<u8> CompressDataLZ4(const u8* source, std::size_t source_size) { | 13 | std::vector<u8> CompressDataLZ4(std::span<const u8> source) { |
| 14 | ASSERT_MSG(source_size <= LZ4_MAX_INPUT_SIZE, "Source size exceeds LZ4 maximum input size"); | 14 | ASSERT_MSG(source.size() <= LZ4_MAX_INPUT_SIZE, "Source size exceeds LZ4 maximum input size"); |
| 15 | 15 | ||
| 16 | const auto source_size_int = static_cast<int>(source_size); | 16 | const auto source_size_int = static_cast<int>(source.size()); |
| 17 | const int max_compressed_size = LZ4_compressBound(source_size_int); | 17 | const int max_compressed_size = LZ4_compressBound(source_size_int); |
| 18 | std::vector<u8> compressed(max_compressed_size); | 18 | std::vector<u8> compressed(max_compressed_size); |
| 19 | 19 | ||
| 20 | const int compressed_size = LZ4_compress_default(reinterpret_cast<const char*>(source), | 20 | const int compressed_size = LZ4_compress_default(reinterpret_cast<const char*>(source.data()), |
| 21 | reinterpret_cast<char*>(compressed.data()), | 21 | reinterpret_cast<char*>(compressed.data()), |
| 22 | source_size_int, max_compressed_size); | 22 | source_size_int, max_compressed_size); |
| 23 | 23 | ||
| @@ -31,18 +31,17 @@ std::vector<u8> CompressDataLZ4(const u8* source, std::size_t source_size) { | |||
| 31 | return compressed; | 31 | return compressed; |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | std::vector<u8> CompressDataLZ4HC(const u8* source, std::size_t source_size, | 34 | std::vector<u8> CompressDataLZ4HC(std::span<const u8> source, s32 compression_level) { |
| 35 | s32 compression_level) { | 35 | ASSERT_MSG(source.size() <= LZ4_MAX_INPUT_SIZE, "Source size exceeds LZ4 maximum input size"); |
| 36 | ASSERT_MSG(source_size <= LZ4_MAX_INPUT_SIZE, "Source size exceeds LZ4 maximum input size"); | ||
| 37 | 36 | ||
| 38 | compression_level = std::clamp(compression_level, LZ4HC_CLEVEL_MIN, LZ4HC_CLEVEL_MAX); | 37 | compression_level = std::clamp(compression_level, LZ4HC_CLEVEL_MIN, LZ4HC_CLEVEL_MAX); |
| 39 | 38 | ||
| 40 | const auto source_size_int = static_cast<int>(source_size); | 39 | const auto source_size_int = static_cast<int>(source.size()); |
| 41 | const int max_compressed_size = LZ4_compressBound(source_size_int); | 40 | const int max_compressed_size = LZ4_compressBound(source_size_int); |
| 42 | std::vector<u8> compressed(max_compressed_size); | 41 | std::vector<u8> compressed(max_compressed_size); |
| 43 | 42 | ||
| 44 | const int compressed_size = LZ4_compress_HC( | 43 | const int compressed_size = LZ4_compress_HC( |
| 45 | reinterpret_cast<const char*>(source), reinterpret_cast<char*>(compressed.data()), | 44 | reinterpret_cast<const char*>(source.data()), reinterpret_cast<char*>(compressed.data()), |
| 46 | source_size_int, max_compressed_size, compression_level); | 45 | source_size_int, max_compressed_size, compression_level); |
| 47 | 46 | ||
| 48 | if (compressed_size <= 0) { | 47 | if (compressed_size <= 0) { |
| @@ -55,8 +54,8 @@ std::vector<u8> CompressDataLZ4HC(const u8* source, std::size_t source_size, | |||
| 55 | return compressed; | 54 | return compressed; |
| 56 | } | 55 | } |
| 57 | 56 | ||
| 58 | std::vector<u8> CompressDataLZ4HCMax(const u8* source, std::size_t source_size) { | 57 | std::vector<u8> CompressDataLZ4HCMax(std::span<const u8> source) { |
| 59 | return CompressDataLZ4HC(source, source_size, LZ4HC_CLEVEL_MAX); | 58 | return CompressDataLZ4HC(source, LZ4HC_CLEVEL_MAX); |
| 60 | } | 59 | } |
| 61 | 60 | ||
| 62 | std::vector<u8> DecompressDataLZ4(const std::vector<u8>& compressed, | 61 | std::vector<u8> DecompressDataLZ4(const std::vector<u8>& compressed, |