Fix includes in dependencydescriptor.hpp

include/rtc/dependencydescriptor.hpp

@@ -9,16 +9,14 @@
 #ifndef RTC_DEPENDENCY_DESCRIPTOR_H
 #define RTC_DEPENDENCY_DESCRIPTOR_H
 
+#include "common.hpp"
+
 #include <bitset>
-#include <cassert>
-#include <optional>
-#include <stdint.h>
-#include <vector>
 
 namespace rtc {
 
 struct BitWriter {
-	static BitWriter fromSizeBits(std::byte *buf, size_t offsetBits, size_t sizeBits);
+	static BitWriter fromSizeBits(byte *buf, size_t offsetBits, size_t sizeBits);
 	static BitWriter fromNull();
 
 	size_t getWrittenBits() const;
@@ -32,7 +30,7 @@ private:
 	size_t writePartialByte(uint8_t *p, size_t offset, uint64_t v, size_t bits);
 
 private:
-	std::byte *mBuf = nullptr;
+	byte *mBuf = nullptr;
 	size_t mInitialOffset = 0;
 	size_t mOffset = 0;
 	size_t mSize = 0;
@@ -91,7 +89,7 @@ public:
 	explicit DependencyDescriptorWriter(const DependencyDescriptorContext& context);
 	size_t getSizeBits() const;
 	size_t getSize() const;
-	void writeTo(std::byte *buf, size_t sizeBytes) const;
+	void writeTo(byte *buf, size_t sizeBytes) const;
 
 private:
 	void doWriteTo(BitWriter &writer) const;

src/dependencydescriptor.cpp

@@ -9,13 +9,14 @@
 #include "dependencydescriptor.hpp"
 
 #include <algorithm>
+#include <cassert>
 #include <functional>
 #include <limits>
 #include <stdexcept>
 
 namespace rtc {
 
-BitWriter BitWriter::fromSizeBits(std::byte *buf, size_t offsetBits, size_t sizeBits) {
+BitWriter BitWriter::fromSizeBits(byte *buf, size_t offsetBits, size_t sizeBits) {
 	BitWriter writer;
 	writer.mBuf = buf;
 	writer.mInitialOffset = offsetBits;
@@ -205,19 +206,18 @@ static bool find_best_template(const FrameDependencyStructure &structure,
 
 static const uint32_t MaxTemplates = 64;
 
-DependencyDescriptorWriter::DependencyDescriptorWriter(const DependencyDescriptorContext& context)
-	: mStructure(context.structure), mActiveChains(context.activeChains), mDescriptor(context.descriptor) {}
+DependencyDescriptorWriter::DependencyDescriptorWriter(const DependencyDescriptorContext &context)
+    : mStructure(context.structure), mActiveChains(context.activeChains),
+      mDescriptor(context.descriptor) {}
 
 size_t DependencyDescriptorWriter::getSizeBits() const {
 	auto writer = rtc::BitWriter::fromNull();
 	doWriteTo(writer);
 	return writer.getWrittenBits();
 }
-size_t DependencyDescriptorWriter::getSize() const {
-	return (getSizeBits() + 7) / 8;
-}
+size_t DependencyDescriptorWriter::getSize() const { return (getSizeBits() + 7) / 8; }
 
-void DependencyDescriptorWriter::writeTo(std::byte *buf, size_t sizeBytes) const {
+void DependencyDescriptorWriter::writeTo(byte *buf, size_t sizeBytes) const {
 	auto writer = BitWriter::fromSizeBits(buf, 0, sizeBytes * 8);
 	doWriteTo(writer);
 	// Pad up to the byte boundary
@@ -406,4 +406,4 @@ void DependencyDescriptorWriter::writeNonSymmetric(BitWriter &writer, uint64_t v
 	}
 }
 
-} // namespace rtc
+} // namespace rtc