diff options
| author | 2020-08-15 05:25:28 -0400 | |
|---|---|---|
| committer | 2020-08-15 17:17:56 -0400 | |
| commit | 1ee060ca0dfae7d0a1c830c7495f3125acf0ec7f (patch) | |
| tree | 23126ca46fa87e73445002adb9422d7c6295a1da /src/common/lz4_compression.cpp | |
| parent | common: Make use of [[nodiscard]] where applicable (diff) | |
| download | yuzu-1ee060ca0dfae7d0a1c830c7495f3125acf0ec7f.tar.gz yuzu-1ee060ca0dfae7d0a1c830c7495f3125acf0ec7f.tar.xz yuzu-1ee060ca0dfae7d0a1c830c7495f3125acf0ec7f.zip | |
common/compression: Roll back std::span changes
Seems like all compilers don't support std::span yet.
Diffstat (limited to 'src/common/lz4_compression.cpp')
| -rw-r--r-- | src/common/lz4_compression.cpp | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/src/common/lz4_compression.cpp b/src/common/lz4_compression.cpp index 8e2e4094b..25700015a 100644 --- a/src/common/lz4_compression.cpp +++ b/src/common/lz4_compression.cpp | |||
| @@ -10,52 +10,53 @@ | |||
| 10 | 10 | ||
| 11 | namespace Common::Compression { | 11 | namespace Common::Compression { |
| 12 | 12 | ||
| 13 | std::vector<u8> CompressDataLZ4(std::span<const u8> source) { | 13 | std::vector<u8> CompressDataLZ4(const u8* source, std::size_t source_size) { |
| 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 auto max_compressed_size = static_cast<std::size_t>(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.data()), | 20 | const int compressed_size = LZ4_compress_default( |
| 21 | reinterpret_cast<char*>(compressed.data()), | 21 | reinterpret_cast<const char*>(source), reinterpret_cast<char*>(compressed.data()), |
| 22 | source_size_int, max_compressed_size); | 22 | source_size_int, static_cast<int>(max_compressed_size)); |
| 23 | 23 | ||
| 24 | if (compressed_size <= 0) { | 24 | if (compressed_size <= 0) { |
| 25 | // Compression failed | 25 | // Compression failed |
| 26 | return {}; | 26 | return {}; |
| 27 | } | 27 | } |
| 28 | 28 | ||
| 29 | compressed.resize(compressed_size); | 29 | compressed.resize(static_cast<std::size_t>(compressed_size)); |
| 30 | 30 | ||
| 31 | return compressed; | 31 | return compressed; |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | std::vector<u8> CompressDataLZ4HC(std::span<const u8> source, s32 compression_level) { | 34 | std::vector<u8> CompressDataLZ4HC(const u8* source, std::size_t source_size, |
| 35 | ASSERT_MSG(source.size() <= LZ4_MAX_INPUT_SIZE, "Source size exceeds LZ4 maximum input size"); | 35 | s32 compression_level) { |
| 36 | ASSERT_MSG(source_size <= LZ4_MAX_INPUT_SIZE, "Source size exceeds LZ4 maximum input size"); | ||
| 36 | 37 | ||
| 37 | compression_level = std::clamp(compression_level, LZ4HC_CLEVEL_MIN, LZ4HC_CLEVEL_MAX); | 38 | compression_level = std::clamp(compression_level, LZ4HC_CLEVEL_MIN, LZ4HC_CLEVEL_MAX); |
| 38 | 39 | ||
| 39 | const auto source_size_int = static_cast<int>(source.size()); | 40 | const auto source_size_int = static_cast<int>(source_size); |
| 40 | const int max_compressed_size = LZ4_compressBound(source_size_int); | 41 | const auto max_compressed_size = static_cast<std::size_t>(LZ4_compressBound(source_size_int)); |
| 41 | std::vector<u8> compressed(max_compressed_size); | 42 | std::vector<u8> compressed(max_compressed_size); |
| 42 | 43 | ||
| 43 | const int compressed_size = LZ4_compress_HC( | 44 | const int compressed_size = LZ4_compress_HC( |
| 44 | reinterpret_cast<const char*>(source.data()), reinterpret_cast<char*>(compressed.data()), | 45 | reinterpret_cast<const char*>(source), reinterpret_cast<char*>(compressed.data()), |
| 45 | source_size_int, max_compressed_size, compression_level); | 46 | source_size_int, static_cast<int>(max_compressed_size), compression_level); |
| 46 | 47 | ||
| 47 | if (compressed_size <= 0) { | 48 | if (compressed_size <= 0) { |
| 48 | // Compression failed | 49 | // Compression failed |
| 49 | return {}; | 50 | return {}; |
| 50 | } | 51 | } |
| 51 | 52 | ||
| 52 | compressed.resize(compressed_size); | 53 | compressed.resize(static_cast<std::size_t>(compressed_size)); |
| 53 | 54 | ||
| 54 | return compressed; | 55 | return compressed; |
| 55 | } | 56 | } |
| 56 | 57 | ||
| 57 | std::vector<u8> CompressDataLZ4HCMax(std::span<const u8> source) { | 58 | std::vector<u8> CompressDataLZ4HCMax(const u8* source, std::size_t source_size) { |
| 58 | return CompressDataLZ4HC(source, LZ4HC_CLEVEL_MAX); | 59 | return CompressDataLZ4HC(source, source_size, LZ4HC_CLEVEL_MAX); |
| 59 | } | 60 | } |
| 60 | 61 | ||
| 61 | std::vector<u8> DecompressDataLZ4(const std::vector<u8>& compressed, | 62 | std::vector<u8> DecompressDataLZ4(const std::vector<u8>& compressed, |