admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change DataChannelInit::priority to integer and forward to SCTP transport

Browse Source 
The new type PriorityValue is a strong 16-bit integer matching RFC 8831
requirements that can be built from a Priority enum.
The value is now propagated and used by the SCTP transport, but enabling
the feature still requires a field trial for now.

Bug: webrtc:42225365
Change-Id: I56c9f48744c70999a8c2d01415a08a0b6761df4b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/357941
Commit-Queue: Florent Castelli <orphis@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42695}
This commit is contained in:
Florent Castelli 2024-07-26 16:16:41 +00:00 committed by WebRTC LUCI CQ
parent fa934326db
commit 0012bfa128
29 changed files with 174 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/BUILD.gn
View File

@ -515,6 +515,10 @@ rtc_source_set("rtp_transceiver_direction") {
rtc_source_set("priority") { rtc_source_set("priority") {
visibility = [ "*" ] visibility = [ "*" ]
sources = [ "priority.h" ] sources = [ "priority.h" ]
deps = [
"../rtc_base:checks",
"../rtc_base:strong_alias",
]
} }
rtc_library("rtp_parameters") { rtc_library("rtp_parameters") {
@ -1131,6 +1135,7 @@ if (rtc_include_tests) {
deps = [ deps = [
":libjingle_peerconnection_api", ":libjingle_peerconnection_api",
":priority",
"../test:test_support", "../test:test_support",
] ]
} }

4
api/DEPS
View File

@ -173,6 +173,10 @@ specific_include_rules = {
"+rtc_base/system/no_unique_address.h", "+rtc_base/system/no_unique_address.h",
], ],
"priority\.h": [
"+rtc_base/strong_alias.h",
],
"simulated_network\.h": [ "simulated_network\.h": [
"+rtc_base/random.h", "+rtc_base/random.h",
"+rtc_base/thread_annotations.h", "+rtc_base/thread_annotations.h",

5
api/data_channel_interface.cc
View File

@ -10,6 +10,7 @@
#include "api/data_channel_interface.h" #include "api/data_channel_interface.h"
#include "api/priority.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
namespace webrtc { namespace webrtc {
@ -42,6 +43,10 @@ bool DataChannelInterface::negotiated() const {
return false; return false;
} }
PriorityValue DataChannelInterface::priority() const {
return PriorityValue(Priority::kLow);
}
uint64_t DataChannelInterface::MaxSendQueueSize() { uint64_t DataChannelInterface::MaxSendQueueSize() {
return 16 * 1024 * 1024; // 16 MiB return 16 * 1024 * 1024; // 16 MiB
} }

4
api/data_channel_interface.h
View File

@ -67,7 +67,7 @@ struct DataChannelInit {
int id = -1; int id = -1;
// https://w3c.github.io/webrtc-priority/#new-rtcdatachannelinit-member // https://w3c.github.io/webrtc-priority/#new-rtcdatachannelinit-member
absl::optional<Priority> priority; absl::optional<PriorityValue> priority;
}; };
// At the JavaScript level, data can be passed in as a string or a blob, so // At the JavaScript level, data can be passed in as a string or a blob, so
@ -172,7 +172,7 @@ class RTC_EXPORT DataChannelInterface : public RefCountInterface {
// If negotiated in-band, this ID will be populated once the DTLS role is // If negotiated in-band, this ID will be populated once the DTLS role is
// determined, and until then this will return -1. // determined, and until then this will return -1.
virtual int id() const = 0; virtual int id() const = 0;
virtual Priority priority() const { return Priority::kLow; } virtual PriorityValue priority() const;
virtual DataState state() const = 0; virtual DataState state() const = 0;
// When state is kClosed, and the DataChannel was not closed using // When state is kClosed, and the DataChannel was not closed using
// the closing procedure, returns the error information about the closing. // the closing procedure, returns the error information about the closing.

32
api/priority.h
View File

@ -11,6 +11,11 @@
#ifndef API_PRIORITY_H_ #ifndef API_PRIORITY_H_
#define API_PRIORITY_H_ #define API_PRIORITY_H_
#include <stdint.h>
#include "rtc_base/checks.h"
#include "rtc_base/strong_alias.h"
namespace webrtc { namespace webrtc {
// GENERATED_JAVA_ENUM_PACKAGE: org.webrtc // GENERATED_JAVA_ENUM_PACKAGE: org.webrtc
@ -21,6 +26,33 @@ enum class Priority {
kHigh, kHigh,
}; };
class PriorityValue
: public webrtc::StrongAlias<class PriorityValueTag, uint16_t> {
public:
// TODO(bugs.webrtc.org/42225365): Make explicit after downstream projects
// have updated
PriorityValue(Priority priority) { // NOLINT(runtime/explicit)
switch (priority) {
case Priority::kVeryLow:
value_ = 128;
break;
case Priority::kLow:
value_ = 256;
break;
case Priority::kMedium:
value_ = 512;
break;
case Priority::kHigh:
value_ = 1024;
break;
default:
RTC_CHECK_NOTREACHED();
}
}
explicit PriorityValue(uint16_t priority) : StrongAlias(priority) {}
};
} // namespace webrtc } // namespace webrtc
#endif // API_PRIORITY_H_ #endif // API_PRIORITY_H_

3
api/test/mock_data_channel.h
View File

@ -14,6 +14,7 @@
#include <string> #include <string>
#include "api/data_channel_interface.h" #include "api/data_channel_interface.h"
#include "api/priority.h"
#include "test/gmock.h" #include "test/gmock.h"
namespace webrtc { namespace webrtc {
@ -41,7 +42,7 @@ class MockDataChannelInterface
MOCK_METHOD(std::string, protocol, (), (const, override)); MOCK_METHOD(std::string, protocol, (), (const, override));
MOCK_METHOD(bool, negotiated, (), (const, override)); MOCK_METHOD(bool, negotiated, (), (const, override));
MOCK_METHOD(int, id, (), (const, override)); MOCK_METHOD(int, id, (), (const, override));
MOCK_METHOD(Priority, priority, (), (const, override)); MOCK_METHOD(PriorityValue, priority, (), (const, override));
MOCK_METHOD(DataState, state, (), (const, override)); MOCK_METHOD(DataState, state, (), (const, override));
MOCK_METHOD(RTCError, error, (), (const, override)); MOCK_METHOD(RTCError, error, (), (const, override));
MOCK_METHOD(uint32_t, messages_sent, (), (const, override)); MOCK_METHOD(uint32_t, messages_sent, (), (const, override));

1
api/transport/BUILD.gn
View File

@ -76,6 +76,7 @@ rtc_source_set("datagram_transport_interface") {
sources = [ "data_channel_transport_interface.h" ] sources = [ "data_channel_transport_interface.h" ]
deps = [ deps = [
"..:array_view", "..:array_view",
"..:priority",
"..:rtc_error", "..:rtc_error",
"../../rtc_base:copy_on_write_buffer", "../../rtc_base:copy_on_write_buffer",
"//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:optional",

3
api/transport/data_channel_transport_interface.h
View File

@ -13,6 +13,7 @@
#define API_TRANSPORT_DATA_CHANNEL_TRANSPORT_INTERFACE_H_ #define API_TRANSPORT_DATA_CHANNEL_TRANSPORT_INTERFACE_H_
#include "absl/types/optional.h" #include "absl/types/optional.h"
#include "api/priority.h"
#include "api/rtc_error.h" #include "api/rtc_error.h"
#include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/copy_on_write_buffer.h"
@ -99,7 +100,7 @@ class DataChannelTransportInterface {
// Opens a data `channel_id` for sending. May return an error if the // Opens a data `channel_id` for sending. May return an error if the
// specified `channel_id` is unusable. Must be called before `SendData`. // specified `channel_id` is unusable. Must be called before `SendData`.
virtual RTCError OpenChannel(int channel_id) = 0; virtual RTCError OpenChannel(int channel_id, PriorityValue priority) = 0;
// Sends a data buffer to the remote endpoint using the given send parameters. // Sends a data buffer to the remote endpoint using the given send parameters.
// `buffer` may not be larger than 256 KiB. Returns an error if the send // `buffer` may not be larger than 256 KiB. Returns an error if the send

4
media/BUILD.gn
View File

@ -687,6 +687,7 @@ rtc_source_set("rtc_data_sctp_transport_internal") {
sources = [ "sctp/sctp_transport_internal.h" ] sources = [ "sctp/sctp_transport_internal.h" ]
deps = [ deps = [
":media_channel", ":media_channel",
"../api:priority",
"../api:rtc_error", "../api:rtc_error",
"../api/transport:datagram_transport_interface", "../api/transport:datagram_transport_interface",
"../p2p:packet_transport_internal", "../p2p:packet_transport_internal",
@ -707,6 +708,7 @@ if (rtc_build_dcsctp) {
":rtc_data_sctp_transport_internal", ":rtc_data_sctp_transport_internal",
"../api:array_view", "../api:array_view",
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:priority",
"../api/environment", "../api/environment",
"../api/task_queue:pending_task_safety_flag", "../api/task_queue:pending_task_safety_flag",
"../api/task_queue:task_queue", "../api/task_queue:task_queue",
@ -903,6 +905,7 @@ if (rtc_include_tests) {
"../api:mock_video_bitrate_allocator_factory", "../api:mock_video_bitrate_allocator_factory",
"../api:mock_video_codec_factory", "../api:mock_video_codec_factory",
"../api:mock_video_encoder", "../api:mock_video_encoder",
"../api:priority",
"../api:rtp_parameters", "../api:rtp_parameters",
"../api:scoped_refptr", "../api:scoped_refptr",
"../api:simulcast_test_fixture_api", "../api:simulcast_test_fixture_api",
@ -948,6 +951,7 @@ if (rtc_include_tests) {
"../modules/video_coding:webrtc_h264", "../modules/video_coding:webrtc_h264",
"../modules/video_coding:webrtc_vp8", "../modules/video_coding:webrtc_vp8",
"../modules/video_coding/svc:scalability_mode_util", "../modules/video_coding/svc:scalability_mode_util",
"../net/dcsctp/public:types",
"../p2p:p2p_test_utils", "../p2p:p2p_test_utils",
"../rtc_base:async_packet_socket", "../rtc_base:async_packet_socket",
"../rtc_base:byte_order", "../rtc_base:byte_order",

16
media/sctp/dcsctp_transport.cc
View File

@ -21,6 +21,7 @@
#include "api/array_view.h" #include "api/array_view.h"
#include "api/data_channel_interface.h" #include "api/data_channel_interface.h"
#include "api/environment/environment.h" #include "api/environment/environment.h"
#include "api/priority.h"
#include "media/base/media_channel.h" #include "media/base/media_channel.h"
#include "net/dcsctp/public/dcsctp_socket_factory.h" #include "net/dcsctp/public/dcsctp_socket_factory.h"
#include "net/dcsctp/public/packet_observer.h" #include "net/dcsctp/public/packet_observer.h"
@ -222,16 +223,27 @@ bool DcSctpTransport::Start(int local_sctp_port,
MaybeConnectSocket(); MaybeConnectSocket();
for (const auto& [sid, stream_state] : stream_states_) {
socket_->SetStreamPriority(sid, stream_state.priority);
}
return true; return true;
} }
bool DcSctpTransport::OpenStream(int sid) { bool DcSctpTransport::OpenStream(int sid, PriorityValue priority) {
RTC_DCHECK_RUN_ON(network_thread_); RTC_DCHECK_RUN_ON(network_thread_);
RTC_DLOG(LS_INFO) << debug_name_ << "->OpenStream(" << sid << ")."; RTC_DLOG(LS_INFO) << debug_name_ << "->OpenStream(" << sid << ", "
<< priority.value() << ").";
StreamState stream_state; StreamState stream_state;
stream_state.priority = dcsctp::StreamPriority(priority.value());
stream_states_.insert_or_assign(dcsctp::StreamID(static_cast<uint16_t>(sid)), stream_states_.insert_or_assign(dcsctp::StreamID(static_cast<uint16_t>(sid)),
stream_state); stream_state);
if (socket_) {
socket_->SetStreamPriority(dcsctp::StreamID(sid),
dcsctp::StreamPriority(priority.value()));
}
return true; return true;
} }

6
media/sctp/dcsctp_transport.h
View File

@ -18,6 +18,7 @@
#include "absl/types/optional.h" #include "absl/types/optional.h"
#include "api/array_view.h" #include "api/array_view.h"
#include "api/environment/environment.h" #include "api/environment/environment.h"
#include "api/priority.h"
#include "api/task_queue/task_queue_base.h" #include "api/task_queue/task_queue_base.h"
#include "media/sctp/sctp_transport_internal.h" #include "media/sctp/sctp_transport_internal.h"
#include "net/dcsctp/public/dcsctp_options.h" #include "net/dcsctp/public/dcsctp_options.h"
@ -57,7 +58,7 @@ class DcSctpTransport : public cricket::SctpTransportInternal,
bool Start(int local_sctp_port, bool Start(int local_sctp_port,
int remote_sctp_port, int remote_sctp_port,
int max_message_size) override; int max_message_size) override;
bool OpenStream(int sid) override; bool OpenStream(int sid, PriorityValue priority) override;
bool ResetStream(int sid) override; bool ResetStream(int sid) override;
RTCError SendData(int sid, RTCError SendData(int sid,
const SendDataParams& params, const SendDataParams& params,
@ -127,6 +128,9 @@ class DcSctpTransport : public cricket::SctpTransportInternal,
bool incoming_reset_done = false; bool incoming_reset_done = false;
// True when the local connection received OnStreamsResetPerformed // True when the local connection received OnStreamsResetPerformed
bool outgoing_reset_done = false; bool outgoing_reset_done = false;
// Priority of the stream according to RFC 8831, section 6.4
dcsctp::StreamPriority priority =
dcsctp::StreamPriority(PriorityValue(webrtc::Priority::kLow).value());
}; };
// Map of all currently open or closing data channels // Map of all currently open or closing data channels

47
media/sctp/dcsctp_transport_unittest.cc
View File

@ -15,8 +15,10 @@
#include "api/environment/environment.h" #include "api/environment/environment.h"
#include "api/environment/environment_factory.h" #include "api/environment/environment_factory.h"
#include "api/priority.h"
#include "net/dcsctp/public/mock_dcsctp_socket.h" #include "net/dcsctp/public/mock_dcsctp_socket.h"
#include "net/dcsctp/public/mock_dcsctp_socket_factory.h" #include "net/dcsctp/public/mock_dcsctp_socket_factory.h"
#include "net/dcsctp/public/types.h"
#include "p2p/base/fake_packet_transport.h" #include "p2p/base/fake_packet_transport.h"
#include "test/gtest.h" #include "test/gtest.h"
@ -33,6 +35,9 @@ using ::testing::ReturnPointee;
namespace webrtc { namespace webrtc {
namespace { namespace {
const PriorityValue kDefaultPriority = PriorityValue(Priority::kLow);
class MockDataChannelSink : public DataChannelSink { class MockDataChannelSink : public DataChannelSink {
public: public:
MOCK_METHOD(void, OnConnected, ()); MOCK_METHOD(void, OnConnected, ());
@ -107,6 +112,10 @@ TEST(DcSctpTransportTest, CloseSequence) {
{ {
InSequence sequence; InSequence sequence;
EXPECT_CALL(
*peer_a.socket_,
SetStreamPriority(dcsctp::StreamID(1),
dcsctp::StreamPriority(kDefaultPriority.value())));
EXPECT_CALL(*peer_a.socket_, ResetStreams(ElementsAre(dcsctp::StreamID(1)))) EXPECT_CALL(*peer_a.socket_, ResetStreams(ElementsAre(dcsctp::StreamID(1))))
.WillOnce(Return(dcsctp::ResetStreamsStatus::kPerformed)); .WillOnce(Return(dcsctp::ResetStreamsStatus::kPerformed));
@ -121,8 +130,8 @@ TEST(DcSctpTransportTest, CloseSequence) {
peer_a.sctp_transport_->Start(5000, 5000, 256 * 1024); peer_a.sctp_transport_->Start(5000, 5000, 256 * 1024);
peer_b.sctp_transport_->Start(5000, 5000, 256 * 1024); peer_b.sctp_transport_->Start(5000, 5000, 256 * 1024);
peer_a.sctp_transport_->OpenStream(1); peer_a.sctp_transport_->OpenStream(1, kDefaultPriority);
peer_b.sctp_transport_->OpenStream(1); peer_b.sctp_transport_->OpenStream(1, kDefaultPriority);
peer_a.sctp_transport_->ResetStream(1); peer_a.sctp_transport_->ResetStream(1);
// Simulate the callbacks from the stream resets // Simulate the callbacks from the stream resets
@ -163,8 +172,8 @@ TEST(DcSctpTransportTest, CloseSequenceSimultaneous) {
peer_a.sctp_transport_->Start(5000, 5000, 256 * 1024); peer_a.sctp_transport_->Start(5000, 5000, 256 * 1024);
peer_b.sctp_transport_->Start(5000, 5000, 256 * 1024); peer_b.sctp_transport_->Start(5000, 5000, 256 * 1024);
peer_a.sctp_transport_->OpenStream(1); peer_a.sctp_transport_->OpenStream(1, kDefaultPriority);
peer_b.sctp_transport_->OpenStream(1); peer_b.sctp_transport_->OpenStream(1, kDefaultPriority);
peer_a.sctp_transport_->ResetStream(1); peer_a.sctp_transport_->ResetStream(1);
peer_b.sctp_transport_->ResetStream(1); peer_b.sctp_transport_->ResetStream(1);
@ -180,6 +189,28 @@ TEST(DcSctpTransportTest, CloseSequenceSimultaneous) {
->OnIncomingStreamsReset(streams); ->OnIncomingStreamsReset(streams);
} }
TEST(DcSctpTransportTest, SetStreamPriority) {
rtc::AutoThread main_thread;
Peer peer_a;
{
InSequence sequence;
EXPECT_CALL(
*peer_a.socket_,
SetStreamPriority(dcsctp::StreamID(1), dcsctp::StreamPriority(1337)));
EXPECT_CALL(
*peer_a.socket_,
SetStreamPriority(dcsctp::StreamID(2), dcsctp::StreamPriority(3141)));
}
EXPECT_CALL(*peer_a.socket_, Send(_, _)).Times(0);
peer_a.sctp_transport_->OpenStream(1, PriorityValue(1337));
peer_a.sctp_transport_->Start(5000, 5000, 256 * 1024);
peer_a.sctp_transport_->OpenStream(2, PriorityValue(3141));
}
TEST(DcSctpTransportTest, DiscardMessageClosedChannel) { TEST(DcSctpTransportTest, DiscardMessageClosedChannel) {
rtc::AutoThread main_thread; rtc::AutoThread main_thread;
Peer peer_a; Peer peer_a;
@ -200,7 +231,7 @@ TEST(DcSctpTransportTest, DiscardMessageClosingChannel) {
EXPECT_CALL(*peer_a.socket_, Send(_, _)).Times(0); EXPECT_CALL(*peer_a.socket_, Send(_, _)).Times(0);
peer_a.sctp_transport_->OpenStream(1); peer_a.sctp_transport_->OpenStream(1, kDefaultPriority);
peer_a.sctp_transport_->Start(5000, 5000, 256 * 1024); peer_a.sctp_transport_->Start(5000, 5000, 256 * 1024);
peer_a.sctp_transport_->ResetStream(1); peer_a.sctp_transport_->ResetStream(1);
@ -218,7 +249,7 @@ TEST(DcSctpTransportTest, SendDataOpenChannel) {
EXPECT_CALL(*peer_a.socket_, Send(_, _)).Times(1); EXPECT_CALL(*peer_a.socket_, Send(_, _)).Times(1);
EXPECT_CALL(*peer_a.socket_, options()).WillOnce(ReturnPointee(&options)); EXPECT_CALL(*peer_a.socket_, options()).WillOnce(ReturnPointee(&options));
peer_a.sctp_transport_->OpenStream(1); peer_a.sctp_transport_->OpenStream(1, kDefaultPriority);
peer_a.sctp_transport_->Start(5000, 5000, 256 * 1024); peer_a.sctp_transport_->Start(5000, 5000, 256 * 1024);
SendDataParams params; SendDataParams params;
@ -234,7 +265,7 @@ TEST(DcSctpTransportTest, DeliversMessage) {
OnDataReceived(1, webrtc::DataMessageType::kBinary, _)) OnDataReceived(1, webrtc::DataMessageType::kBinary, _))
.Times(1); .Times(1);
peer_a.sctp_transport_->OpenStream(1); peer_a.sctp_transport_->OpenStream(1, kDefaultPriority);
peer_a.sctp_transport_->Start(5000, 5000, 256 * 1024); peer_a.sctp_transport_->Start(5000, 5000, 256 * 1024);
static_cast<dcsctp::DcSctpSocketCallbacks*>(peer_a.sctp_transport_.get()) static_cast<dcsctp::DcSctpSocketCallbacks*>(peer_a.sctp_transport_.get())
@ -248,7 +279,7 @@ TEST(DcSctpTransportTest, DropMessageWithUnknownPpid) {
EXPECT_CALL(peer_a.sink_, OnDataReceived(_, _, _)).Times(0); EXPECT_CALL(peer_a.sink_, OnDataReceived(_, _, _)).Times(0);
peer_a.sctp_transport_->OpenStream(1); peer_a.sctp_transport_->OpenStream(1, kDefaultPriority);
peer_a.sctp_transport_->Start(5000, 5000, 256 * 1024); peer_a.sctp_transport_->Start(5000, 5000, 256 * 1024);
static_cast<dcsctp::DcSctpSocketCallbacks*>(peer_a.sctp_transport_.get()) static_cast<dcsctp::DcSctpSocketCallbacks*>(peer_a.sctp_transport_.get())

3
media/sctp/sctp_transport_internal.h
View File

@ -18,6 +18,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "api/priority.h"
#include "api/rtc_error.h" #include "api/rtc_error.h"
#include "api/transport/data_channel_transport_interface.h" #include "api/transport/data_channel_transport_interface.h"
#include "media/base/media_channel.h" #include "media/base/media_channel.h"
@ -113,7 +114,7 @@ class SctpTransportInternal {
// TODO(deadbeef): Actually implement the "returns false if `sid` can't be // TODO(deadbeef): Actually implement the "returns false if `sid` can't be
// used" part. See: // used" part. See:
// https://bugs.chromium.org/p/chromium/issues/detail?id=619849 // https://bugs.chromium.org/p/chromium/issues/detail?id=619849
virtual bool OpenStream(int sid) = 0; virtual bool OpenStream(int sid, webrtc::PriorityValue priority) = 0;
// The inverse of OpenStream. Begins the closing procedure, which will // The inverse of OpenStream. Begins the closing procedure, which will
// eventually result in SignalClosingProcedureComplete on the side that // eventually result in SignalClosingProcedureComplete on the side that
// initiates it, and both SignalClosingProcedureStartedRemotely and // initiates it, and both SignalClosingProcedureStartedRemotely and

5
pc/BUILD.gn
View File

@ -533,6 +533,7 @@ rtc_source_set("sctp_transport") {
":dtls_transport", ":dtls_transport",
"../api:dtls_transport_interface", "../api:dtls_transport_interface",
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:priority",
"../api:scoped_refptr", "../api:scoped_refptr",
"../api:sequence_checker", "../api:sequence_checker",
"../api/transport:datagram_transport_interface", "../api/transport:datagram_transport_interface",
@ -835,6 +836,7 @@ rtc_source_set("data_channel_controller") {
":sctp_data_channel", ":sctp_data_channel",
":sctp_utils", ":sctp_utils",
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:priority",
"../api:rtc_error", "../api:rtc_error",
"../api:scoped_refptr", "../api:scoped_refptr",
"../api:sequence_checker", "../api:sequence_checker",
@ -2011,6 +2013,7 @@ if (rtc_include_tests && !build_with_chromium) {
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:make_ref_counted", "../api:make_ref_counted",
"../api:make_ref_counted", "../api:make_ref_counted",
"../api:priority",
"../api:rtc_error", "../api:rtc_error",
"../api:rtp_headers", "../api:rtp_headers",
"../api:rtp_parameters", "../api:rtp_parameters",
@ -2488,6 +2491,7 @@ if (rtc_include_tests && !build_with_chromium) {
":pc_test_utils", ":pc_test_utils",
":peer_connection_internal", ":peer_connection_internal",
":sctp_data_channel", ":sctp_data_channel",
"../api:priority",
"../rtc_base:null_socket_server", "../rtc_base:null_socket_server",
"../test:run_loop", "../test:run_loop",
"../test:test_support", "../test:test_support",
@ -2712,6 +2716,7 @@ if (rtc_include_tests && !build_with_chromium) {
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:make_ref_counted", "../api:make_ref_counted",
"../api:media_stream_interface", "../api:media_stream_interface",
"../api:priority",
"../api:rtc_error", "../api:rtc_error",
"../api:rtc_stats_api", "../api:rtc_stats_api",
"../api:rtp_parameters", "../api:rtp_parameters",

14
pc/data_channel_controller.cc
View File

@ -10,11 +10,13 @@
#include "pc/data_channel_controller.h" #include "pc/data_channel_controller.h"
#include <cstdint>
#include <utility> #include <utility>
#include "absl/algorithm/container.h" #include "absl/algorithm/container.h"
#include "absl/types/optional.h" #include "absl/types/optional.h"
#include "api/peer_connection_interface.h" #include "api/peer_connection_interface.h"
#include "api/priority.h"
#include "api/rtc_error.h" #include "api/rtc_error.h"
#include "pc/peer_connection_internal.h" #include "pc/peer_connection_internal.h"
#include "pc/sctp_utils.h" #include "pc/sctp_utils.h"
@ -52,10 +54,11 @@ RTCError DataChannelController::SendData(
payload); payload);
} }
void DataChannelController::AddSctpDataStream(StreamId sid) { void DataChannelController::AddSctpDataStream(StreamId sid,
PriorityValue priority) {
RTC_DCHECK_RUN_ON(network_thread()); RTC_DCHECK_RUN_ON(network_thread());
if (data_channel_transport_) { if (data_channel_transport_) {
data_channel_transport_->OpenChannel(sid.stream_id_int()); data_channel_transport_->OpenChannel(sid.stream_id_int(), priority);
} }
} }
@ -349,7 +352,8 @@ DataChannelController::CreateDataChannel(const std::string& label,
// If we have an id already, notify the transport. // If we have an id already, notify the transport.
if (sid.has_value()) if (sid.has_value())
AddSctpDataStream(*sid); AddSctpDataStream(*sid,
config.priority.value_or(PriorityValue(Priority::kLow)));
return channel; return channel;
} }
@ -412,7 +416,7 @@ void DataChannelController::AllocateSctpSids(rtc::SSLRole role) {
absl::optional<StreamId> sid = sid_allocator_.AllocateSid(role); absl::optional<StreamId> sid = sid_allocator_.AllocateSid(role);
if (sid.has_value()) { if (sid.has_value()) {
(*it)->SetSctpSid_n(*sid); (*it)->SetSctpSid_n(*sid);
AddSctpDataStream(*sid); AddSctpDataStream(*sid, (*it)->priority());
if (ready_to_send) { if (ready_to_send) {
RTC_LOG(LS_INFO) << "AllocateSctpSids: Id assigned, ready to send."; RTC_LOG(LS_INFO) << "AllocateSctpSids: Id assigned, ready to send.";
(*it)->OnTransportReady(); (*it)->OnTransportReady();
@ -471,7 +475,7 @@ void DataChannelController::NotifyDataChannelsOfTransportCreated() {
for (const auto& channel : sctp_data_channels_n_) { for (const auto& channel : sctp_data_channels_n_) {
if (channel->sid_n().has_value()) if (channel->sid_n().has_value())
AddSctpDataStream(*channel->sid_n()); AddSctpDataStream(*channel->sid_n(), channel->priority());
channel->OnTransportChannelCreated(); channel->OnTransportChannelCreated();
} }
} }

3
pc/data_channel_controller.h
View File

@ -15,6 +15,7 @@
#include <vector> #include <vector>
#include "api/data_channel_interface.h" #include "api/data_channel_interface.h"
#include "api/priority.h"
#include "api/rtc_error.h" #include "api/rtc_error.h"
#include "api/scoped_refptr.h" #include "api/scoped_refptr.h"
#include "api/sequence_checker.h" #include "api/sequence_checker.h"
@ -50,7 +51,7 @@ class DataChannelController : public SctpDataChannelControllerInterface,
RTCError SendData(StreamId sid, RTCError SendData(StreamId sid,
const SendDataParams& params, const SendDataParams& params,
const rtc::CopyOnWriteBuffer& payload) override; const rtc::CopyOnWriteBuffer& payload) override;
void AddSctpDataStream(StreamId sid) override; void AddSctpDataStream(StreamId sid, PriorityValue priority) override;
void RemoveSctpDataStream(StreamId sid) override; void RemoveSctpDataStream(StreamId sid) override;
void OnChannelStateChanged(SctpDataChannel* channel, void OnChannelStateChanged(SctpDataChannel* channel,
DataChannelInterface::DataState state) override; DataChannelInterface::DataState state) override;

6
pc/data_channel_controller_unittest.cc
View File

@ -12,6 +12,7 @@
#include <memory> #include <memory>
#include "api/priority.h"
#include "pc/peer_connection_internal.h" #include "pc/peer_connection_internal.h"
#include "pc/sctp_data_channel.h" #include "pc/sctp_data_channel.h"
#include "pc/test/mock_peer_connection_internal.h" #include "pc/test/mock_peer_connection_internal.h"
@ -31,7 +32,10 @@ class MockDataChannelTransport : public DataChannelTransportInterface {
public: public:
~MockDataChannelTransport() override {} ~MockDataChannelTransport() override {}
MOCK_METHOD(RTCError, OpenChannel, (int channel_id), (override)); MOCK_METHOD(RTCError,
OpenChannel,
(int channel_id, PriorityValue priority),
(override));
MOCK_METHOD(RTCError, MOCK_METHOD(RTCError,
SendData, SendData,
(int channel_id, (int channel_id,

7
pc/data_channel_unittest.cc
View File

@ -16,6 +16,7 @@
#include <vector> #include <vector>
#include "api/data_channel_interface.h" #include "api/data_channel_interface.h"
#include "api/priority.h"
#include "api/rtc_error.h" #include "api/rtc_error.h"
#include "api/scoped_refptr.h" #include "api/scoped_refptr.h"
#include "api/transport/data_channel_transport_interface.h" #include "api/transport/data_channel_transport_interface.h"
@ -100,7 +101,7 @@ class SctpDataChannelTest : public ::testing::Test {
RTC_DCHECK_RUN_ON(&network_thread_); RTC_DCHECK_RUN_ON(&network_thread_);
if (!inner_channel_->sid_n().has_value()) { if (!inner_channel_->sid_n().has_value()) {
inner_channel_->SetSctpSid_n(sid); inner_channel_->SetSctpSid_n(sid);
controller_->AddSctpDataStream(sid); controller_->AddSctpDataStream(sid, inner_channel_->priority());
} }
inner_channel_->OnTransportChannelCreated(); inner_channel_->OnTransportChannelCreated();
}); });
@ -117,7 +118,7 @@ class SctpDataChannelTest : public ::testing::Test {
StreamId sid) { StreamId sid) {
network_thread_.BlockingCall([&]() { network_thread_.BlockingCall([&]() {
channel->SetSctpSid_n(sid); channel->SetSctpSid_n(sid);
controller_->AddSctpDataStream(sid); controller_->AddSctpDataStream(sid, channel->priority());
}); });
} }
@ -162,7 +163,7 @@ TEST_F(SctpDataChannelTest, VerifyConfigurationGetters) {
EXPECT_EQ(channel_->reliable(), init_.reliable); EXPECT_EQ(channel_->reliable(), init_.reliable);
EXPECT_EQ(channel_->ordered(), init_.ordered); EXPECT_EQ(channel_->ordered(), init_.ordered);
EXPECT_EQ(channel_->negotiated(), init_.negotiated); EXPECT_EQ(channel_->negotiated(), init_.negotiated);
EXPECT_EQ(channel_->priority(), Priority::kLow); EXPECT_EQ(channel_->priority(), PriorityValue(Priority::kLow));
EXPECT_EQ(channel_->maxRetransmitTime(), static_cast<uint16_t>(-1)); EXPECT_EQ(channel_->maxRetransmitTime(), static_cast<uint16_t>(-1));
EXPECT_EQ(channel_->maxPacketLifeTime(), init_.maxRetransmitTime); EXPECT_EQ(channel_->maxPacketLifeTime(), init_.maxRetransmitTime);
EXPECT_EQ(channel_->maxRetransmits(), static_cast<uint16_t>(-1)); EXPECT_EQ(channel_->maxRetransmits(), static_cast<uint16_t>(-1));

7
pc/sctp_data_channel.cc
View File

@ -15,6 +15,7 @@
#include <string> #include <string>
#include <utility> #include <utility>
#include "api/priority.h"
#include "media/sctp/sctp_transport_internal.h" #include "media/sctp/sctp_transport_internal.h"
#include "pc/proxy.h" #include "pc/proxy.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
@ -50,7 +51,7 @@ BYPASS_PROXY_CONSTMETHOD0(std::string, protocol)
BYPASS_PROXY_CONSTMETHOD0(bool, negotiated) BYPASS_PROXY_CONSTMETHOD0(bool, negotiated)
// Can't bypass the proxy since the id may change. // Can't bypass the proxy since the id may change.
PROXY_SECONDARY_CONSTMETHOD0(int, id) PROXY_SECONDARY_CONSTMETHOD0(int, id)
BYPASS_PROXY_CONSTMETHOD0(Priority, priority) BYPASS_PROXY_CONSTMETHOD0(PriorityValue, priority)
BYPASS_PROXY_CONSTMETHOD0(DataState, state) BYPASS_PROXY_CONSTMETHOD0(DataState, state)
BYPASS_PROXY_CONSTMETHOD0(RTCError, error) BYPASS_PROXY_CONSTMETHOD0(RTCError, error)
PROXY_SECONDARY_CONSTMETHOD0(uint32_t, messages_sent) PROXY_SECONDARY_CONSTMETHOD0(uint32_t, messages_sent)
@ -479,8 +480,8 @@ int SctpDataChannel::id() const {
return id_n_.has_value() ? id_n_->stream_id_int() : -1; return id_n_.has_value() ? id_n_->stream_id_int() : -1;
} }
Priority SctpDataChannel::priority() const { PriorityValue SctpDataChannel::priority() const {
return priority_ ? *priority_ : Priority::kLow; return priority_.value_or(PriorityValue(Priority::kLow));
} }
uint64_t SctpDataChannel::buffered_amount() const { uint64_t SctpDataChannel::buffered_amount() const {

6
pc/sctp_data_channel.h
View File

@ -48,7 +48,7 @@ class SctpDataChannelControllerInterface {
const SendDataParams& params, const SendDataParams& params,
const rtc::CopyOnWriteBuffer& payload) = 0; const rtc::CopyOnWriteBuffer& payload) = 0;
// Adds the data channel SID to the transport for SCTP. // Adds the data channel SID to the transport for SCTP.
virtual void AddSctpDataStream(StreamId sid) = 0; virtual void AddSctpDataStream(StreamId sid, PriorityValue priority) = 0;
// Begins the closing procedure by sending an outgoing stream reset. Still // Begins the closing procedure by sending an outgoing stream reset. Still
// need to wait for callbacks to tell when this completes. // need to wait for callbacks to tell when this completes.
virtual void RemoveSctpDataStream(StreamId sid) = 0; virtual void RemoveSctpDataStream(StreamId sid) = 0;
@ -164,7 +164,7 @@ class SctpDataChannel : public DataChannelInterface {
std::string protocol() const override; std::string protocol() const override;
bool negotiated() const override; bool negotiated() const override;
int id() const override; int id() const override;
Priority priority() const override; PriorityValue priority() const override;
uint64_t buffered_amount() const override; uint64_t buffered_amount() const override;
void Close() override; void Close() override;
@ -277,7 +277,7 @@ class SctpDataChannel : public DataChannelInterface {
const std::string protocol_; const std::string protocol_;
const absl::optional<int> max_retransmit_time_; const absl::optional<int> max_retransmit_time_;
const absl::optional<int> max_retransmits_; const absl::optional<int> max_retransmits_;
const absl::optional<Priority> priority_; const absl::optional<PriorityValue> priority_;
const bool negotiated_; const bool negotiated_;
const bool ordered_; const bool ordered_;
// See the body of `MaybeSendOnBufferedAmountChanged`. // See the body of `MaybeSendOnBufferedAmountChanged`.

5
pc/sctp_transport.cc
View File

@ -15,6 +15,7 @@
#include "absl/types/optional.h" #include "absl/types/optional.h"
#include "api/dtls_transport_interface.h" #include "api/dtls_transport_interface.h"
#include "api/priority.h"
#include "api/sequence_checker.h" #include "api/sequence_checker.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
#include "rtc_base/logging.h" #include "rtc_base/logging.h"
@ -75,10 +76,10 @@ void SctpTransport::UnregisterObserver() {
observer_ = nullptr; observer_ = nullptr;
} }
RTCError SctpTransport::OpenChannel(int channel_id) { RTCError SctpTransport::OpenChannel(int channel_id, PriorityValue priority) {
RTC_DCHECK_RUN_ON(owner_thread_); RTC_DCHECK_RUN_ON(owner_thread_);
RTC_DCHECK(internal_sctp_transport_); RTC_DCHECK(internal_sctp_transport_);
internal_sctp_transport_->OpenStream(channel_id); internal_sctp_transport_->OpenStream(channel_id, priority);
return RTCError::OK(); return RTCError::OK();
} }

2
pc/sctp_transport.h
View File

@ -45,7 +45,7 @@ class SctpTransport : public SctpTransportInterface,
void UnregisterObserver() override; void UnregisterObserver() override;
// DataChannelTransportInterface // DataChannelTransportInterface
RTCError OpenChannel(int channel_id) override; RTCError OpenChannel(int channel_id, PriorityValue priority) override;
RTCError SendData(int channel_id, RTCError SendData(int channel_id,
const SendDataParams& params, const SendDataParams& params,
const rtc::CopyOnWriteBuffer& buffer) override; const rtc::CopyOnWriteBuffer& buffer) override;

3
pc/sctp_transport_unittest.cc
View File

@ -16,6 +16,7 @@
#include "absl/memory/memory.h" #include "absl/memory/memory.h"
#include "absl/types/optional.h" #include "absl/types/optional.h"
#include "api/dtls_transport_interface.h" #include "api/dtls_transport_interface.h"
#include "api/priority.h"
#include "api/transport/data_channel_transport_interface.h" #include "api/transport/data_channel_transport_interface.h"
#include "media/base/media_channel.h" #include "media/base/media_channel.h"
#include "p2p/base/fake_dtls_transport.h" #include "p2p/base/fake_dtls_transport.h"
@ -47,7 +48,7 @@ class FakeCricketSctpTransport : public cricket::SctpTransportInternal {
bool Start(int local_port, int remote_port, int max_message_size) override { bool Start(int local_port, int remote_port, int max_message_size) override {
return true; return true;
} }
bool OpenStream(int sid) override { return true; } bool OpenStream(int sid, PriorityValue priority) override { return true; }
bool ResetStream(int sid) override { return true; } bool ResetStream(int sid) override { return true; }
RTCError SendData(int sid, RTCError SendData(int sid,
const SendDataParams& params, const SendDataParams& params,

34
pc/sctp_utils.cc
View File

@ -88,17 +88,7 @@ bool ParseDataChannelOpenMessage(const rtc::CopyOnWriteBuffer& payload,
<< "Could not read OPEN message reliabilility prioirty."; << "Could not read OPEN message reliabilility prioirty.";
return false; return false;
} }
// Parse priority as defined in config->priority = PriorityValue(priority);
// https://w3c.github.io/webrtc-priority/#rtcdatachannel-processing-steps
if (priority <= DCO_PRIORITY_VERY_LOW) {
config->priority = Priority::kVeryLow;
} else if (priority <= DCO_PRIORITY_LOW) {
config->priority = Priority::kLow;
} else if (priority <= DCO_PRIORITY_MEDIUM) {
config->priority = Priority::kMedium;
} else {
config->priority = Priority::kHigh;
}
uint32_t reliability_param; uint32_t reliability_param;
if (!buffer.ReadUInt32(&reliability_param)) { if (!buffer.ReadUInt32(&reliability_param)) {
@ -172,7 +162,7 @@ bool WriteDataChannelOpenMessage(const std::string& label,
bool WriteDataChannelOpenMessage(const std::string& label, bool WriteDataChannelOpenMessage(const std::string& label,
const std::string& protocol, const std::string& protocol,
absl::optional<Priority> opt_priority, absl::optional<PriorityValue> opt_priority,
bool ordered, bool ordered,
absl::optional<int> max_retransmits, absl::optional<int> max_retransmits,
absl::optional<int> max_retransmit_time, absl::optional<int> max_retransmit_time,
@ -181,25 +171,9 @@ bool WriteDataChannelOpenMessage(const std::string& label,
// http://tools.ietf.org/html/draft-ietf-rtcweb-data-protocol-09#section-5.1 // http://tools.ietf.org/html/draft-ietf-rtcweb-data-protocol-09#section-5.1
uint8_t channel_type = 0; uint8_t channel_type = 0;
uint32_t reliability_param = 0; uint32_t reliability_param = 0;
uint16_t priority = 0;
// Set priority according to // Set priority according to
// https://tools.ietf.org/html/draft-ietf-rtcweb-data-channel-12#section-6.4 // https://tools.ietf.org/html/draft-ietf-rtcweb-data-channel-12#section-6.4
if (opt_priority) { PriorityValue priority = opt_priority.value_or(PriorityValue(Priority::kLow));
switch (*opt_priority) {
case Priority::kVeryLow:
priority = DCO_PRIORITY_VERY_LOW;
break;
case Priority::kLow:
priority = DCO_PRIORITY_LOW;
break;
case Priority::kMedium:
priority = DCO_PRIORITY_MEDIUM;
break;
case Priority::kHigh:
priority = DCO_PRIORITY_HIGH;
break;
}
}
if (ordered) { if (ordered) {
if (max_retransmits) { if (max_retransmits) {
channel_type = DCOMCT_ORDERED_PARTIAL_RTXS; channel_type = DCOMCT_ORDERED_PARTIAL_RTXS;
@ -226,7 +200,7 @@ bool WriteDataChannelOpenMessage(const std::string& label,
// TODO(tommi): Add error handling and check resulting length. // TODO(tommi): Add error handling and check resulting length.
buffer.WriteUInt8(DATA_CHANNEL_OPEN_MESSAGE_TYPE); buffer.WriteUInt8(DATA_CHANNEL_OPEN_MESSAGE_TYPE);
buffer.WriteUInt8(channel_type); buffer.WriteUInt8(channel_type);
buffer.WriteUInt16(priority); buffer.WriteUInt16(priority.value());
buffer.WriteUInt32(reliability_param); buffer.WriteUInt32(reliability_param);
buffer.WriteUInt16(static_cast<uint16_t>(label.length())); buffer.WriteUInt16(static_cast<uint16_t>(label.length()));
buffer.WriteUInt16(static_cast<uint16_t>(protocol.length())); buffer.WriteUInt16(static_cast<uint16_t>(protocol.length()));

3
pc/sctp_utils.h
View File

@ -14,6 +14,7 @@
#include <string> #include <string>
#include "api/data_channel_interface.h" #include "api/data_channel_interface.h"
#include "api/priority.h"
#include "api/transport/data_channel_transport_interface.h" #include "api/transport/data_channel_transport_interface.h"
#include "media/base/media_channel.h" #include "media/base/media_channel.h"
#include "media/sctp/sctp_transport_internal.h" #include "media/sctp/sctp_transport_internal.h"
@ -63,7 +64,7 @@ bool ParseDataChannelOpenAckMessage(const rtc::CopyOnWriteBuffer& payload);
bool WriteDataChannelOpenMessage(const std::string& label, bool WriteDataChannelOpenMessage(const std::string& label,
const std::string& protocol, const std::string& protocol,
absl::optional<Priority> priority, absl::optional<PriorityValue> priority,
bool ordered, bool ordered,
absl::optional<int> max_retransmits, absl::optional<int> max_retransmits,
absl::optional<int> max_retransmit_time, absl::optional<int> max_retransmit_time,

7
pc/sctp_utils_unittest.cc
View File

@ -55,9 +55,10 @@ class SctpUtilsTest : public ::testing::Test {
if (config.priority) { if (config.priority) {
// Exact values are checked by round-trip conversion, but // Exact values are checked by round-trip conversion, but
// all values defined are greater than zero. // all values defined are greater than zero.
EXPECT_GT(priority, 0); EXPECT_EQ(priority, config.priority->value());
} else { } else {
EXPECT_EQ(priority, 0); EXPECT_EQ(priority,
webrtc::PriorityValue(webrtc::Priority::kLow).value());
} }
ASSERT_TRUE(buffer.ReadUInt32(&reliability)); ASSERT_TRUE(buffer.ReadUInt32(&reliability));
@ -154,7 +155,7 @@ TEST_F(SctpUtilsTest, WriteParseOpenMessageWithPriority) {
webrtc::DataChannelInit config; webrtc::DataChannelInit config;
std::string label = "abc"; std::string label = "abc";
config.protocol = "y"; config.protocol = "y";
config.priority = webrtc::Priority::kVeryLow; config.priority = webrtc::PriorityValue(webrtc::Priority::kVeryLow);
rtc::CopyOnWriteBuffer packet; rtc::CopyOnWriteBuffer packet;
ASSERT_TRUE(webrtc::WriteDataChannelOpenMessage(label, config, &packet)); ASSERT_TRUE(webrtc::WriteDataChannelOpenMessage(label, config, &packet));

6
pc/test/fake_data_channel_controller.h
View File

@ -15,6 +15,7 @@
#include <string> #include <string>
#include <utility> #include <utility>
#include "api/priority.h"
#include "pc/sctp_data_channel.h" #include "pc/sctp_data_channel.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
#include "rtc_base/weak_ptr.h" #include "rtc_base/weak_ptr.h"
@ -60,7 +61,7 @@ class FakeDataChannelController
transport_available_, init, signaling_thread_, transport_available_, init, signaling_thread_,
network_thread_); network_thread_);
if (transport_available_ && channel->sid_n().has_value()) { if (transport_available_ && channel->sid_n().has_value()) {
AddSctpDataStream(*channel->sid_n()); AddSctpDataStream(*channel->sid_n(), channel->priority());
} }
if (ready_to_send_) { if (ready_to_send_) {
network_thread_->PostTask([channel = channel] { network_thread_->PostTask([channel = channel] {
@ -95,7 +96,8 @@ class FakeDataChannelController
return webrtc::RTCError::OK(); return webrtc::RTCError::OK();
} }
void AddSctpDataStream(webrtc::StreamId sid) override { void AddSctpDataStream(webrtc::StreamId sid,
webrtc::PriorityValue priority) override {
RTC_DCHECK_RUN_ON(network_thread_); RTC_DCHECK_RUN_ON(network_thread_);
if (!transport_available_) { if (!transport_available_) {
return; return;

1
test/pc/sctp/BUILD.gn
View File

@ -12,6 +12,7 @@ rtc_source_set("fake_sctp_transport") {
visibility = [ "*" ] visibility = [ "*" ]
sources = [ "fake_sctp_transport.h" ] sources = [ "fake_sctp_transport.h" ]
deps = [ deps = [
"../../../api:priority",
"../../../api/environment", "../../../api/environment",
"../../../api/transport:sctp_transport_factory_interface", "../../../api/transport:sctp_transport_factory_interface",
"../../../media:rtc_data_sctp_transport_internal", "../../../media:rtc_data_sctp_transport_internal",

5
test/pc/sctp/fake_sctp_transport.h
View File

@ -14,6 +14,7 @@
#include <memory> #include <memory>
#include "api/environment/environment.h" #include "api/environment/environment.h"
#include "api/priority.h"
#include "api/transport/sctp_transport_factory_interface.h" #include "api/transport/sctp_transport_factory_interface.h"
#include "media/sctp/sctp_transport_internal.h" #include "media/sctp/sctp_transport_internal.h"
@ -31,7 +32,9 @@ class FakeSctpTransport : public cricket::SctpTransportInternal {
max_message_size_ = max_message_size; max_message_size_ = max_message_size;
return true; return true;
} }
bool OpenStream(int sid) override { return true; } bool OpenStream(int sid, webrtc::PriorityValue priority) override {
return true;
}
bool ResetStream(int sid) override { return true; } bool ResetStream(int sid) override { return true; }
webrtc::RTCError SendData(int sid, webrtc::RTCError SendData(int sid,
const webrtc::SendDataParams& params, const webrtc::SendDataParams& params,