admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
webrtc_m130/pc/composite_rtp_transport_test.cc
Bjorn Mellem 7e8de0bf2d Revert "Implement true negotiation for DatagramTransport with fallback to RTP." 
This reverts commit 71c6482baf0ff17141c635e6a7639493db68a65c.

Reason for revert: Lands too much at once and breaks downstream tests that need to implement new interfaces first.

Original change's description:
> Implement true negotiation for DatagramTransport with fallback to RTP.
> 
> In short, the caller places a x-opaque line in SDP for each m= section that
> uses datagram transport.  If the answerer supports datagram transport, it will
> parse this line and create a datagram transport.  It will then echo the x-opaque
> line into the answer (to indicate that it accepted use of datagram transport).
> 
> If the offer and answer contain exactly the same x-opaque line, both peers will
> use datagram transport.  If the x-opaque line is omitted from the answer (or is
> different in the answer) they will fall back to RTP.
> 
> Note that a different x-opaque line in the answer means the answerer did not
> understand something in the negotiation proto.  Since WebRTC cannot know what
> was misunderstood, or whether it's still possible to use the datagram transport,
> it must fall back to RTP.  This may change in the future, possibly by passing
> the answer to the datagram transport, but it's good enough for now.
> 
> Negotiation consists of four parts:
>  1. DatagramTransport exposes transport parameters for both client and server
>  perspectives.  The client just echoes what it received from the server (modulo
>  any fields it might not have understood).
> 
>  2. SDP adds a x-opaque line for opaque transport parameters.  Identical to
>  x-mt, but this is specific to datagram transport and goes in each m= section,
>  and appears in the answer as well as the offer.
>   - This is propagated to Jsep as part of the TransportDescription.
>   - SDP files: transport_description.h,cc, transport_description_factory.h,cc,
>     media_session.cc, webrtc_sdp.cc
> 
>  3. JsepTransport/Controller:
>   - Exposes opaque parameters for each mid (m= section).  On offerer, this means
>     pre-allocating a datagram transport and getting its parameters.  On the
>     answerer, this means echoing the offerer's parameters.
>   - Uses a composite RTP transport to receive from either default RTP or
>     datagram transport until both offer and answer arrive.
>   - If a provisional answer arrives, sets the composite to send on the
>     provisionally selected transport.
>   - Once both offer and answer are set, deletes the unneeded transports and
>     keeps whichever transport is selected.
> 
>  4. PeerConnection pulls transport parameters out of Jsep and adds them to SDP.
> 
> Bug: webrtc:9719
> Change-Id: Id8996eb1871e79d93b7923a5d7eb3431548c798d
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140700
> Commit-Queue: Bjorn Mellem <mellem@webrtc.org>
> Reviewed-by: Steve Anton <steveanton@webrtc.org>
> Reviewed-by: Anton Sukhanov <sukhanov@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#28182}

TBR=steveanton@webrtc.org,mellem@webrtc.org,sukhanov@webrtc.org

Change-Id: I0d502c4a6d27516c35ed85154f3fa5869f88b3b7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:9719
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140822
Commit-Queue: Bjorn Mellem <mellem@webrtc.org>
Reviewed-by: Bjorn Mellem <mellem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28188}
2019-06-07 06:17:50 +00:00

378 lines
13 KiB
C++
Raw Blame History

