Separating internal and external methods of RtpSender/RtpReceiver.
This moves the implementation specific methods to separate classes
(RtpSenderInternal/RtpReceiverInternal) so that the interface classes
represent the interface that external applications can rely on.
The reason this wasn't done earlier was that PeerConnection needed
to store proxy pointers, but also needed to access implementation-
specific methods on the underlying objects. This is now possible
by using "RtpSenderProxyWithInternal<RtpSenderInternal>", which is a proxy
that implements RtpSenderInterface but also provides direct access
to an RtpSenderInternal.
Review-Url: https://codereview.webrtc.org/2023373002
Cr-Commit-Position: refs/heads/master@{#13056}
diff --git a/webrtc/api/peerconnectioninterface_unittest.cc b/webrtc/api/peerconnectioninterface_unittest.cc
index 7addbec..71233e0 100644
--- a/webrtc/api/peerconnectioninterface_unittest.cc
+++ b/webrtc/api/peerconnectioninterface_unittest.cc
@@ -333,7 +333,7 @@
const std::string& id,
const std::string& stream_id) {
for (const auto& sender : senders) {
- if (sender->id() == id && sender->stream_id() == stream_id) {
+ if (sender->id() == id && sender->stream_ids()[0] == stream_id) {
return true;
}
}
@@ -1166,10 +1166,12 @@
pc_factory_->CreateVideoSource(new cricket::FakeVideoCapturer())));
auto audio_sender = pc_->AddTrack(audio_track, stream_list);
auto video_sender = pc_->AddTrack(video_track, stream_list);
- EXPECT_EQ(kStreamLabel1, audio_sender->stream_id());
+ EXPECT_EQ(1UL, audio_sender->stream_ids().size());
+ EXPECT_EQ(kStreamLabel1, audio_sender->stream_ids()[0]);
EXPECT_EQ("audio_track", audio_sender->id());
EXPECT_EQ(audio_track, audio_sender->track());
- EXPECT_EQ(kStreamLabel1, video_sender->stream_id());
+ EXPECT_EQ(1UL, video_sender->stream_ids().size());
+ EXPECT_EQ(kStreamLabel1, video_sender->stream_ids()[0]);
EXPECT_EQ("video_track", video_sender->id());
EXPECT_EQ(video_track, video_sender->track());
@@ -1242,7 +1244,7 @@
EXPECT_EQ(video_track, video_sender->track());
// If the ID is truly a random GUID, it should be infinitely unlikely they
// will be the same.
- EXPECT_NE(video_sender->stream_id(), audio_sender->stream_id());
+ EXPECT_NE(video_sender->stream_ids(), audio_sender->stream_ids());
}
TEST_F(PeerConnectionInterfaceTest, CreateOfferReceiveAnswer) {