diff options
| author | Tom Cherry <tomcherry@google.com> | 2020-06-25 15:02:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 15:02:35 +0000 |
| commit | 3f1381fbcd170f40f22d8b38e735d795e4a755fa (patch) | |
| tree | e0f97b79d0d9fbfe771b1d67813b84a0a6e6cadb /logd/CompressionEngine.h | |
| parent | b3a10e52201e3602bf4c4a4120cace63e0bb2304 (diff) | |
| parent | c58d1e4aec4d59b112fa1cc2aa99ed4eb0a25010 (diff) | |
Merge changes I9638e90b,Ib2636dfc am: c58d1e4aec
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1349344
Change-Id: I54b5873749ec46f6489d6e6f8224759239b0b25e
Diffstat (limited to 'logd/CompressionEngine.h')
| -rw-r--r-- | logd/CompressionEngine.h | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/logd/CompressionEngine.h b/logd/CompressionEngine.h index d760ceaa5c..0f760ed200 100644 --- a/logd/CompressionEngine.h +++ b/logd/CompressionEngine.h @@ -16,8 +16,9 @@ #pragma once -#include <span> -#include <vector> +#include <memory> + +#include "SerializedData.h" class CompressionEngine { public: @@ -25,23 +26,20 @@ class CompressionEngine { virtual ~CompressionEngine(){}; - virtual bool Compress(std::span<uint8_t> in, std::vector<uint8_t>& out) = 0; - // Decompress the contents of `in` into `out`. `out_size` must be set to the decompressed size - // of the contents. - virtual bool Decompress(const std::vector<uint8_t>& in, std::vector<uint8_t>& out, - size_t out_size) = 0; + virtual bool Compress(SerializedData& in, size_t data_length, SerializedData& out) = 0; + // Decompress the contents of `in` into `out`. `out.size()` must be set to the decompressed + // size of the contents. + virtual bool Decompress(SerializedData& in, SerializedData& out) = 0; }; class ZlibCompressionEngine : public CompressionEngine { public: - bool Compress(std::span<uint8_t> in, std::vector<uint8_t>& out) override; - bool Decompress(const std::vector<uint8_t>& in, std::vector<uint8_t>& out, - size_t out_size) override; + bool Compress(SerializedData& in, size_t data_length, SerializedData& out) override; + bool Decompress(SerializedData& in, SerializedData& out) override; }; class ZstdCompressionEngine : public CompressionEngine { public: - bool Compress(std::span<uint8_t> in, std::vector<uint8_t>& out) override; - bool Decompress(const std::vector<uint8_t>& in, std::vector<uint8_t>& out, - size_t out_size) override; + bool Compress(SerializedData& in, size_t data_length, SerializedData& out) override; + bool Decompress(SerializedData& in, SerializedData& out) override; };
\ No newline at end of file |