diff options
| author | 2020-07-25 03:11:14 -0400 | |
|---|---|---|
| committer | 2020-07-25 03:11:56 -0400 | |
| commit | c5bdccfecb279ba581e5931f7fd9678d1aaa8f85 (patch) | |
| tree | 8d12aff0d6624729521ea9a5950308fd2731aa18 /src/common/zstd_compression.cpp | |
| parent | Merge pull request #4383 from ogniK5377/dark-checkbox (diff) | |
| download | yuzu-c5bdccfecb279ba581e5931f7fd9678d1aaa8f85.tar.gz yuzu-c5bdccfecb279ba581e5931f7fd9678d1aaa8f85.tar.xz yuzu-c5bdccfecb279ba581e5931f7fd9678d1aaa8f85.zip | |
zstd_compression: Make use of std::span in interfaces
Allows condensing the data and size parameters into a single argument.
Diffstat (limited to '')
| -rw-r--r-- | src/common/zstd_compression.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/common/zstd_compression.cpp b/src/common/zstd_compression.cpp index 978526492..770833ee7 100644 --- a/src/common/zstd_compression.cpp +++ b/src/common/zstd_compression.cpp | |||
| @@ -5,19 +5,18 @@ | |||
| 5 | #include <algorithm> | 5 | #include <algorithm> |
| 6 | #include <zstd.h> | 6 | #include <zstd.h> |
| 7 | 7 | ||
| 8 | #include "common/assert.h" | ||
| 9 | #include "common/zstd_compression.h" | 8 | #include "common/zstd_compression.h" |
| 10 | 9 | ||
| 11 | namespace Common::Compression { | 10 | namespace Common::Compression { |
| 12 | 11 | ||
| 13 | std::vector<u8> CompressDataZSTD(const u8* source, std::size_t source_size, s32 compression_level) { | 12 | std::vector<u8> CompressDataZSTD(std::span<const u8> source, s32 compression_level) { |
| 14 | compression_level = std::clamp(compression_level, 1, ZSTD_maxCLevel()); | 13 | compression_level = std::clamp(compression_level, 1, ZSTD_maxCLevel()); |
| 15 | 14 | ||
| 16 | const std::size_t max_compressed_size = ZSTD_compressBound(source_size); | 15 | const std::size_t max_compressed_size = ZSTD_compressBound(source.size()); |
| 17 | std::vector<u8> compressed(max_compressed_size); | 16 | std::vector<u8> compressed(max_compressed_size); |
| 18 | 17 | ||
| 19 | const std::size_t compressed_size = | 18 | const std::size_t compressed_size = ZSTD_compress( |
| 20 | ZSTD_compress(compressed.data(), compressed.size(), source, source_size, compression_level); | 19 | compressed.data(), compressed.size(), source.data(), source.size(), compression_level); |
| 21 | 20 | ||
| 22 | if (ZSTD_isError(compressed_size)) { | 21 | if (ZSTD_isError(compressed_size)) { |
| 23 | // Compression failed | 22 | // Compression failed |
| @@ -29,8 +28,8 @@ std::vector<u8> CompressDataZSTD(const u8* source, std::size_t source_size, s32 | |||
| 29 | return compressed; | 28 | return compressed; |
| 30 | } | 29 | } |
| 31 | 30 | ||
| 32 | std::vector<u8> CompressDataZSTDDefault(const u8* source, std::size_t source_size) { | 31 | std::vector<u8> CompressDataZSTDDefault(std::span<const u8> source) { |
| 33 | return CompressDataZSTD(source, source_size, ZSTD_CLEVEL_DEFAULT); | 32 | return CompressDataZSTD(source, ZSTD_CLEVEL_DEFAULT); |
| 34 | } | 33 | } |
| 35 | 34 | ||
| 36 | std::vector<u8> DecompressDataZSTD(const std::vector<u8>& compressed) { | 35 | std::vector<u8> DecompressDataZSTD(const std::vector<u8>& compressed) { |