mirror of
https://github.com/mii443/libdatachannel.git
synced 2025-08-23 15:48:03 +00:00
Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
41cba8a35a | |||
6c683b326d | |||
8184d1d60e |
@ -1,6 +1,6 @@
|
|||||||
cmake_minimum_required(VERSION 3.7)
|
cmake_minimum_required(VERSION 3.7)
|
||||||
project(libdatachannel
|
project(libdatachannel
|
||||||
VERSION 0.13.2
|
VERSION 0.13.3
|
||||||
LANGUAGES CXX)
|
LANGUAGES CXX)
|
||||||
set(PROJECT_DESCRIPTION "WebRTC Data Channels Library")
|
set(PROJECT_DESCRIPTION "WebRTC Data Channels Library")
|
||||||
|
|
||||||
|
2
deps/libjuice
vendored
2
deps/libjuice
vendored
Submodule deps/libjuice updated: c65fea04f0...15d6654262
@ -22,6 +22,7 @@
|
|||||||
#include "common.hpp"
|
#include "common.hpp"
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
|
#include <iostream>
|
||||||
|
|
||||||
namespace rtc {
|
namespace rtc {
|
||||||
|
|
||||||
@ -42,8 +43,8 @@ RTC_CPP_EXPORT void InitLogger(LogLevel level, LogCallback callback = nullptr);
|
|||||||
RTC_CPP_EXPORT void InitLogger(plog::Severity severity, plog::IAppender *appender = nullptr);
|
RTC_CPP_EXPORT void InitLogger(plog::Severity severity, plog::IAppender *appender = nullptr);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
RTC_EXPORT void Preload();
|
RTC_CPP_EXPORT void Preload();
|
||||||
RTC_EXPORT void Cleanup();
|
RTC_CPP_EXPORT void Cleanup();
|
||||||
|
|
||||||
struct SctpSettings {
|
struct SctpSettings {
|
||||||
// For the following settings, not set means optimized default
|
// For the following settings, not set means optimized default
|
||||||
@ -56,8 +57,10 @@ struct SctpSettings {
|
|||||||
optional<std::chrono::milliseconds> delayedSackTime;
|
optional<std::chrono::milliseconds> delayedSackTime;
|
||||||
};
|
};
|
||||||
|
|
||||||
RTC_EXPORT void SetSctpSettings(SctpSettings s);
|
RTC_CPP_EXPORT void SetSctpSettings(SctpSettings s);
|
||||||
|
|
||||||
} // namespace rtc
|
} // namespace rtc
|
||||||
|
|
||||||
|
RTC_CPP_EXPORT std::ostream &operator<<(std::ostream &out, rtc::LogLevel level);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -980,18 +980,17 @@ std::ostream &operator<<(std::ostream &out, rtc::Description::Type type) {
|
|||||||
|
|
||||||
std::ostream &operator<<(std::ostream &out, rtc::Description::Role role) {
|
std::ostream &operator<<(std::ostream &out, rtc::Description::Role role) {
|
||||||
using Role = rtc::Description::Role;
|
using Role = rtc::Description::Role;
|
||||||
const char *str;
|
|
||||||
// Used for SDP generation, do not change
|
// Used for SDP generation, do not change
|
||||||
switch (role) {
|
switch (role) {
|
||||||
case Role::Active:
|
case Role::Active:
|
||||||
str = "active";
|
out << "active";
|
||||||
break;
|
break;
|
||||||
case Role::Passive:
|
case Role::Passive:
|
||||||
str = "passive";
|
out << "passive";
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
str = "actpass";
|
out << "actpass";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return out << str;
|
return out;
|
||||||
}
|
}
|
||||||
|
@ -93,3 +93,31 @@ void Cleanup() { Init::Cleanup(); }
|
|||||||
void SetSctpSettings(SctpSettings s) { Init::SetSctpSettings(std::move(s)); }
|
void SetSctpSettings(SctpSettings s) { Init::SetSctpSettings(std::move(s)); }
|
||||||
|
|
||||||
} // namespace rtc
|
} // namespace rtc
|
||||||
|
|
||||||
|
RTC_CPP_EXPORT std::ostream &operator<<(std::ostream &out, rtc::LogLevel level) {
|
||||||
|
switch (level) {
|
||||||
|
case rtc::LogLevel::Fatal:
|
||||||
|
out << "fatal";
|
||||||
|
break;
|
||||||
|
case rtc::LogLevel::Error:
|
||||||
|
out << "error";
|
||||||
|
break;
|
||||||
|
case rtc::LogLevel::Warning:
|
||||||
|
out << "warning";
|
||||||
|
break;
|
||||||
|
case rtc::LogLevel::Info:
|
||||||
|
out << "info";
|
||||||
|
break;
|
||||||
|
case rtc::LogLevel::Debug:
|
||||||
|
out << "debug";
|
||||||
|
break;
|
||||||
|
case rtc::LogLevel::Verbose:
|
||||||
|
out << "verbose";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
out << "none";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user