/*
* Copyright 2019 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "pc/composite_rtp_transport.h"
#include <memory>
#include "absl/memory/memory.h"
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
#include "p2p/base/fake_packet_transport.h"
#include "pc/rtp_transport.h"
#include "test/gtest.h"
namespace webrtc {
namespace {
constexpr char kTransportName[] = "test-transport";
constexpr char kRtcpTransportName[] = "test-transport-rtcp";
constexpr uint8_t kRtpPayloadType = 100;
constexpr uint8_t kRtcpPacket[] = {0x80, 73, 0, 0};
constexpr uint8_t kRtpPacket[] = {0x80, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
class CompositeRtpTransportTest : public ::testing::Test,
public sigslot::has_slots<>,
public RtpPacketSinkInterface {
public:
CompositeRtpTransportTest()
: packet_transport_1_(
absl::make_unique<rtc::FakePacketTransport>(kTransportName)),
packet_transport_2_(
absl::make_unique<rtc::FakePacketTransport>(kTransportName)),
rtcp_transport_1_(
absl::make_unique<rtc::FakePacketTransport>(kRtcpTransportName)),
rtcp_transport_2_(
absl::make_unique<rtc::FakePacketTransport>(kRtcpTransportName)) {}
void SetupRtpTransports(bool rtcp_mux) {
transport_1_ = absl::make_unique<RtpTransport>(rtcp_mux);
transport_2_ = absl::make_unique<RtpTransport>(rtcp_mux);
transport_1_->SetRtpPacketTransport(packet_transport_1_.get());
transport_2_->SetRtpPacketTransport(packet_transport_2_.get());
if (!rtcp_mux) {
transport_1_->SetRtcpPacketTransport(rtcp_transport_1_.get());
transport_2_->SetRtcpPacketTransport(rtcp_transport_2_.get());
}
composite_ = absl::make_unique<CompositeRtpTransport>(
std::vector<RtpTransportInternal*>{transport_1_.get(),
transport_2_.get()});
composite_->SignalReadyToSend.connect(
this, &CompositeRtpTransportTest::OnReadyToSend);
composite_->SignalWritableState.connect(
this, &CompositeRtpTransportTest::OnWritableState);
composite_->SignalSentPacket.connect(
this, &CompositeRtpTransportTest::OnSentPacket);
composite_->SignalNetworkRouteChanged.connect(
this, &CompositeRtpTransportTest::OnNetworkRouteChanged);
composite_->SignalRtcpPacketReceived.connect(
this, &CompositeRtpTransportTest::OnRtcpPacketReceived);
RtpDemuxerCriteria criteria;
criteria.payload_types.insert(kRtpPayloadType);
composite_->RegisterRtpDemuxerSink(criteria, this);
}
void TearDown() override { composite_->UnregisterRtpDemuxerSink(this); }
void OnReadyToSend(bool ready) { ++ready_to_send_count_; }
void OnWritableState(bool writable) { ++writable_state_count_; }
void OnSentPacket(const rtc::SentPacket& packet) { ++sent_packet_count_; }
void OnNetworkRouteChanged(absl::optional<rtc::NetworkRoute> route) {
++network_route_count_;
last_network_route_ = route;
}
void OnRtcpPacketReceived(rtc::CopyOnWriteBuffer* buffer,
int64_t packet_time_us) {
++rtcp_packet_count_;
last_packet_ = *buffer;
}
void OnRtpPacket(const RtpPacketReceived& packet) {
++rtp_packet_count_;
last_packet_ = packet.Buffer();
}
protected:
std::unique_ptr<rtc::FakePacketTransport> packet_transport_1_;
std::unique_ptr<rtc::FakePacketTransport> packet_transport_2_;
std::unique_ptr<rtc::FakePacketTransport> rtcp_transport_1_;
std::unique_ptr<rtc::FakePacketTransport> rtcp_transport_2_;
std::unique_ptr<RtpTransport> transport_1_;
std::unique_ptr<RtpTransport> transport_2_;
std::unique_ptr<CompositeRtpTransport> composite_;
int ready_to_send_count_ = 0;
int writable_state_count_ = 0;
int sent_packet_count_ = 0;
int network_route_count_ = 0;
int rtcp_packet_count_ = 0;
int rtp_packet_count_ = 0;
absl::optional<rtc::NetworkRoute> last_network_route_;
rtc::CopyOnWriteBuffer last_packet_;
};
TEST_F(CompositeRtpTransportTest, EnableRtcpMux) {
SetupRtpTransports(/*rtcp_mux=*/false);
EXPECT_FALSE(composite_->rtcp_mux_enabled());
EXPECT_FALSE(transport_1_->rtcp_mux_enabled());
EXPECT_FALSE(transport_2_->rtcp_mux_enabled());
composite_->SetRtcpMuxEnabled(true);
EXPECT_TRUE(composite_->rtcp_mux_enabled());
EXPECT_TRUE(transport_1_->rtcp_mux_enabled());
EXPECT_TRUE(transport_2_->rtcp_mux_enabled());
}
TEST_F(CompositeRtpTransportTest, DisableRtcpMux) {
SetupRtpTransports(/*rtcp_mux=*/true);
EXPECT_TRUE(composite_->rtcp_mux_enabled());
EXPECT_TRUE(transport_1_->rtcp_mux_enabled());
EXPECT_TRUE(transport_2_->rtcp_mux_enabled());
// If the component transports didn't have an RTCP transport before, they need
// to be set independently before disabling RTCP mux. There's no other sane
// way to do this, as the interface only allows sending a single RTCP
// transport, and we need one for each component.
transport_1_->SetRtcpPacketTransport(rtcp_transport_1_.get());
transport_2_->SetRtcpPacketTransport(rtcp_transport_2_.get());
composite_->SetRtcpMuxEnabled(false);
EXPECT_FALSE(composite_->rtcp_mux_enabled());
EXPECT_FALSE(transport_1_->rtcp_mux_enabled());
EXPECT_FALSE(transport_2_->rtcp_mux_enabled());
}
TEST_F(CompositeRtpTransportTest, SetRtpOption) {
SetupRtpTransports(/*rtcp_mux=*/true);
EXPECT_EQ(0, composite_->SetRtpOption(rtc::Socket::OPT_DSCP, 2));
int value = 0;
EXPECT_TRUE(packet_transport_1_->GetOption(rtc::Socket::OPT_DSCP, &value));
EXPECT_EQ(value, 2);
EXPECT_TRUE(packet_transport_2_->GetOption(rtc::Socket::OPT_DSCP, &value));
EXPECT_EQ(value, 2);
}
TEST_F(CompositeRtpTransportTest, SetRtcpOption) {
SetupRtpTransports(/*rtcp_mux=*/false);
EXPECT_EQ(0, composite_->SetRtcpOption(rtc::Socket::OPT_DSCP, 2));
int value = 0;
EXPECT_TRUE(rtcp_transport_1_->GetOption(rtc::Socket::OPT_DSCP, &value));
EXPECT_EQ(value, 2);
EXPECT_TRUE(rtcp_transport_2_->GetOption(rtc::Socket::OPT_DSCP, &value));
EXPECT_EQ(value, 2);
}
TEST_F(CompositeRtpTransportTest, NeverWritableWithoutSendTransport) {
SetupRtpTransports(/*rtcp_mux=*/true);
packet_transport_1_->SetWritable(true);
packet_transport_2_->SetWritable(true);
EXPECT_FALSE(composite_->IsWritable(false));
EXPECT_FALSE(composite_->IsWritable(true));
EXPECT_FALSE(composite_->IsReadyToSend());
EXPECT_EQ(0, ready_to_send_count_);
EXPECT_EQ(0, writable_state_count_);
}
TEST_F(CompositeRtpTransportTest, WritableWhenSendTransportBecomesWritable) {
SetupRtpTransports(/*rtcp_mux=*/true);
composite_->SetSendTransport(transport_1_.get());
EXPECT_FALSE(composite_->IsWritable(false));
EXPECT_FALSE(composite_->IsWritable(true));
EXPECT_FALSE(composite_->IsReadyToSend());
EXPECT_EQ(0, ready_to_send_count_);
EXPECT_EQ(1, writable_state_count_);
packet_transport_2_->SetWritable(true);
EXPECT_FALSE(composite_->IsWritable(false));
EXPECT_FALSE(composite_->IsWritable(true));
EXPECT_FALSE(composite_->IsReadyToSend());
EXPECT_EQ(0, ready_to_send_count_);
EXPECT_EQ(1, writable_state_count_);
packet_transport_1_->SetWritable(true);
EXPECT_TRUE(composite_->IsWritable(false));
EXPECT_TRUE(composite_->IsWritable(true));
EXPECT_TRUE(composite_->IsReadyToSend());
EXPECT_EQ(1, ready_to_send_count_);
EXPECT_EQ(2, writable_state_count_);
}
TEST_F(CompositeRtpTransportTest, SendTransportAlreadyWritable) {
SetupRtpTransports(/*rtcp_mux=*/true);
packet_transport_1_->SetWritable(true);
composite_->SetSendTransport(transport_1_.get());
EXPECT_TRUE(composite_->IsWritable(false));
EXPECT_TRUE(composite_->IsWritable(true));
EXPECT_TRUE(composite_->IsReadyToSend());
EXPECT_EQ(1, ready_to_send_count_);
EXPECT_EQ(1, writable_state_count_);
}
TEST_F(CompositeRtpTransportTest, IsSrtpActive) {
SetupRtpTransports(/*rtcp_mux=*/true);
EXPECT_FALSE(composite_->IsSrtpActive());
}
TEST_F(CompositeRtpTransportTest, NetworkRouteChange) {
SetupRtpTransports(/*rtcp_mux=*/true);
rtc::NetworkRoute route;
route.local_network_id = 7;
packet_transport_1_->SetNetworkRoute(route);
EXPECT_EQ(1, network_route_count_);
EXPECT_EQ(7, last_network_route_->local_network_id);
route.local_network_id = 8;
packet_transport_2_->SetNetworkRoute(route);
EXPECT_EQ(2, network_route_count_);
EXPECT_EQ(8, last_network_route_->local_network_id);
}
TEST_F(CompositeRtpTransportTest, SendRtcpBeforeSendTransportSet) {
SetupRtpTransports(/*rtcp_mux=*/true);
rtc::FakePacketTransport remote("remote");
remote.SetDestination(packet_transport_1_.get(), false);
rtc::CopyOnWriteBuffer packet(kRtcpPacket);
EXPECT_FALSE(composite_->SendRtcpPacket(&packet, rtc::PacketOptions(), 0));
EXPECT_EQ(0, sent_packet_count_);
}
TEST_F(CompositeRtpTransportTest, SendRtcpOn1) {
SetupRtpTransports(/*rtcp_mux=*/true);
rtc::FakePacketTransport remote("remote");
remote.SetDestination(packet_transport_1_.get(), false);
composite_->SetSendTransport(transport_1_.get());
rtc::CopyOnWriteBuffer packet(kRtcpPacket);
EXPECT_TRUE(composite_->SendRtcpPacket(&packet, rtc::PacketOptions(), 0));
EXPECT_EQ(1, sent_packet_count_);
EXPECT_EQ(packet, *packet_transport_1_->last_sent_packet());
}
TEST_F(CompositeRtpTransportTest, SendRtcpOn2) {
SetupRtpTransports(/*rtcp_mux=*/true);
rtc::FakePacketTransport remote("remote");
remote.SetDestination(packet_transport_2_.get(), false);
composite_->SetSendTransport(transport_2_.get());
rtc::CopyOnWriteBuffer packet(kRtcpPacket);
EXPECT_TRUE(composite_->SendRtcpPacket(&packet, rtc::PacketOptions(), 0));
EXPECT_EQ(1, sent_packet_count_);
EXPECT_EQ(packet, *packet_transport_2_->last_sent_packet());
}
TEST_F(CompositeRtpTransportTest, SendRtpBeforeSendTransportSet) {
SetupRtpTransports(/*rtcp_mux=*/true);
rtc::FakePacketTransport remote("remote");
remote.SetDestination(packet_transport_1_.get(), false);
rtc::CopyOnWriteBuffer packet(kRtpPacket);
EXPECT_FALSE(composite_->SendRtpPacket(&packet, rtc::PacketOptions(), 0));
EXPECT_EQ(0, sent_packet_count_);
}
TEST_F(CompositeRtpTransportTest, SendRtpOn1) {
SetupRtpTransports(/*rtcp_mux=*/true);
rtc::FakePacketTransport remote("remote");
remote.SetDestination(packet_transport_1_.get(), false);
composite_->SetSendTransport(transport_1_.get());
rtc::CopyOnWriteBuffer packet(kRtpPacket);
EXPECT_TRUE(composite_->SendRtpPacket(&packet, rtc::PacketOptions(), 0));
EXPECT_EQ(1, sent_packet_count_);
EXPECT_EQ(packet, *packet_transport_1_->last_sent_packet());
}
TEST_F(CompositeRtpTransportTest, SendRtpOn2) {
SetupRtpTransports(/*rtcp_mux=*/true);
rtc::FakePacketTransport remote("remote");
remote.SetDestination(packet_transport_2_.get(), false);
composite_->SetSendTransport(transport_2_.get());
rtc::CopyOnWriteBuffer packet(kRtpPacket);
EXPECT_TRUE(composite_->SendRtpPacket(&packet, rtc::PacketOptions(), 0));
EXPECT_EQ(1, sent_packet_count_);
EXPECT_EQ(packet, *packet_transport_2_->last_sent_packet());
}
TEST_F(CompositeRtpTransportTest, ReceiveRtcpFrom1) {
SetupRtpTransports(/*rtcp_mux=*/true);
rtc::FakePacketTransport remote("remote");
remote.SetDestination(packet_transport_1_.get(), false);
rtc::CopyOnWriteBuffer packet(kRtcpPacket);
remote.SendPacket(packet.cdata<char>(), packet.size(), rtc::PacketOptions(),
0);
EXPECT_EQ(1, rtcp_packet_count_);
EXPECT_EQ(packet, last_packet_);
}
TEST_F(CompositeRtpTransportTest, ReceiveRtcpFrom2) {
SetupRtpTransports(/*rtcp_mux=*/true);
rtc::FakePacketTransport remote("remote");
remote.SetDestination(packet_transport_2_.get(), false);
rtc::CopyOnWriteBuffer packet(kRtcpPacket);
remote.SendPacket(packet.cdata<char>(), packet.size(), rtc::PacketOptions(),
0);
EXPECT_EQ(1, rtcp_packet_count_);
EXPECT_EQ(packet, last_packet_);
}
TEST_F(CompositeRtpTransportTest, ReceiveRtpFrom1) {
SetupRtpTransports(/*rtcp_mux=*/true);
rtc::FakePacketTransport remote("remote");
remote.SetDestination(packet_transport_1_.get(), false);
rtc::CopyOnWriteBuffer packet(kRtpPacket);
remote.SendPacket(packet.cdata<char>(), packet.size(), rtc::PacketOptions(),
0);
EXPECT_EQ(1, rtp_packet_count_);
EXPECT_EQ(packet, last_packet_);
}
TEST_F(CompositeRtpTransportTest, ReceiveRtpFrom2) {
SetupRtpTransports(/*rtcp_mux=*/true);
rtc::FakePacketTransport remote("remote");
remote.SetDestination(packet_transport_2_.get(), false);
rtc::CopyOnWriteBuffer packet(kRtpPacket);
remote.SendPacket(packet.cdata<char>(), packet.size(), rtc::PacketOptions(),
0);
EXPECT_EQ(1, rtp_packet_count_);
EXPECT_EQ(packet, last_packet_);
}
} // namespace
} // namespace webrtc
Reference in New Issue View Git Blame Copy Permalink