From 0523bcbf9812e2a299249b4f3e3cc345392f8b57 Mon Sep 17 00:00:00 2001 From: "bq.fan@shunwang.com" Date: Mon, 3 Jun 2024 11:12:05 +0800 Subject: [PATCH] fix win platform compile --- deps/json | 2 +- deps/libjuice | 2 +- deps/libsrtp | 2 +- deps/plog | 2 +- deps/usrsctp | 2 +- include/rtc/av1rtppacketizer.hpp | 2 +- include/rtc/h264rtppacketizer.hpp | 2 +- include/rtc/h265rtppacketizer.hpp | 2 +- include/rtc/rtppacketizer.hpp | 4 ++-- src/av1rtppacketizer.cpp | 2 +- src/h264rtppacketizer.cpp | 1 - src/impl/http.cpp | 3 +-- src/message.cpp | 2 +- 13 files changed, 13 insertions(+), 15 deletions(-) diff --git a/deps/json b/deps/json index 9cca280a4..8c391e04f 160000 --- a/deps/json +++ b/deps/json @@ -1 +1 @@ -Subproject commit 9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03 +Subproject commit 8c391e04fe4195d8be862c97f38cfe10e2a3472e diff --git a/deps/libjuice b/deps/libjuice index 2de35247f..73785387e 160000 --- a/deps/libjuice +++ b/deps/libjuice @@ -1 +1 @@ -Subproject commit 2de35247f0b15fa385406f3e2020d0e3d4d5cfcc +Subproject commit 73785387eafe15c02b6a210edb10f722474e8e14 diff --git a/deps/libsrtp b/deps/libsrtp index a566a9cfc..ca271bc40 160000 --- a/deps/libsrtp +++ b/deps/libsrtp @@ -1 +1 @@ -Subproject commit a566a9cfcd619e8327784aa7cff4a1276dc1e895 +Subproject commit ca271bc408eaf05ef2ff124d7baa5f0c04a59c3a diff --git a/deps/plog b/deps/plog index e21baecd4..85a871b13 160000 --- a/deps/plog +++ b/deps/plog @@ -1 +1 @@ -Subproject commit e21baecd4753f14da64ede979c5a19302618b752 +Subproject commit 85a871b13be0bd1a9e0110744fa60cc9bd1e8380 diff --git a/deps/usrsctp b/deps/usrsctp index ebb18adac..e711f82ad 160000 --- a/deps/usrsctp +++ b/deps/usrsctp @@ -1 +1 @@ -Subproject commit ebb18adac6501bad4501b1f6dccb67a1c85cc299 +Subproject commit e711f82ad09eddef42859073c66242887c24a016 diff --git a/include/rtc/av1rtppacketizer.hpp b/include/rtc/av1rtppacketizer.hpp index b56a875f9..559791fd7 100644 --- a/include/rtc/av1rtppacketizer.hpp +++ b/include/rtc/av1rtppacketizer.hpp @@ -21,7 +21,7 @@ namespace rtc { class RTC_CPP_EXPORT AV1RtpPacketizer final : public RtpPacketizer { public: // Default clock rate for AV1 in RTP - inline static const uint32_t defaultClockRate = 90 * 1000; + static const uint32_t defaultClockRate = 90 * 1000; // Define how OBUs are seperated in a AV1 Sample enum class Packetization { diff --git a/include/rtc/h264rtppacketizer.hpp b/include/rtc/h264rtppacketizer.hpp index 9aeb1147c..bbd14c43e 100644 --- a/include/rtc/h264rtppacketizer.hpp +++ b/include/rtc/h264rtppacketizer.hpp @@ -23,7 +23,7 @@ class RTC_CPP_EXPORT H264RtpPacketizer final : public RtpPacketizer { using Separator = NalUnit::Separator; /// Default clock rate for H264 in RTP - inline static const uint32_t defaultClockRate = 90 * 1000; + static const uint32_t defaultClockRate = 90 * 1000; /// Constructs h264 payload packetizer with given RTP configuration. /// @note RTP configuration is used in packetization process which may change some configuration diff --git a/include/rtc/h265rtppacketizer.hpp b/include/rtc/h265rtppacketizer.hpp index b629c6aa7..184cdbd5e 100644 --- a/include/rtc/h265rtppacketizer.hpp +++ b/include/rtc/h265rtppacketizer.hpp @@ -22,7 +22,7 @@ class RTC_CPP_EXPORT H265RtpPacketizer final : public RtpPacketizer { using Separator = NalUnit::Separator; // Default clock rate for H265 in RTP - inline static const uint32_t defaultClockRate = 90 * 1000; + static const uint32_t defaultClockRate = 90 * 1000; // Constructs h265 payload packetizer with given RTP configuration. // @note RTP configuration is used in packetization process which may change some configuration diff --git a/include/rtc/rtppacketizer.hpp b/include/rtc/rtppacketizer.hpp index 99839b9d4..3f05d9d32 100644 --- a/include/rtc/rtppacketizer.hpp +++ b/include/rtc/rtppacketizer.hpp @@ -49,8 +49,8 @@ class RTC_CPP_EXPORT RtpPacketizer : public MediaHandler { template class RTC_CPP_EXPORT AudioRtpPacketizer final : public RtpPacketizer { public: - inline static const uint32_t DefaultClockRate = DEFAULT_CLOCK_RATE; - inline static const uint32_t defaultClockRate [[deprecated("Use DefaultClockRate")]] = + static const uint32_t DefaultClockRate = DEFAULT_CLOCK_RATE; + static const uint32_t defaultClockRate [[deprecated("Use DefaultClockRate")]] = DEFAULT_CLOCK_RATE; // for backward compatibility AudioRtpPacketizer(shared_ptr rtpConfig) diff --git a/src/av1rtppacketizer.cpp b/src/av1rtppacketizer.cpp index b7cfc55e8..09d3f212d 100644 --- a/src/av1rtppacketizer.cpp +++ b/src/av1rtppacketizer.cpp @@ -9,7 +9,7 @@ #if RTC_ENABLE_MEDIA #include "av1rtppacketizer.hpp" - +#include #include "impl/internals.hpp" namespace rtc { diff --git a/src/h264rtppacketizer.cpp b/src/h264rtppacketizer.cpp index f1f3fd8d8..07a38222b 100644 --- a/src/h264rtppacketizer.cpp +++ b/src/h264rtppacketizer.cpp @@ -81,7 +81,6 @@ shared_ptr H264RtpPacketizer::splitMessage(binary_ptr message) { } return nalus; } - H264RtpPacketizer::H264RtpPacketizer(shared_ptr rtpConfig, uint16_t maxFragmentSize) : RtpPacketizer(std::move(rtpConfig)), maxFragmentSize(maxFragmentSize), diff --git a/src/impl/http.cpp b/src/impl/http.cpp index 7aa12d63f..aaa2fa6d5 100644 --- a/src/impl/http.cpp +++ b/src/impl/http.cpp @@ -7,9 +7,8 @@ */ #include "http.hpp" - #include - +#include namespace rtc::impl { bool isHttpRequest(const byte *buffer, size_t size) { diff --git a/src/message.cpp b/src/message.cpp index 2bbf1183e..f730d1204 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -7,7 +7,7 @@ */ #include "message.hpp" - +#include namespace rtc { message_ptr make_message(size_t size, Message::Type type, unsigned int stream,