diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:27 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:27 +0000 |
commit | 40a355a42d4a9444dc753c04c6608dade2f06a23 (patch) | |
tree | 871fc667d2de662f171103ce5ec067014ef85e61 /third_party/libwebrtc/rtc_base/byte_buffer.h | |
parent | Adding upstream version 124.0.1. (diff) | |
download | firefox-40a355a42d4a9444dc753c04c6608dade2f06a23.tar.xz firefox-40a355a42d4a9444dc753c04c6608dade2f06a23.zip |
Adding upstream version 125.0.1.upstream/125.0.1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'third_party/libwebrtc/rtc_base/byte_buffer.h')
-rw-r--r-- | third_party/libwebrtc/rtc_base/byte_buffer.h | 78 |
1 files changed, 55 insertions, 23 deletions
diff --git a/third_party/libwebrtc/rtc_base/byte_buffer.h b/third_party/libwebrtc/rtc_base/byte_buffer.h index 9bcbb838aa..c15773779e 100644 --- a/third_party/libwebrtc/rtc_base/byte_buffer.h +++ b/third_party/libwebrtc/rtc_base/byte_buffer.h @@ -16,7 +16,9 @@ #include <string> +#include "absl/base/attributes.h" #include "absl/strings/string_view.h" +#include "api/array_view.h" #include "rtc_base/buffer.h" #include "rtc_base/byte_order.h" @@ -25,39 +27,54 @@ namespace rtc { template <class BufferClassT> class ByteBufferWriterT { + using value_type = typename BufferClassT::value_type; + public: ByteBufferWriterT() { Construct(nullptr, kDefaultCapacity); } - ByteBufferWriterT(const char* bytes, size_t len) { Construct(bytes, len); } + ByteBufferWriterT(const value_type* bytes, size_t len) { + Construct(bytes, len); + } ByteBufferWriterT(const ByteBufferWriterT&) = delete; ByteBufferWriterT& operator=(const ByteBufferWriterT&) = delete; - const char* Data() const { return buffer_.data(); } + const value_type* Data() const { return buffer_.data(); } size_t Length() const { return buffer_.size(); } size_t Capacity() const { return buffer_.capacity(); } + rtc::ArrayView<const value_type> DataView() const { + return rtc::MakeArrayView(Data(), Length()); + } + // Accessor that returns a string_view, independent of underlying type. + // Intended to provide access for existing users that expect char* + // when the underlying type changes to uint8_t. + // TODO(bugs.webrtc.org/15665): Delete when users are converted. + absl::string_view DataAsStringView() const { + return absl::string_view(reinterpret_cast<const char*>(Data()), Length()); + } + char* DataAsCharPointer() const { return reinterpret_cast<char*>(Data()); } // Write value to the buffer. Resizes the buffer when it is // neccessary. void WriteUInt8(uint8_t val) { - WriteBytes(reinterpret_cast<const char*>(&val), 1); + WriteBytes(reinterpret_cast<const value_type*>(&val), 1); } void WriteUInt16(uint16_t val) { uint16_t v = HostToNetwork16(val); - WriteBytes(reinterpret_cast<const char*>(&v), 2); + WriteBytes(reinterpret_cast<const value_type*>(&v), 2); } void WriteUInt24(uint32_t val) { uint32_t v = HostToNetwork32(val); - char* start = reinterpret_cast<char*>(&v); + value_type* start = reinterpret_cast<value_type*>(&v); ++start; WriteBytes(start, 3); } void WriteUInt32(uint32_t val) { uint32_t v = HostToNetwork32(val); - WriteBytes(reinterpret_cast<const char*>(&v), 4); + WriteBytes(reinterpret_cast<const value_type*>(&v), 4); } void WriteUInt64(uint64_t val) { uint64_t v = HostToNetwork64(val); - WriteBytes(reinterpret_cast<const char*>(&v), 8); + WriteBytes(reinterpret_cast<const value_type*>(&v), 8); } // Serializes an unsigned varint in the format described by // https://developers.google.com/protocol-buffers/docs/encoding#varints @@ -66,22 +83,24 @@ class ByteBufferWriterT { while (val >= 0x80) { // Write 7 bits at a time, then set the msb to a continuation byte // (msb=1). - char byte = static_cast<char>(val) | 0x80; + value_type byte = static_cast<value_type>(val) | 0x80; WriteBytes(&byte, 1); val >>= 7; } - char last_byte = static_cast<char>(val); + value_type last_byte = static_cast<value_type>(val); WriteBytes(&last_byte, 1); } void WriteString(absl::string_view val) { WriteBytes(val.data(), val.size()); } - void WriteBytes(const char* val, size_t len) { buffer_.AppendData(val, len); } + void WriteBytes(const value_type* val, size_t len) { + buffer_.AppendData(val, len); + } - // Reserves the given number of bytes and returns a char* that can be written - // into. Useful for functions that require a char* buffer and not a - // ByteBufferWriter. - char* ReserveWriteBuffer(size_t len) { + // Reserves the given number of bytes and returns a value_type* that can be + // written into. Useful for functions that require a value_type* buffer and + // not a ByteBufferWriter. + value_type* ReserveWriteBuffer(size_t len) { buffer_.SetSize(buffer_.size() + len); return buffer_.data(); } @@ -95,7 +114,7 @@ class ByteBufferWriterT { private: static constexpr size_t kDefaultCapacity = 4096; - void Construct(const char* bytes, size_t size) { + void Construct(const value_type* bytes, size_t size) { if (bytes) { buffer_.AppendData(bytes, size); } else { @@ -122,22 +141,31 @@ class ByteBufferWriter : public ByteBufferWriterT<BufferT<char>> { // valid during the lifetime of the reader. class ByteBufferReader { public: - ByteBufferReader(const char* bytes, size_t len); + [[deprecated("Use ArrayView<uint8_t>")]] ByteBufferReader(const char* bytes, + size_t len); + + explicit ByteBufferReader( + rtc::ArrayView<const uint8_t> bytes ABSL_ATTRIBUTE_LIFETIME_BOUND); // Initializes buffer from a zero-terminated string. explicit ByteBufferReader(const char* bytes); - explicit ByteBufferReader(const Buffer& buf); - explicit ByteBufferReader(const ByteBufferWriter& buf); ByteBufferReader(const ByteBufferReader&) = delete; ByteBufferReader& operator=(const ByteBufferReader&) = delete; // Returns start of unprocessed data. - const char* Data() const { return bytes_ + start_; } + // TODO(bugs.webrtc.org/15661): Deprecate and remove. + const char* Data() const { + return reinterpret_cast<const char*>(bytes_ + start_); + } // Returns number of unprocessed bytes. size_t Length() const { return end_ - start_; } + // Returns a view of the unprocessed data. + rtc::ArrayView<const uint8_t> DataView() const { + return rtc::ArrayView<const uint8_t>(bytes_ + start_, end_ - start_); + } // Read a next value from the buffer. Return false if there isn't // enough data left for the specified type. @@ -147,7 +175,10 @@ class ByteBufferReader { bool ReadUInt32(uint32_t* val); bool ReadUInt64(uint64_t* val); bool ReadUVarint(uint64_t* val); - bool ReadBytes(char* val, size_t len); + bool ReadBytes(rtc::ArrayView<uint8_t> val); + // For backwards compatibility. + // TODO(bugs.webrtc.org/15661): Deprecate and remove. + [[deprecated("Read using ArrayView")]] bool ReadBytes(char* val, size_t len); // Appends next `len` bytes from the buffer to `val`. Returns false // if there is less than `len` bytes left. @@ -159,10 +190,11 @@ class ByteBufferReader { // after this call. bool Consume(size_t size); - protected: - void Construct(const char* bytes, size_t size); + private: + void Construct(const uint8_t* bytes, size_t size); + bool ReadBytes(uint8_t* val, size_t len); - const char* bytes_; + const uint8_t* bytes_; size_t size_; size_t start_; size_t end_; |