octo/yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6357 from lioncash/compression

Browse Source 
common/compression: Make use of std::span
This commit is contained in:
bunnei
2021-05-24 18:50:26 -07:00
committed by GitHub
parent aee3b57c44 49bfd0c461
commit d84a93c987
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/lz4_compression.cpp
View File

@@ -59,8 +59,7 @@ std::vector<u8> CompressDataLZ4HCMax(const u8* source, std::size_t source_size)
return CompressDataLZ4HC(source, source_size, LZ4HC_CLEVEL_MAX); return CompressDataLZ4HC(source, source_size, LZ4HC_CLEVEL_MAX);
} }
std::vector<u8> DecompressDataLZ4(const std::vector<u8>& compressed, std::vector<u8> DecompressDataLZ4(std::span<const u8> compressed, std::size_t uncompressed_size) {
std::size_t uncompressed_size) {
std::vector<u8> uncompressed(uncompressed_size); std::vector<u8> uncompressed(uncompressed_size);
const int size_check = LZ4_decompress_safe(reinterpret_cast<const char*>(compressed.data()), const int size_check = LZ4_decompress_safe(reinterpret_cast<const char*>(compressed.data()),
reinterpret_cast<char*>(uncompressed.data()), reinterpret_cast<char*>(uncompressed.data()),

3
src/common/lz4_compression.h
View File

@@ -4,6 +4,7 @@
#pragma once #pragma once
#include <span>
#include <vector> #include <vector>
#include "common/common_types.h" #include "common/common_types.h"
@@ -53,7 +54,7 @@ namespace Common::Compression {
* *
* @return the decompressed data. * @return the decompressed data.
*/ */
[[nodiscard]] std::vector<u8> DecompressDataLZ4(const std::vector<u8>& compressed, [[nodiscard]] std::vector<u8> DecompressDataLZ4(std::span<const u8> compressed,
std::size_t uncompressed_size); std::size_t uncompressed_size);
} // namespace Common::Compression } // namespace Common::Compression

2
src/common/zstd_compression.cpp
View File

@@ -32,7 +32,7 @@ std::vector<u8> CompressDataZSTDDefault(const u8* source, std::size_t source_siz
return CompressDataZSTD(source, source_size, ZSTD_CLEVEL_DEFAULT); return CompressDataZSTD(source, source_size, ZSTD_CLEVEL_DEFAULT);
} }
std::vector<u8> DecompressDataZSTD(const std::vector<u8>& compressed) { std::vector<u8> DecompressDataZSTD(std::span<const u8> compressed) {
const std::size_t decompressed_size = const std::size_t decompressed_size =
ZSTD_getDecompressedSize(compressed.data(), compressed.size()); ZSTD_getDecompressedSize(compressed.data(), compressed.size());
std::vector<u8> decompressed(decompressed_size); std::vector<u8> decompressed(decompressed_size);

3
src/common/zstd_compression.h
View File

@@ -4,6 +4,7 @@
#pragma once #pragma once
#include <span>
#include <vector> #include <vector>
#include "common/common_types.h" #include "common/common_types.h"
@@ -40,6 +41,6 @@ namespace Common::Compression {
* *
* @return the decompressed data. * @return the decompressed data.
*/ */
[[nodiscard]] std::vector<u8> DecompressDataZSTD(const std::vector<u8>& compressed); [[nodiscard]] std::vector<u8> DecompressDataZSTD(std::span<const u8> compressed);
} // namespace Common::Compression } // namespace Common::Compression