zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 2 "Refactoring DataContentDescription class"

Browse Source 
(substantial changes since version 1)

This CL splits the cricket::DataContentDescription class into
two classes: cricket::RtpDataContentDescription (used for RTP data)
and cricket::SctpDataContentDescription (used for SCTP only).

SctpDataContentDescription no longer inherits from
MediaContentDescriptionImpl, and no longer contains "codecs".

Due to usage of internal interfaces by consumers, shimming the old
DataContentDescription API is needed.

A new cricket::DataContentDescription class is defined, which is
a shim over RtpDataContentDescription and SctpDataContentDescription.
It exposes as little functionality as possible, but supports the
concerned consumer's usage

Design document:
https://docs.google.com/document/d/1H5LfQxJA2ikMWTQ8FZ3_GAmaXM7knfVQWiSz6ph8VQ0/edit#

Version 1 reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132700

Bug: webrtc:10358
Change-Id: Icf95fb7308244d6f2ebfdb403aaffc544e358580
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133900
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27853}
This commit is contained in:
Harald Alvestrand
2019-05-04 11:37:04 +02:00
committed by Commit Bot
parent 2390a139de
commit 14b2758726
21 changed files with 1350 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
pc/session_description_unittest.cc
View File

@ -9,6 +9,7 @@
*/
#include "pc/session_description.h"
#include "absl/memory/memory.h"
#include "test/gtest.h"
namespace cricket {
@ -121,11 +122,69 @@ TEST(SessionDescriptionTest, AddContentTransfersExtmapAllowMixedSetting) {
video_desc->extmap_allow_mixed_enum());
// Session level setting overrides media level when new content is added.
MediaContentDescription* data_desc = new DataContentDescription;
MediaContentDescription* data_desc = new RtpDataContentDescription;
data_desc->set_extmap_allow_mixed_enum(MediaContentDescription::kMedia);
session_desc.AddContent("data", MediaProtocolType::kRtp, data_desc);
EXPECT_EQ(MediaContentDescription::kSession,
data_desc->extmap_allow_mixed_enum());
}
TEST(SessionDescriptionTest, DataContentDescriptionCanAddStream) {
auto description = absl::make_unique<DataContentDescription>();
// Adding a stream without setting protocol first should work.
description->AddLegacyStream(1234);
EXPECT_EQ(1UL, description->streams().size());
}
TEST(SessionDescriptionTest, DataContentDescriptionCopyWorks) {
auto description = absl::make_unique<RtpDataContentDescription>();
auto shim_description = description->as_data();
auto shim_copy = shim_description->Copy();
delete shim_copy;
}
TEST(SessionDescriptionTest, DataContentDescriptionCodecsCallableOnNull) {
auto shim_description = absl::make_unique<DataContentDescription>();
auto codec_list = shim_description->codecs();
EXPECT_EQ(0UL, codec_list.size());
}
TEST(SessionDescriptionTest, DataContentDescriptionSctpConferenceMode) {
auto description = absl::make_unique<SctpDataContentDescription>();
auto shim_description = description->as_data();
EXPECT_FALSE(shim_description->conference_mode());
shim_description->set_conference_mode(true);
EXPECT_TRUE(shim_description->conference_mode());
}
TEST(SessionDescriptionTest, DataContentDesriptionInSessionIsUnwrapped) {
auto description = absl::make_unique<DataContentDescription>();
// Create a DTLS object behind the shim.
description->set_protocol(kMediaProtocolUdpDtlsSctp);
SessionDescription session;
session.AddContent("name", MediaProtocolType::kSctp, description.release());
ContentInfo* content = &(session.contents()[0]);
ASSERT_TRUE(content);
ASSERT_TRUE(content->media_description()->type() == MEDIA_TYPE_DATA);
ASSERT_TRUE(content->media_description()->as_sctp());
}
TEST(SessionDescriptionTest,
DataContentDescriptionInfoSurvivesInstantiationAsSctp) {
auto description = absl::make_unique<DataContentDescription>();
description->set_rtcp_mux(true);
description->set_protocol(kMediaProtocolUdpDtlsSctp);
EXPECT_TRUE(description->rtcp_mux());
}
TEST(SessionDescriptionTest,
DataContentDescriptionStreamInfoSurvivesInstantiationAsRtp) {
auto description = absl::make_unique<DataContentDescription>();
StreamParams stream;
description->AddLegacyStream(1234);
EXPECT_EQ(1UL, description->streams().size());
description->set_protocol(kMediaProtocolDtlsSavpf);
EXPECT_EQ(1UL, description->streams().size());
}
} // namespace cricket