commit 53b343539854e734c6b2ec29ad7c1cd66982cc0c
parent b3054b545a6df52cb26638738dc7ca4537c967c1
Author: Dan Baker <dbaker@mozilla.com>
Date: Mon, 1 Dec 2025 17:43:22 -0700
Bug 2000941 - Vendor libwebrtc from 7a191b1218
Upstream commit: https://webrtc.googlesource.com/src/+/7a191b1218b10dbd8b25008b9ff25d31778c695d
Refactor WebRTC SDP tests and deprecate old APIs
This refactors the SDP unit tests to use `SessionDescriptionInterface`
instead of `JsepSessionDescription` directly.
The `Initialize()` method is being deprecated, as it's an optional
two-step initialization, which can lead to indeterminate state.
Previously the tests used this and called Initialize() multiple times on
the same object, which made the tests harder to reason about. The tests
have been updated to use the `CreateSessionDescription()` factory method
instead and other api/ methods.
The change also:
* Adds a `RTC_DCHECK` to verify that no pre-existing candidates exist before adding new ones.
* Deprecates the `JsepSessionDescription(SdpType type)` constructor.
* Adds a new `add()` method to `IceCandidateCollection` to move candidates from another collection.
* Adds checks to `Clone()` to flag when candidates were not being cloned correctly.
* Significantly (but necessarily) refactors the SDP unit tests for better readability and to remove duplicate code.
Bug: webrtc:442220720
Change-Id: If78b400b4f53195786f7d61f41998e7ea6912163
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/408100
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#45589}
Diffstat:
13 files changed, 479 insertions(+), 471 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor
@@ -1,4 +1,4 @@
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
-libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-12-02T00:40:25.822895+00:00.
+libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-12-02T00:43:05.159850+00:00.
# base of lastest vendoring
-f2556b4ffe
+7a191b1218
diff --git a/third_party/libwebrtc/api/jsep.h b/third_party/libwebrtc/api/jsep.h
@@ -154,6 +154,9 @@ class IceCandidateCollection final {
[[deprecated("Use unique_ptr version")]]
void add(IceCandidate* candidate);
+ // Appends a collection of candidates.
+ void Append(IceCandidateCollection collection);
+
// Removes the candidate that has a matching address and protocol.
//
// Returns the number of candidates that were removed.
@@ -314,6 +317,11 @@ std::unique_ptr<SessionDescriptionInterface> CreateSessionDescription(
const std::string& session_version,
std::unique_ptr<SessionDescription> description);
+// Creates a rollback session description object (SdpType::kRollback).
+std::unique_ptr<SessionDescriptionInterface> CreateRollbackSessionDescription(
+ absl::string_view session_id = "",
+ absl::string_view session_version = "");
+
// CreateOffer and CreateAnswer callback interface.
class RTC_EXPORT CreateSessionDescriptionObserver : public RefCountInterface {
public:
diff --git a/third_party/libwebrtc/api/jsep_ice_candidate.cc b/third_party/libwebrtc/api/jsep_ice_candidate.cc
@@ -58,6 +58,12 @@ void IceCandidateCollection::add(IceCandidate* candidate) {
candidates_.push_back(absl::WrapUnique(candidate));
}
+void IceCandidateCollection::Append(IceCandidateCollection collection) {
+ candidates_.insert(candidates_.end(),
+ std::make_move_iterator(collection.candidates_.begin()),
+ std::make_move_iterator(collection.candidates_.end()));
+}
+
const IceCandidate* IceCandidateCollection::at(size_t index) const {
return candidates_[index].get();
}
diff --git a/third_party/libwebrtc/api/jsep_session_description.h b/third_party/libwebrtc/api/jsep_session_description.h
@@ -29,6 +29,12 @@ class SessionDescription;
// Implementation of SessionDescriptionInterface.
class JsepSessionDescription final : public SessionDescriptionInterface {
public:
+ // TODO: bugs.webrtc.org/442220720 - Remove this constructor and make sure
+ // that JsepSessionDescription can only be constructed with a valid
+ // SessionDescription object (with the exception of kRollback).
+ [[deprecated(
+ "JsepSessionDescription needs to be initialized with a valid description "
+ "object")]]
explicit JsepSessionDescription(SdpType type);
[[deprecated(
"Use the CreateSessionDescription() method(s) to create an instance.")]]
@@ -43,10 +49,17 @@ class JsepSessionDescription final : public SessionDescriptionInterface {
JsepSessionDescription& operator=(const JsepSessionDescription&) = delete;
// Takes ownership of `description`.
- // TODO(bugs.webrtc.org/442220720): Deprecate.
- // [[deprecated(
- // "Use CreateSessionDescription() to construct
- // SessionDescriptionInterface objects.")]]
+ // TODO(bugs.webrtc.org/442220720): Remove and prefer raii traits, make state
+ // const where possible. The problem with the Initialize method is that it
+ // is an _optional_ 2-step initialization method that prevents the class from
+ // making state const and also has been used in tests (possibly elsewhere)
+ // to call Initialize() more than once on the same object and rely on the
+ // fact that the implementation did not reset part of the state when called
+ // (the candidate list could be partially, but not completely, trimmed),
+ // meaning that the pre and post state is indeterminate.
+ [[deprecated(
+ "Use CreateSessionDescription() to construct SessionDescriptionInterface "
+ "objects.")]]
bool Initialize(std::unique_ptr<SessionDescription> description,
const std::string& session_id,
const std::string& session_version);
@@ -61,10 +74,8 @@ class JsepSessionDescription final : public SessionDescriptionInterface {
std::string session_version() const override { return session_version_; }
SdpType GetType() const override { return type_; }
std::string type() const override { return SdpTypeToString(type_); }
- // Allows changing the type. Used for testing.
bool AddCandidate(const IceCandidate* candidate) override;
bool RemoveCandidate(const IceCandidate* candidate) override;
-
size_t number_of_mediasections() const override;
const IceCandidateCollection* candidates(
size_t mediasection_index) const override;
@@ -75,7 +86,7 @@ class JsepSessionDescription final : public SessionDescriptionInterface {
std::string session_id_;
std::string session_version_;
const SdpType type_;
- std::vector<JsepCandidateCollection> candidate_collection_;
+ std::vector<IceCandidateCollection> candidate_collection_;
bool IsValidMLineIndex(int index) const;
bool GetMediasectionIndex(const IceCandidate* candidate, size_t* index) const;
diff --git a/third_party/libwebrtc/pc/jsep_ice_candidate.cc b/third_party/libwebrtc/pc/jsep_ice_candidate.cc
@@ -68,6 +68,7 @@ std::unique_ptr<IceCandidate> IceCandidate::Create(absl::string_view mid,
IceCandidateCollection IceCandidateCollection::Clone() const {
IceCandidateCollection new_collection;
+ new_collection.candidates_.reserve(candidates_.size());
for (const auto& candidate : candidates_) {
new_collection.candidates_.push_back(std::make_unique<IceCandidate>(
candidate->sdp_mid(), candidate->sdp_mline_index(),
diff --git a/third_party/libwebrtc/pc/jsep_session_description.cc b/third_party/libwebrtc/pc/jsep_session_description.cc
@@ -135,7 +135,7 @@ std::unique_ptr<SessionDescriptionInterface> CreateSessionDescription(
const std::string& sdp,
SdpParseError* error_out) {
if (type == SdpType::kRollback) {
- return std::make_unique<JsepSessionDescription>(type);
+ return CreateRollbackSessionDescription();
}
return SdpDeserialize(type, sdp, error_out);
}
@@ -145,12 +145,19 @@ std::unique_ptr<SessionDescriptionInterface> CreateSessionDescription(
const std::string& session_id,
const std::string& session_version,
std::unique_ptr<SessionDescription> description) {
- if (!description)
+ if (!description && type != SdpType::kRollback)
return nullptr;
return std::make_unique<JsepSessionDescription>(type, std::move(description),
session_id, session_version);
}
+std::unique_ptr<SessionDescriptionInterface> CreateRollbackSessionDescription(
+ absl::string_view session_id,
+ absl::string_view session_version) {
+ return std::make_unique<JsepSessionDescription>(
+ SdpType::kRollback, /*description=*/nullptr, session_id, session_version);
+}
+
JsepSessionDescription::JsepSessionDescription(SdpType type) : type_(type) {}
JsepSessionDescription::JsepSessionDescription(const std::string& type)
@@ -165,7 +172,7 @@ JsepSessionDescription::JsepSessionDescription(
session_id_(session_id),
session_version_(session_version),
type_(type) {
- RTC_DCHECK(description_);
+ RTC_DCHECK(description_ || type == SdpType::kRollback);
candidate_collection_.resize(number_of_mediasections());
}
@@ -187,14 +194,15 @@ bool JsepSessionDescription::Initialize(
std::unique_ptr<SessionDescriptionInterface> JsepSessionDescription::Clone()
const {
- auto new_description = std::make_unique<JsepSessionDescription>(type_);
- new_description->session_id_ = session_id_;
- new_description->session_version_ = session_version_;
- if (description_) {
- new_description->description_ = description_->Clone();
- }
- for (const auto& collection : candidate_collection_) {
- new_description->candidate_collection_.push_back(collection.Clone());
+ auto new_description = std::make_unique<JsepSessionDescription>(
+ GetType(), description_.get() ? description_->Clone() : nullptr,
+ session_id_, session_version_);
+ RTC_DCHECK_EQ(new_description->candidate_collection_.size(),
+ candidate_collection_.size());
+ for (size_t i = 0; i < candidate_collection_.size(); ++i) {
+ RTC_DCHECK(new_description->candidate_collection_[i].empty());
+ new_description->candidate_collection_[i].Append(
+ candidate_collection_[i].Clone());
}
return new_description;
}
diff --git a/third_party/libwebrtc/pc/jsep_session_description_unittest.cc b/third_party/libwebrtc/pc/jsep_session_description_unittest.cc
@@ -128,9 +128,13 @@ TEST_F(JsepSessionDescriptionTest, CloneDefault) {
}
TEST_F(JsepSessionDescriptionTest, CloneRollback) {
- auto jsep_desc = std::make_unique<JsepSessionDescription>(SdpType::kRollback);
+ auto jsep_desc = CreateRollbackSessionDescription(
+ absl::StrCat(CreateRandomId64()), absl::StrCat(CreateRandomId64()));
+ EXPECT_EQ(jsep_desc->GetType(), SdpType::kRollback);
auto new_desc = jsep_desc->Clone();
EXPECT_EQ(jsep_desc->type(), new_desc->type());
+ EXPECT_EQ(jsep_desc->session_id(), new_desc->session_id());
+ EXPECT_EQ(jsep_desc->session_version(), new_desc->session_version());
}
TEST_F(JsepSessionDescriptionTest, CloneWithCandidates) {
@@ -153,6 +157,18 @@ TEST_F(JsepSessionDescriptionTest, CloneWithCandidates) {
ASSERT_TRUE(jsep_desc_->AddCandidate(&jice_v6_video));
auto new_desc = jsep_desc_->Clone();
EXPECT_EQ(jsep_desc_->type(), new_desc->type());
+ ASSERT_EQ(jsep_desc_->number_of_mediasections(),
+ new_desc->number_of_mediasections());
+ for (size_t i = 0; i < jsep_desc_->number_of_mediasections(); ++i) {
+ const IceCandidateCollection* old_collection = jsep_desc_->candidates(i);
+ const IceCandidateCollection* new_collection = new_desc->candidates(i);
+ ASSERT_EQ(old_collection->count(), new_collection->count());
+ for (size_t j = 0; j < old_collection->count(); ++j) {
+ const IceCandidate* old_candidate = old_collection->at(j);
+ const IceCandidate* new_candidate = new_collection->at(j);
+ EXPECT_EQ(old_candidate->ToString(), new_candidate->ToString());
+ }
+ }
std::string old_desc_string;
std::string new_desc_string;
EXPECT_TRUE(jsep_desc_->ToString(&old_desc_string));
diff --git a/third_party/libwebrtc/pc/peer_connection_signaling_unittest.cc b/third_party/libwebrtc/pc/peer_connection_signaling_unittest.cc
@@ -1329,7 +1329,7 @@ TEST_F(PeerConnectionSignalingUnifiedPlanTest,
// Upon rolling back to "stable", a new negotiation needed event will be
// generated that is not suppressed.
- callee->SetLocalDescription(CreateSessionDescription(SdpType::kRollback, ""));
+ callee->SetLocalDescription(CreateRollbackSessionDescription());
EXPECT_TRUE(callee->observer()->has_negotiation_needed_event());
EXPECT_TRUE(callee->pc()->ShouldFireNegotiationNeededEvent(
callee->observer()->latest_negotiation_needed_event()));
diff --git a/third_party/libwebrtc/pc/peer_connection_wrapper.cc b/third_party/libwebrtc/pc/peer_connection_wrapper.cc
@@ -148,7 +148,7 @@ PeerConnectionWrapper::CreateAnswerAndSetAsLocal(
std::unique_ptr<SessionDescriptionInterface>
PeerConnectionWrapper::CreateRollback() {
- return CreateSessionDescription(SdpType::kRollback, "");
+ return CreateRollbackSessionDescription();
}
std::unique_ptr<SessionDescriptionInterface> PeerConnectionWrapper::CreateSdp(
diff --git a/third_party/libwebrtc/pc/sdp_utils.cc b/third_party/libwebrtc/pc/sdp_utils.cc
@@ -36,7 +36,8 @@ std::unique_ptr<SessionDescriptionInterface> CloneSessionDescriptionAsType(
sdesc->session_version(),
sdesc->description()->Clone());
}
- return std::make_unique<JsepSessionDescription>(type);
+ RTC_DCHECK_EQ(type, SdpType::kRollback);
+ return std::make_unique<JsepSessionDescription>(type, nullptr, "", "");
}
bool SdpContentsAll(SdpContentPredicate pred, const SessionDescription* desc) {
diff --git a/third_party/libwebrtc/pc/test/integration_test_helpers.h b/third_party/libwebrtc/pc/test/integration_test_helpers.h
@@ -674,8 +674,7 @@ class PeerConnectionIntegrationWrapper : public PeerConnectionObserver,
return WaitForDescriptionFromObserver(observer.get());
}
bool Rollback() {
- return SetRemoteDescription(
- CreateSessionDescription(SdpType::kRollback, ""));
+ return SetRemoteDescription(CreateRollbackSessionDescription());
}
// Functions for querying stats.
diff --git a/third_party/libwebrtc/pc/webrtc_sdp.cc b/third_party/libwebrtc/pc/webrtc_sdp.cc
@@ -3368,7 +3368,24 @@ bool SdpDeserialize(absl::string_view message,
return false;
}
+#if RTC_DCHECK_IS_ON
+ // The current implementation of JsepSessionDescription::Initialize()
+ // does not check if Initialize() has been called before on the same
+ // object. The side effect of that can be that while the number of
+ // media sections may get trimmed from a previous size, there might
+ // also be left-over candidates from previous use of the
+ // JsepSessionDescription object. The Initialize() method is being
+ // deprecated, but this check is meant to help with catching situations
+ // when pre-existing candidates exist just before the candidates from
+ // the media description get added.
+ for (size_t i = 0u; i < jdesc->number_of_mediasections(); ++i) {
+ RTC_DCHECK(jdesc->candidates(i)->empty());
+ }
+#endif
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
jdesc->Initialize(std::move(desc), session_id, session_version);
+#pragma clang diagnostic pop
for (const auto& candidate : candidates) {
jdesc->AddCandidate(candidate.get());
diff --git a/third_party/libwebrtc/pc/webrtc_sdp_unittest.cc b/third_party/libwebrtc/pc/webrtc_sdp_unittest.cc
@@ -840,15 +840,6 @@ constexpr SdpType kDummyType = SdpType::kOffer;
// Helper functions
-// TODO: bugs.webrtc.org/442220720 - Remove together with the deprecated
-// SdpDeserialize() method.
-bool SdpDeserialize(const std::string& message, JsepSessionDescription* jdesc) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- return SdpDeserialize(message, jdesc, nullptr);
-#pragma clang diagnostic pop
-}
-
// Creates a new session description with a supplied sdp, of type
// SdpType::kOffer (kDummyType).
std::unique_ptr<SessionDescriptionInterface> SdpDeserialize(
@@ -858,6 +849,12 @@ std::unique_ptr<SessionDescriptionInterface> SdpDeserialize(
return SdpDeserialize(SdpType::kOffer, sdp, error);
}
+std::string SdpSerialize(
+ const std::unique_ptr<SessionDescriptionInterface>& sd) {
+ EXPECT_THAT(sd, NotNull());
+ return sd ? SdpSerialize(*sd) : "";
+}
+
// Add some extra `newlines` to the `message` after `line`.
void InjectAfter(const std::string& line,
const std::string& newlines,
@@ -953,7 +950,7 @@ std::unique_ptr<IceCandidate> NewCandidate(absl::string_view sdp,
class WebRtcSdpTest : public ::testing::Test {
public:
- WebRtcSdpTest() : jdesc_(kDummyType) {
+ WebRtcSdpTest() {
#ifdef WEBRTC_ANDROID
InitializeAndroidObjects();
#endif
@@ -1076,9 +1073,13 @@ class WebRtcSdpTest : public ::testing::Test {
jcandidate_.reset(
new IceCandidate(std::string("audio_content_name"), 0, candidate1));
- // Set up JsepSessionDescription.
- jdesc_.Initialize(desc_.Clone(), kSessionId, kSessionVersion);
- std::string mline_id;
+ // Set up the main session description object.
+ jdesc_ = NewSessionDescriptionWithCandidates();
+ }
+
+ void AddCandidatesToDescription(SessionDescriptionInterface* sd) {
+ ASSERT_THAT(sd, NotNull());
+ absl::string_view mline_id;
int mline_index = 0;
for (size_t i = 0; i < candidates_.size(); ++i) {
// In this test, the audio m line index will be 0, and the video m line
@@ -1087,18 +1088,43 @@ class WebRtcSdpTest : public ::testing::Test {
mline_id = is_video ? "video_content_name" : "audio_content_name";
mline_index = is_video ? 1 : 0;
IceCandidate jice(mline_id, mline_index, candidates_.at(i));
- jdesc_.AddCandidate(&jice);
+ sd->AddCandidate(&jice);
}
}
- void RemoveVideoCandidates() {
+ // Creates a new SessionDescriptionInterface object from a clone of
+ // the inner `desc_` description.
+ std::unique_ptr<SessionDescriptionInterface>
+ NewSessionDescriptionWithCandidates() {
+ std::unique_ptr<SessionDescriptionInterface> sd = CreateSessionDescription(
+ kDummyType, kSessionId, kSessionVersion, desc_.Clone());
+ EXPECT_THAT(sd, NotNull());
+ if (sd) {
+ AddCandidatesToDescription(sd.get());
+ }
+ return sd;
+ }
+
+ // Creates a new session description based on the inner `desc_`
+ // and does not add the default candidate set.
+ std::unique_ptr<SessionDescriptionInterface>
+ NewSessionDescriptionNoCandidates() {
+ // Using the jdesc_->Clone() method would also clone the candidates, so
+ // instead, we just create a new session description with the properties
+ // from the inner jdesc_ object.
+ return CreateSessionDescription(kDummyType, kSessionId, kSessionVersion,
+ desc_.Clone());
+ }
+
+ void RemoveVideoCandidates(std::unique_ptr<SessionDescriptionInterface>& sd) {
+ ASSERT_THAT(sd, NotNull());
const IceCandidateCollection* video_candidates_collection =
- jdesc_.candidates(1);
+ sd->candidates(1);
ASSERT_NE(nullptr, video_candidates_collection);
// Since this loop modifies video_candidates_collection, just loop until
// it's empty instead of using a for loop.
while (!video_candidates_collection->candidates().empty()) {
- ASSERT_TRUE(jdesc_.RemoveCandidate(
+ ASSERT_TRUE(sd->RemoveCandidate(
video_candidates_collection->candidates().back().get()));
}
}
@@ -1106,9 +1132,7 @@ class WebRtcSdpTest : public ::testing::Test {
// Turns the existing reference description into a description using
// a=bundle-only. This means no transport attributes and a 0 port value on
// the m= sections not associated with the BUNDLE-tag.
- void MakeBundleOnlyDescription() {
- RemoveVideoCandidates();
-
+ std::unique_ptr<SessionDescriptionInterface> MakeBundleOnlyDescription() {
// And the rest of the transport attributes.
desc_.transport_infos()[1].description.ice_ufrag.clear();
desc_.transport_infos()[1].description.ice_pwd.clear();
@@ -1124,13 +1148,18 @@ class WebRtcSdpTest : public ::testing::Test {
group.AddContentName(kVideoContentName);
desc_.AddGroup(group);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
+ std::unique_ptr<SessionDescriptionInterface> sd =
+ NewSessionDescriptionWithCandidates();
+ // Remove the video candidates (not audio). This is to maintain
+ // compatibility with the expectations of the tests that call
+ // MakeBundleOnlyDescription().
+ RemoveVideoCandidates(sd);
+ return sd;
}
// Turns the existing reference description into a plan B description,
// with 2 audio tracks and 3 video tracks.
- void MakePlanBDescription() {
+ std::unique_ptr<SessionDescriptionInterface> MakePlanBDescription() {
audio_desc_ = new AudioContentDescription(*audio_desc_);
video_desc_ = new VideoContentDescription(*video_desc_);
@@ -1163,8 +1192,7 @@ class WebRtcSdpTest : public ::testing::Test {
absl::WrapUnique(video_desc_));
desc_.set_msid_signaling(kMsidSignalingSsrcAttribute |
kMsidSignalingSemantic);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
+ return NewSessionDescriptionWithCandidates();
}
// Turns the existing reference description into a unified plan description,
@@ -1219,8 +1247,7 @@ class WebRtcSdpTest : public ::testing::Test {
desc_.set_msid_signaling(kMsidSignalingMediaSection |
kMsidSignalingSemantic);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
+ jdesc_ = NewSessionDescriptionWithCandidates();
}
// Creates an audio content description with no streams, and some default
@@ -1243,7 +1270,7 @@ class WebRtcSdpTest : public ::testing::Test {
void MakeUnifiedPlanDescriptionMultipleStreamIds(const int msid_signaling) {
desc_.RemoveContentByName(kVideoContentName);
desc_.RemoveTransportInfoByName(kVideoContentName);
- RemoveVideoCandidates();
+ RemoveVideoCandidates(jdesc_);
// Audio track 2 has 2 media stream ids.
AudioContentDescription* audio_desc_2 = CreateAudioContentDescription();
@@ -1273,32 +1300,8 @@ class WebRtcSdpTest : public ::testing::Test {
TransportInfo(kAudioContentName3,
MakeTransportDescription(kUfragVoice3, kPwdVoice3)));
desc_.set_msid_signaling(msid_signaling);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
- }
-
- // Turns the existing reference description into a unified plan description
- // with one audio MediaContentDescription that contains one StreamParams with
- // 0 ssrcs.
- void MakeUnifiedPlanDescriptionNoSsrcSignaling() {
- desc_.RemoveContentByName(kVideoContentName);
- desc_.RemoveContentByName(kAudioContentName);
- desc_.RemoveTransportInfoByName(kVideoContentName);
- RemoveVideoCandidates();
-
- AudioContentDescription* audio_desc = CreateAudioContentDescription();
- StreamParams audio_track;
- audio_track.id = kAudioTrackId1;
- audio_track.set_stream_ids({kStreamId1});
- audio_desc->AddStream(audio_track);
- desc_.AddContent(kAudioContentName, MediaProtocolType::kRtp,
- absl::WrapUnique(audio_desc));
-
- // Enable signaling a=msid lines.
- desc_.set_msid_signaling(kMsidSignalingMediaSection |
- kMsidSignalingSemantic);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
+ jdesc_ = NewSessionDescriptionWithCandidates();
+ ASSERT_THAT(jdesc_, NotNull());
}
// Creates a video content description with no streams, and some default
@@ -1508,7 +1511,7 @@ class WebRtcSdpTest : public ::testing::Test {
const IceCandidateCollection* cc1 = desc1.candidates(i);
const IceCandidateCollection* cc2 = desc2.candidates(i);
if (cc1->count() != cc2->count()) {
- ADD_FAILURE();
+ EXPECT_EQ(cc1->count(), cc2->count());
return false;
}
for (size_t j = 0; j < cc1->count(); ++j) {
@@ -1521,8 +1524,7 @@ class WebRtcSdpTest : public ::testing::Test {
}
return true;
}
- // Convenience helpers while migrating away from direct use of
- // JsepSessionDescription.
+ // Convenience helpers while migrating over to unique_ptr<>.
bool CompareSessionDescription(
const std::unique_ptr<SessionDescriptionInterface>& desc1,
const SessionDescriptionInterface& desc2) {
@@ -1545,6 +1547,20 @@ class WebRtcSdpTest : public ::testing::Test {
return CompareSessionDescription(*desc1, *desc2);
}
+ // Calls `CompareSessionDescription()` to compare `sd` against the inner
+ // `desc_` description along with the default set of candidates.
+ bool MatchesCurrentDescription(
+ const std::unique_ptr<SessionDescriptionInterface>& sd) {
+ return CompareSessionDescription(NewSessionDescriptionWithCandidates(), sd);
+ }
+
+ // Calls `CompareSessionDescription()` to compare `sd` against the inner
+ // `desc_` description without the default set of candidates.
+ bool MatchesCurrentDescriptionNoCandidates(
+ const std::unique_ptr<SessionDescriptionInterface>& sd) {
+ return CompareSessionDescription(NewSessionDescriptionNoCandidates(), sd);
+ }
+
// Disable the ice-ufrag and ice-pwd in given `sdp` message by replacing
// them with invalid keywords so that the parser will just ignore them.
bool RemoveCandidateUfragPwd(std::string* sdp) {
@@ -1572,8 +1588,8 @@ class WebRtcSdpTest : public ::testing::Test {
const_cast<SessionDescription*>(jdesc->description());
desc->RemoveTransportInfoByName(content_name);
desc->AddTransportInfo(transport_info);
- for (size_t i = 0; i < jdesc_.number_of_mediasections(); ++i) {
- const IceCandidateCollection* cc = jdesc_.candidates(i);
+ for (size_t i = 0; i < jdesc_->number_of_mediasections(); ++i) {
+ const IceCandidateCollection* cc = jdesc_->candidates(i);
for (size_t j = 0; j < cc->count(); ++j) {
if (cc->at(j)->sdp_mline_index() == mline_index) {
const_cast<Candidate&>(cc->at(j)->candidate()).set_username(ufrag);
@@ -1624,7 +1640,7 @@ class WebRtcSdpTest : public ::testing::Test {
// Removes everything in StreamParams from the session description that is
// used for a=ssrc lines.
void RemoveSsrcSignalingFromStreamParams() {
- for (ContentInfo& content_info : jdesc_.description()->contents()) {
+ for (ContentInfo& content_info : jdesc_->description()->contents()) {
// With Unified Plan there should be one StreamParams per m= section.
StreamParams& stream =
content_info.media_description()->mutable_streams()[0];
@@ -1671,14 +1687,9 @@ class WebRtcSdpTest : public ::testing::Test {
video_desc_->set_direction(direction);
std::string new_sdp = kSdpFullString;
ReplaceDirection(direction, &new_sdp);
-
- if (!jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version())) {
- return false;
- }
- std::string message = SdpSerialize(jdesc_);
+ std::string message = SerializeCurrentDescription();
EXPECT_EQ(new_sdp, message);
- return true;
+ return new_sdp == message;
}
bool TestSerializeRejected(bool audio_rejected, bool video_rejected) {
@@ -1698,11 +1709,7 @@ class WebRtcSdpTest : public ::testing::Test {
std::string new_sdp = kSdpString;
ReplaceRejected(audio_rejected, video_rejected, &new_sdp);
-
- JsepSessionDescription jdesc_no_candidates(kDummyType);
- MakeDescriptionWithoutCandidates(&jdesc_no_candidates);
- std::string message = SdpSerialize(jdesc_no_candidates);
- EXPECT_EQ(new_sdp, message);
+ EXPECT_EQ(new_sdp, SdpSerialize(MakeDescriptionWithoutCandidates()));
return true;
}
@@ -1730,12 +1737,7 @@ class WebRtcSdpTest : public ::testing::Test {
audio_desc_->set_direction(direction);
video_desc_->set_direction(direction);
- if (!jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version())) {
- return false;
- }
- EXPECT_TRUE(CompareSessionDescription(jdesc_, new_jdesc));
- return true;
+ return MatchesCurrentDescription(new_jdesc);
}
bool TestDeserializeRejected(bool audio_rejected, bool video_rejected) {
@@ -1759,12 +1761,7 @@ class WebRtcSdpTest : public ::testing::Test {
audio_rejected ? "" : kPwdVoice);
SetIceUfragPwd(kVideoContentName, video_rejected ? "" : kUfragVideo,
video_rejected ? "" : kPwdVideo);
- JsepSessionDescription jdesc_no_candidates(kDummyType);
- if (!jdesc_no_candidates.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version())) {
- return false;
- }
- EXPECT_TRUE(CompareSessionDescription(jdesc_no_candidates, new_jdesc));
+ EXPECT_TRUE(MatchesCurrentDescriptionNoCandidates(new_jdesc));
return true;
}
@@ -1773,8 +1770,8 @@ class WebRtcSdpTest : public ::testing::Test {
bool encrypted) {
AddExtmap(encrypted);
std::unique_ptr<SessionDescriptionInterface> new_jdesc =
- CreateSessionDescription(SdpType::kOffer, jdesc_.session_id(),
- jdesc_.session_version(), desc_.Clone());
+ CreateSessionDescription(SdpType::kOffer, jdesc_->session_id(),
+ jdesc_->session_version(), desc_.Clone());
ASSERT_THAT(new_jdesc, NotNull());
std::string sdp_with_extmap = kSdpString;
@@ -1970,32 +1967,34 @@ class WebRtcSdpTest : public ::testing::Test {
// some of the lines can be serialized in different order.
// However, a deserialized description can be compared field by field and has
// no order. If deserializer has already been tested, serializing then
- // deserializing and comparing JsepSessionDescription will test
+ // deserializing and comparing session descriptions will test
// the serializer sufficiently.
- void TestSerialize(const SessionDescriptionInterface& jdesc) {
+ void TestSerialize(
+ const std::unique_ptr<SessionDescriptionInterface>& jdesc) {
+ ASSERT_THAT(jdesc, NotNull());
std::string message = SdpSerialize(jdesc);
std::unique_ptr<SessionDescriptionInterface> jdesc_output_des =
SdpDeserialize(message);
ASSERT_THAT(jdesc_output_des, NotNull());
EXPECT_TRUE(CompareSessionDescription(jdesc, jdesc_output_des));
}
- // Convenience helper while migrating away from direct use of
- // JsepSessionDescription.
- void TestSerialize(
- const std::unique_ptr<SessionDescriptionInterface>& jdesc) {
- TestSerialize(*jdesc);
+
+ // Returns a new session description with a clone of the inner
+ // SessionDescription but no candidates. The 'connection address' field
+ // for the audio and video descriptions, previously set from the candidates,
+ // will be reset on both the returned object and the inner.
+ std::unique_ptr<SessionDescriptionInterface>
+ MakeDescriptionWithoutCandidates() {
+ audio_desc_->set_connection_address(SocketAddress("0.0.0.0", 9));
+ video_desc_->set_connection_address(SocketAddress("0.0.0.0", 9));
+ return CreateSessionDescription(kDummyType, kSessionId, kSessionVersion,
+ desc_.Clone());
}
- // Calling 'Initialize' with a copy of the inner SessionDescription will
- // create a copy of the JsepSessionDescription without candidates. The
- // 'connection address' field, previously set from the candidates, must also
- // be reset.
- void MakeDescriptionWithoutCandidates(JsepSessionDescription* jdesc) {
- SocketAddress audio_addr("0.0.0.0", 9);
- SocketAddress video_addr("0.0.0.0", 9);
- audio_desc_->set_connection_address(audio_addr);
- video_desc_->set_connection_address(video_addr);
- ASSERT_TRUE(jdesc->Initialize(desc_.Clone(), kSessionId, kSessionVersion));
+ // Returns an SDP string generated from the current state of `desc_`
+ // together with the default set of candidates.
+ std::string SerializeCurrentDescription() {
+ return SdpSerialize(NewSessionDescriptionWithCandidates());
}
protected:
@@ -2005,7 +2004,7 @@ class WebRtcSdpTest : public ::testing::Test {
SctpDataContentDescription* sctp_desc_;
std::vector<Candidate> candidates_;
std::unique_ptr<IceCandidate> jcandidate_;
- JsepSessionDescription jdesc_;
+ std::unique_ptr<SessionDescriptionInterface> jdesc_;
};
void TestMismatch(const std::string& string1, const std::string& string2) {
@@ -2032,22 +2031,19 @@ TEST_F(WebRtcSdpTest, SerializeSessionDescription) {
}
// This basically tests if SdpSerialize() checks the description() property.
-// Once we've moved fully over to constructing SessionDescriptionInterface
-// objects, this might not be necessary or possible since constructing a
-// session description object with an invalid `description()` property,
-// should not be possible.
+// kRollback is the only type that's allowed to have a null description field
+// so that's what we'll use.
TEST_F(WebRtcSdpTest, SerializeSessionDescriptionEmpty) {
- JsepSessionDescription jdesc_empty(kDummyType);
- EXPECT_THAT(jdesc_empty.description(), IsNull());
+ std::unique_ptr<SessionDescriptionInterface> jdesc_empty =
+ CreateRollbackSessionDescription(kSessionId, kSessionVersion);
+ ASSERT_THAT(jdesc_empty, NotNull());
+ EXPECT_THAT(jdesc_empty->description(), IsNull());
EXPECT_EQ("", SdpSerialize(jdesc_empty));
}
TEST_F(WebRtcSdpTest, SerializeSessionDescriptionWithoutCandidates) {
- // JsepSessionDescription with desc but without candidates.
- JsepSessionDescription jdesc_no_candidates(kDummyType);
- MakeDescriptionWithoutCandidates(&jdesc_no_candidates);
- std::string message = SdpSerialize(jdesc_no_candidates);
- EXPECT_EQ(std::string(kSdpString), message);
+ // Session description with desc but without candidates.
+ EXPECT_EQ(SdpSerialize(MakeDescriptionWithoutCandidates()), kSdpString);
}
TEST_F(WebRtcSdpTest, SerializeSessionDescriptionWithBundles) {
@@ -2058,9 +2054,7 @@ TEST_F(WebRtcSdpTest, SerializeSessionDescriptionWithBundles) {
ContentGroup group2(GROUP_TYPE_BUNDLE);
group2.AddContentName(kAudioContentName2);
desc_.AddGroup(group2);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
- std::string message = SdpSerialize(jdesc_);
+ std::string message = SerializeCurrentDescription();
std::string sdp_with_bundle = kSdpFullString;
InjectAfter(kSessionTime,
"a=group:BUNDLE audio_content_name video_content_name\r\n"
@@ -2076,9 +2070,7 @@ TEST_F(WebRtcSdpTest, SerializeSessionDescriptionWithBandwidth) {
AudioContentDescription* acd = GetFirstAudioContentDescription(&desc_);
acd->set_bandwidth(555);
acd->set_bandwidth_type("TIAS");
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
- std::string message = SdpSerialize(jdesc_);
+ std::string message = SerializeCurrentDescription();
std::string sdp_with_bandwidth = kSdpFullString;
InjectAfter("c=IN IP4 74.125.224.39\r\n", "b=AS:100\r\n",
&sdp_with_bandwidth);
@@ -2091,9 +2083,7 @@ TEST_F(WebRtcSdpTest, SerializeSessionDescriptionWithBandwidth) {
TEST_F(WebRtcSdpTest, SerializeSessionDescriptionWithMissingBandwidthType) {
VideoContentDescription* vcd = GetFirstVideoContentDescription(&desc_);
vcd->set_bandwidth(100 * 1000);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
- std::string message = SdpSerialize(jdesc_);
+ std::string message = SerializeCurrentDescription();
std::string sdp_with_bandwidth = kSdpFullString;
InjectAfter("c=IN IP4 74.125.224.39\r\n", "b=AS:100\r\n",
&sdp_with_bandwidth);
@@ -2109,9 +2099,7 @@ TEST_F(WebRtcSdpTest, SerializeSessionDescriptionWithIceOptions) {
transport_options.push_back(kIceOption2);
transport_options.push_back(kIceOption3);
AddIceOptions(kVideoContentName, transport_options);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
- std::string message = SdpSerialize(jdesc_);
+ std::string message = SerializeCurrentDescription();
std::string sdp_with_ice_options = kSdpFullString;
InjectAfter(kAttributeIcePwdVoice, "a=ice-options:iceoption1 iceoption3\r\n",
&sdp_with_ice_options);
@@ -2147,37 +2135,36 @@ TEST_F(WebRtcSdpTest, SerializeSessionDescriptionWithAudioVideoRejected) {
TEST_F(WebRtcSdpTest, SerializeSessionDescriptionWithSctpDataChannel) {
bool use_sctpmap = true;
AddSctpDataChannel(use_sctpmap);
- JsepSessionDescription jsep_desc(kDummyType);
-
- MakeDescriptionWithoutCandidates(&jsep_desc);
- std::string message = SdpSerialize(jsep_desc);
+ std::string message = SdpSerialize(MakeDescriptionWithoutCandidates());
std::string expected_sdp = kSdpString;
expected_sdp.append(kSdpSctpDataChannelString);
EXPECT_EQ(message, expected_sdp);
}
-void MutateJsepSctpPort(JsepSessionDescription* jdesc,
- const SessionDescription& desc,
- int port) {
+std::unique_ptr<SessionDescriptionInterface> MutateSctpPort(
+ const SessionDescriptionInterface* jdesc,
+ const SessionDescription& desc,
+ int port) {
+ EXPECT_THAT(jdesc, NotNull());
+ if (!jdesc)
+ return nullptr;
// Take our pre-built session description and change the SCTP port.
std::unique_ptr<SessionDescription> mutant = desc.Clone();
SctpDataContentDescription* dcdesc =
mutant->GetContentDescriptionByName(kDataContentName)->as_sctp();
dcdesc->set_port(port);
- ASSERT_TRUE(
- jdesc->Initialize(std::move(mutant), kSessionId, kSessionVersion));
+ return CreateSessionDescription(jdesc->GetType(), jdesc->session_id(),
+ jdesc->session_version(), std::move(mutant));
}
TEST_F(WebRtcSdpTest, SerializeWithSctpDataChannelAndNewPort) {
bool use_sctpmap = true;
AddSctpDataChannel(use_sctpmap);
- JsepSessionDescription jsep_desc(kDummyType);
- MakeDescriptionWithoutCandidates(&jsep_desc);
-
const int kNewPort = 1234;
- MutateJsepSctpPort(&jsep_desc, desc_, kNewPort);
-
+ std::unique_ptr<SessionDescriptionInterface> jsep_desc =
+ MutateSctpPort(MakeDescriptionWithoutCandidates().get(), desc_, kNewPort);
+ ASSERT_THAT(jsep_desc, NotNull());
std::string message = SdpSerialize(jsep_desc);
std::string expected_sdp = kSdpString;
@@ -2191,16 +2178,16 @@ TEST_F(WebRtcSdpTest, SerializeWithSctpDataChannelAndNewPort) {
}
TEST_F(WebRtcSdpTest, SerializeSessionDescriptionWithExtmapAllowMixed) {
- jdesc_.description()->set_extmap_allow_mixed(true);
+ jdesc_->description()->set_extmap_allow_mixed(true);
TestSerialize(jdesc_);
}
TEST_F(WebRtcSdpTest, SerializeMediaContentDescriptionWithExtmapAllowMixed) {
MediaContentDescription* video_desc =
- jdesc_.description()->GetContentDescriptionByName(kVideoContentName);
+ jdesc_->description()->GetContentDescriptionByName(kVideoContentName);
ASSERT_THAT(video_desc, NotNull());
MediaContentDescription* audio_desc =
- jdesc_.description()->GetContentDescriptionByName(kAudioContentName);
+ jdesc_->description()->GetContentDescriptionByName(kAudioContentName);
ASSERT_THAT(audio_desc, NotNull());
video_desc->set_extmap_allow_mixed_enum(MediaContentDescription::kMedia);
audio_desc->set_extmap_allow_mixed_enum(MediaContentDescription::kMedia);
@@ -2210,9 +2197,7 @@ TEST_F(WebRtcSdpTest, SerializeMediaContentDescriptionWithExtmapAllowMixed) {
TEST_F(WebRtcSdpTest, SerializeSessionDescriptionWithExtmap) {
bool encrypted = false;
AddExtmap(encrypted);
- JsepSessionDescription desc_with_extmap(kDummyType);
- MakeDescriptionWithoutCandidates(&desc_with_extmap);
- std::string message = SdpSerialize(desc_with_extmap);
+ std::string message = SdpSerialize(MakeDescriptionWithoutCandidates());
std::string sdp_with_extmap = kSdpString;
InjectAfter("a=mid:audio_content_name\r\n", kExtmap, &sdp_with_extmap);
@@ -2224,10 +2209,8 @@ TEST_F(WebRtcSdpTest, SerializeSessionDescriptionWithExtmap) {
TEST_F(WebRtcSdpTest, SerializeSessionDescriptionWithExtmapEncrypted) {
bool encrypted = true;
AddExtmap(encrypted);
- JsepSessionDescription desc_with_extmap(kDummyType);
- ASSERT_TRUE(
- desc_with_extmap.Initialize(desc_.Clone(), kSessionId, kSessionVersion));
- TestSerialize(desc_with_extmap);
+ TestSerialize(CreateSessionDescription(kDummyType, kSessionId,
+ kSessionVersion, desc_.Clone()));
}
TEST_F(WebRtcSdpTest, SerializeCandidates) {
@@ -2311,9 +2294,7 @@ TEST_F(WebRtcSdpTest, SerializeSessionDescriptionWithH264) {
h264_codec.SetParam("packetization-mode", "1");
video_desc_->AddCodec(h264_codec);
- jdesc_.Initialize(desc_.Clone(), kSessionId, kSessionVersion);
-
- std::string message = SdpSerialize(jdesc_);
+ std::string message = SerializeCurrentDescription();
size_t after_pt = message.find(" H264/90000");
ASSERT_NE(after_pt, std::string::npos);
size_t before_pt = message.rfind("a=rtpmap:", after_pt);
@@ -2410,10 +2391,11 @@ TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithoutRtpmapButWithFmtp) {
"a=fmtp:18 annexb=yes\r\n"
"a=rtpmap:103 ISAC/16000\r\n";
- JsepSessionDescription jdesc(kDummyType);
- EXPECT_TRUE(SdpDeserialize(kSdpNoRtpmapString, &jdesc));
+ std::unique_ptr<SessionDescriptionInterface> jdesc =
+ SdpDeserialize(kSdpNoRtpmapString);
+ ASSERT_THAT(jdesc, NotNull());
AudioContentDescription* audio =
- GetFirstAudioContentDescription(jdesc.description());
+ GetFirstAudioContentDescription(jdesc->description());
Codec g729 = audio->codecs()[0];
EXPECT_EQ("G729", g729.name);
@@ -2431,15 +2413,11 @@ TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithoutRtpmapButWithFmtp) {
// Ensure that we can deserialize SDP with a=fingerprint properly.
TEST_F(WebRtcSdpTest, DeserializeJsepSessionDescriptionWithFingerprint) {
- JsepSessionDescription new_jdesc(kDummyType);
- ASSERT_TRUE(new_jdesc.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
-
std::string sdp_with_fingerprint = kSdpString;
InjectAfter(kAttributeIcePwdVoice, kFingerprint, &sdp_with_fingerprint);
InjectAfter(kAttributeIcePwdVideo, kFingerprint, &sdp_with_fingerprint);
- EXPECT_TRUE(CompareSessionDescription(SdpDeserialize(sdp_with_fingerprint),
- new_jdesc));
+ EXPECT_TRUE(MatchesCurrentDescriptionNoCandidates(
+ SdpDeserialize(sdp_with_fingerprint)));
}
TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithBundle) {
@@ -2447,15 +2425,14 @@ TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithBundle) {
InjectAfter(kSessionTime,
"a=group:BUNDLE audio_content_name video_content_name\r\n",
&sdp_with_bundle);
- JsepSessionDescription jdesc_with_bundle(kDummyType);
- EXPECT_TRUE(SdpDeserialize(sdp_with_bundle, &jdesc_with_bundle));
+ std::unique_ptr<SessionDescriptionInterface> jdesc_with_bundle =
+ SdpDeserialize(sdp_with_bundle);
+ ASSERT_THAT(jdesc_with_bundle, NotNull());
ContentGroup group(GROUP_TYPE_BUNDLE);
group.AddContentName(kAudioContentName);
group.AddContentName(kVideoContentName);
desc_.AddGroup(group);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
- EXPECT_TRUE(CompareSessionDescription(jdesc_, jdesc_with_bundle));
+ EXPECT_TRUE(MatchesCurrentDescription(jdesc_with_bundle));
}
TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithBandwidth) {
@@ -2464,15 +2441,14 @@ TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithBandwidth) {
&sdp_with_bandwidth);
InjectAfter("a=mid:audio_content_name\r\na=sendrecv\r\n", "b=AS:50\r\n",
&sdp_with_bandwidth);
- JsepSessionDescription jdesc_with_bandwidth(kDummyType);
- EXPECT_TRUE(SdpDeserialize(sdp_with_bandwidth, &jdesc_with_bandwidth));
+ std::unique_ptr<SessionDescriptionInterface> jdesc_with_bandwidth =
+ SdpDeserialize(sdp_with_bandwidth);
+ ASSERT_THAT(jdesc_with_bandwidth, NotNull());
VideoContentDescription* vcd = GetFirstVideoContentDescription(&desc_);
vcd->set_bandwidth(100 * 1000);
AudioContentDescription* acd = GetFirstAudioContentDescription(&desc_);
acd->set_bandwidth(50 * 1000);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
- EXPECT_TRUE(CompareSessionDescription(jdesc_, jdesc_with_bandwidth));
+ EXPECT_TRUE(MatchesCurrentDescription(jdesc_with_bandwidth));
}
TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithTiasBandwidth) {
@@ -2481,15 +2457,14 @@ TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithTiasBandwidth) {
&sdp_with_bandwidth);
InjectAfter("a=mid:audio_content_name\r\na=sendrecv\r\n", "b=TIAS:50000\r\n",
&sdp_with_bandwidth);
- JsepSessionDescription jdesc_with_bandwidth(kDummyType);
- EXPECT_TRUE(SdpDeserialize(sdp_with_bandwidth, &jdesc_with_bandwidth));
+ std::unique_ptr<SessionDescriptionInterface> jdesc_with_bandwidth =
+ SdpDeserialize(sdp_with_bandwidth);
+ ASSERT_THAT(jdesc_with_bandwidth, NotNull());
VideoContentDescription* vcd = GetFirstVideoContentDescription(&desc_);
vcd->set_bandwidth(100 * 1000);
AudioContentDescription* acd = GetFirstAudioContentDescription(&desc_);
acd->set_bandwidth(50 * 1000);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
- EXPECT_TRUE(CompareSessionDescription(jdesc_, jdesc_with_bandwidth));
+ EXPECT_TRUE(MatchesCurrentDescription(jdesc_with_bandwidth));
}
TEST_F(WebRtcSdpTest,
@@ -2499,15 +2474,14 @@ TEST_F(WebRtcSdpTest,
"b=unknown:100000\r\n", &sdp_with_bandwidth);
InjectAfter("a=mid:audio_content_name\r\na=sendrecv\r\n",
"b=unknown:50000\r\n", &sdp_with_bandwidth);
- JsepSessionDescription jdesc_with_bandwidth(kDummyType);
- EXPECT_TRUE(SdpDeserialize(sdp_with_bandwidth, &jdesc_with_bandwidth));
+ std::unique_ptr<SessionDescriptionInterface> jdesc_with_bandwidth =
+ SdpDeserialize(sdp_with_bandwidth);
+ ASSERT_THAT(jdesc_with_bandwidth, NotNull());
VideoContentDescription* vcd = GetFirstVideoContentDescription(&desc_);
vcd->set_bandwidth(-1);
AudioContentDescription* acd = GetFirstAudioContentDescription(&desc_);
acd->set_bandwidth(-1);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
- EXPECT_TRUE(CompareSessionDescription(jdesc_, jdesc_with_bandwidth));
+ EXPECT_TRUE(MatchesCurrentDescription(jdesc_with_bandwidth));
}
TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithIceOptions) {
@@ -2518,8 +2492,9 @@ TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithIceOptions) {
&sdp_with_ice_options);
InjectAfter(kAttributeIcePwdVideo, "a=ice-options:iceoption2\r\n",
&sdp_with_ice_options);
- JsepSessionDescription jdesc_with_ice_options(kDummyType);
- EXPECT_TRUE(SdpDeserialize(sdp_with_ice_options, &jdesc_with_ice_options));
+ std::unique_ptr<SessionDescriptionInterface> jdesc_with_ice_options =
+ SdpDeserialize(sdp_with_ice_options);
+ ASSERT_THAT(jdesc_with_ice_options, NotNull());
std::vector<std::string> transport_options;
transport_options.push_back(kIceOption3);
transport_options.push_back(kIceOption1);
@@ -2528,9 +2503,7 @@ TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithIceOptions) {
transport_options.push_back(kIceOption3);
transport_options.push_back(kIceOption2);
AddIceOptions(kVideoContentName, transport_options);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
- EXPECT_TRUE(CompareSessionDescription(jdesc_, jdesc_with_ice_options));
+ EXPECT_TRUE(MatchesCurrentDescription(jdesc_with_ice_options));
}
TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithUfragPwd) {
@@ -2548,9 +2521,9 @@ TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithUfragPwd) {
"a=ice-pwd:media+level+icepwd\r\na=ice-ufrag:media+level+iceufrag\r\n",
&sdp_with_ufrag_pwd);
// Update the candidate ufrag and pwd to the expected ones.
- EXPECT_TRUE(UpdateCandidateUfragPwd(&jdesc_, 0, "media+level+iceufrag",
+ EXPECT_TRUE(UpdateCandidateUfragPwd(jdesc_.get(), 0, "media+level+iceufrag",
"media+level+icepwd"));
- EXPECT_TRUE(UpdateCandidateUfragPwd(&jdesc_, 1, "session+level+iceufrag",
+ EXPECT_TRUE(UpdateCandidateUfragPwd(jdesc_.get(), 1, "session+level+iceufrag",
"session+level+icepwd"));
EXPECT_TRUE(
CompareSessionDescription(jdesc_, SdpDeserialize(sdp_with_ufrag_pwd)));
@@ -2581,7 +2554,7 @@ TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithRejectedAudioVideo) {
}
TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithExtmapAllowMixed) {
- jdesc_.description()->set_extmap_allow_mixed(true);
+ jdesc_->description()->set_extmap_allow_mixed(true);
std::string sdp_with_extmap_allow_mixed = kSdpFullString;
// Deserialize & Verify
EXPECT_TRUE(CompareSessionDescription(
@@ -2589,7 +2562,7 @@ TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithExtmapAllowMixed) {
}
TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithoutExtmapAllowMixed) {
- jdesc_.description()->set_extmap_allow_mixed(false);
+ jdesc_->description()->set_extmap_allow_mixed(false);
std::string sdp_without_extmap_allow_mixed = kSdpFullString;
Replace(kExtmapAllowMixed, "", &sdp_without_extmap_allow_mixed);
// Deserialize & Verify
@@ -2599,10 +2572,10 @@ TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithoutExtmapAllowMixed) {
TEST_F(WebRtcSdpTest, DeserializeMediaContentDescriptionWithExtmapAllowMixed) {
MediaContentDescription* video_desc =
- jdesc_.description()->GetContentDescriptionByName(kVideoContentName);
+ jdesc_->description()->GetContentDescriptionByName(kVideoContentName);
ASSERT_THAT(video_desc, NotNull());
MediaContentDescription* audio_desc =
- jdesc_.description()->GetContentDescriptionByName(kAudioContentName);
+ jdesc_->description()->GetContentDescriptionByName(kAudioContentName);
ASSERT_THAT(audio_desc, NotNull());
video_desc->set_extmap_allow_mixed_enum(MediaContentDescription::kMedia);
audio_desc->set_extmap_allow_mixed_enum(MediaContentDescription::kMedia);
@@ -2731,57 +2704,48 @@ TEST_F(WebRtcSdpTest, DeserializeInvalidCandidiate) {
TEST_F(WebRtcSdpTest, DeserializeSdpWithSctpDataChannels) {
bool use_sctpmap = true;
AddSctpDataChannel(use_sctpmap);
- JsepSessionDescription jdesc(kDummyType);
- ASSERT_TRUE(jdesc.Initialize(desc_.Clone(), kSessionId, kSessionVersion));
std::string sdp_with_data = kSdpString;
sdp_with_data.append(kSdpSctpDataChannelString);
- JsepSessionDescription jdesc_output(kDummyType);
// Verify with UDP/DTLS/SCTP (already in kSdpSctpDataChannelString).
- EXPECT_TRUE(SdpDeserialize(sdp_with_data, &jdesc_output));
- EXPECT_TRUE(CompareSessionDescription(jdesc, jdesc_output));
+ std::unique_ptr<SessionDescriptionInterface> jdesc =
+ NewSessionDescriptionNoCandidates();
+ EXPECT_TRUE(CompareSessionDescription(jdesc, SdpDeserialize(sdp_with_data)));
// Verify with DTLS/SCTP.
sdp_with_data.replace(sdp_with_data.find(kUdpDtlsSctp), strlen(kUdpDtlsSctp),
kDtlsSctp);
- EXPECT_TRUE(SdpDeserialize(sdp_with_data, &jdesc_output));
- EXPECT_TRUE(CompareSessionDescription(jdesc, jdesc_output));
+ EXPECT_TRUE(CompareSessionDescription(jdesc, SdpDeserialize(sdp_with_data)));
// Verify with TCP/DTLS/SCTP.
sdp_with_data.replace(sdp_with_data.find(kDtlsSctp), strlen(kDtlsSctp),
kTcpDtlsSctp);
- EXPECT_TRUE(SdpDeserialize(sdp_with_data, &jdesc_output));
- EXPECT_TRUE(CompareSessionDescription(jdesc, jdesc_output));
+ EXPECT_TRUE(CompareSessionDescription(jdesc, SdpDeserialize(sdp_with_data)));
}
TEST_F(WebRtcSdpTest, DeserializeSdpWithSctpDataChannelsWithSctpPort) {
bool use_sctpmap = false;
AddSctpDataChannel(use_sctpmap);
- JsepSessionDescription jdesc(kDummyType);
- ASSERT_TRUE(jdesc.Initialize(desc_.Clone(), kSessionId, kSessionVersion));
-
std::string sdp_with_data = kSdpString;
sdp_with_data.append(kSdpSctpDataChannelStringWithSctpPort);
- EXPECT_TRUE(CompareSessionDescription(jdesc, SdpDeserialize(sdp_with_data)));
+ EXPECT_TRUE(
+ MatchesCurrentDescriptionNoCandidates(SdpDeserialize(sdp_with_data)));
}
TEST_F(WebRtcSdpTest, DeserializeSdpWithSctpDataChannelsWithSctpColonPort) {
bool use_sctpmap = false;
AddSctpDataChannel(use_sctpmap);
- JsepSessionDescription jdesc(kDummyType);
- ASSERT_TRUE(jdesc.Initialize(desc_.Clone(), kSessionId, kSessionVersion));
std::string sdp_with_data = kSdpString;
sdp_with_data.append(kSdpSctpDataChannelStringWithSctpColonPort);
- EXPECT_TRUE(CompareSessionDescription(jdesc, SdpDeserialize(sdp_with_data)));
+ EXPECT_TRUE(
+ MatchesCurrentDescriptionNoCandidates(SdpDeserialize(sdp_with_data)));
}
TEST_F(WebRtcSdpTest, DeserializeSdpWithSctpDataChannelsButWrongMediaType) {
bool use_sctpmap = true;
AddSctpDataChannel(use_sctpmap);
- JsepSessionDescription jdesc(kDummyType);
- ASSERT_TRUE(jdesc.Initialize(desc_.Clone(), kSessionId, kSessionVersion));
std::string sdp = kSdpSessionString;
sdp += kSdpSctpDataChannelString;
@@ -2789,23 +2753,25 @@ TEST_F(WebRtcSdpTest, DeserializeSdpWithSctpDataChannelsButWrongMediaType) {
const char needle[] = "m=application ";
sdp.replace(sdp.find(needle), strlen(needle), "m=application:bogus ");
- JsepSessionDescription jdesc_output(kDummyType);
- EXPECT_TRUE(SdpDeserialize(sdp, &jdesc_output));
+ std::unique_ptr<SessionDescriptionInterface> jdesc_output =
+ SdpDeserialize(sdp);
+ ASSERT_THAT(jdesc_output, NotNull());
- EXPECT_EQ(1u, jdesc_output.description()->contents().size());
- EXPECT_TRUE(jdesc_output.description()->contents()[0].rejected);
+ EXPECT_EQ(1u, jdesc_output->description()->contents().size());
+ EXPECT_TRUE(jdesc_output->description()->contents()[0].rejected);
}
// Helper function to set the max-message-size parameter in the
// SCTP data codec.
-void MutateJsepSctpMaxMessageSize(const SessionDescription& desc,
- int new_value,
- JsepSessionDescription* jdesc) {
+std::unique_ptr<SessionDescriptionInterface>
+CreateSessionDescriptionWithSctpMaxMessageSize(const SessionDescription& desc,
+ int new_value) {
std::unique_ptr<SessionDescription> mutant = desc.Clone();
SctpDataContentDescription* dcdesc =
mutant->GetContentDescriptionByName(kDataContentName)->as_sctp();
dcdesc->set_max_message_size(new_value);
- jdesc->Initialize(std::move(mutant), kSessionId, kSessionVersion);
+ return CreateSessionDescription(kDummyType, kSessionId, kSessionVersion,
+ std::move(mutant));
}
TEST_F(WebRtcSdpTest, DeserializeSdpWithSctpDataChannelsWithMaxMessageSize) {
@@ -2814,16 +2780,16 @@ TEST_F(WebRtcSdpTest, DeserializeSdpWithSctpDataChannelsWithMaxMessageSize) {
std::string sdp_with_data = kSdpString;
sdp_with_data.append(kSdpSctpDataChannelStringWithSctpColonPort);
sdp_with_data.append("a=max-message-size:12345\r\n");
- JsepSessionDescription jdesc(kDummyType);
- MutateJsepSctpMaxMessageSize(desc_, 12345, &jdesc);
- EXPECT_TRUE(CompareSessionDescription(jdesc, SdpDeserialize(sdp_with_data)));
+ EXPECT_TRUE(CompareSessionDescription(
+ CreateSessionDescriptionWithSctpMaxMessageSize(desc_, 12345),
+ SdpDeserialize(sdp_with_data)));
}
TEST_F(WebRtcSdpTest, SerializeSdpWithSctpDataChannelWithMaxMessageSize) {
bool use_sctpmap = false;
AddSctpDataChannel(use_sctpmap);
- JsepSessionDescription jdesc(kDummyType);
- MutateJsepSctpMaxMessageSize(desc_, 12345, &jdesc);
+ std::unique_ptr<SessionDescriptionInterface> jdesc =
+ CreateSessionDescriptionWithSctpMaxMessageSize(desc_, 12345);
std::string message = SdpSerialize(jdesc);
EXPECT_NE(std::string::npos,
message.find("\r\na=max-message-size:12345\r\n"));
@@ -2836,8 +2802,8 @@ TEST_F(WebRtcSdpTest,
// The default max message size is 64K.
bool use_sctpmap = false;
AddSctpDataChannel(use_sctpmap);
- JsepSessionDescription jdesc(kDummyType);
- MutateJsepSctpMaxMessageSize(desc_, 65536, &jdesc);
+ std::unique_ptr<SessionDescriptionInterface> jdesc =
+ CreateSessionDescriptionWithSctpMaxMessageSize(desc_, 65536);
std::string message = SdpSerialize(jdesc);
EXPECT_EQ(std::string::npos, message.find("\r\na=max-message-size:"));
EXPECT_TRUE(CompareSessionDescription(jdesc, SdpDeserialize(message)));
@@ -2848,9 +2814,6 @@ TEST_F(WebRtcSdpTest,
TEST_F(WebRtcSdpTest, DeserializeSdpWithMultiSctpPort) {
bool use_sctpmap = true;
AddSctpDataChannel(use_sctpmap);
- JsepSessionDescription jdesc(kDummyType);
- ASSERT_TRUE(jdesc.Initialize(desc_.Clone(), kSessionId, kSessionVersion));
-
std::string sdp_with_data = kSdpString;
// Append m= attributes
sdp_with_data.append(kSdpSctpDataChannelString);
@@ -2885,8 +2848,6 @@ TEST_F(WebRtcSdpTest, DeserializeSdpWithSctpDataChannelAndUnusualPort) {
AddSctpDataChannel(use_sctpmap);
// First setup the expected session description.
- JsepSessionDescription jdesc(kDummyType);
- MutateJsepSctpPort(&jdesc, desc_, kUnusualSctpPort);
// Then get the deserialized session description.
std::string sdp_with_data = kSdpString;
@@ -2894,7 +2855,9 @@ TEST_F(WebRtcSdpTest, DeserializeSdpWithSctpDataChannelAndUnusualPort) {
absl::StrReplaceAll(
{{absl::StrCat(kDefaultSctpPort), absl::StrCat(kUnusualSctpPort)}},
&sdp_with_data);
- EXPECT_TRUE(CompareSessionDescription(jdesc, SdpDeserialize(sdp_with_data)));
+ EXPECT_TRUE(CompareSessionDescription(
+ MutateSctpPort(jdesc_.get(), desc_, kUnusualSctpPort),
+ SdpDeserialize(sdp_with_data)));
}
TEST_F(WebRtcSdpTest,
@@ -2902,9 +2865,6 @@ TEST_F(WebRtcSdpTest,
bool use_sctpmap = false;
AddSctpDataChannel(use_sctpmap);
- JsepSessionDescription jdesc(kDummyType);
- MutateJsepSctpPort(&jdesc, desc_, kUnusualSctpPort);
-
// We need to test the deserialized description from
// kSdpSctpDataChannelStringWithSctpPort for
// draft-ietf-mmusic-sctp-sdp-07
@@ -2914,16 +2874,16 @@ TEST_F(WebRtcSdpTest,
absl::StrReplaceAll(
{{absl::StrCat(kDefaultSctpPort), absl::StrCat(kUnusualSctpPort)}},
&sdp_with_data);
- EXPECT_TRUE(CompareSessionDescription(jdesc, SdpDeserialize(sdp_with_data)));
+ EXPECT_TRUE(CompareSessionDescription(
+ MutateSctpPort(jdesc_.get(), desc_, kUnusualSctpPort),
+ SdpDeserialize(sdp_with_data)));
}
TEST_F(WebRtcSdpTest, DeserializeSdpWithSctpDataChannelsAndBandwidth) {
bool use_sctpmap = true;
AddSctpDataChannel(use_sctpmap);
- JsepSessionDescription jdesc(kDummyType);
SctpDataContentDescription* dcd = GetFirstSctpDataContentDescription(&desc_);
dcd->set_bandwidth(100 * 1000);
- ASSERT_TRUE(jdesc.Initialize(desc_.Clone(), kSessionId, kSessionVersion));
std::string sdp_with_bandwidth = kSdpString;
sdp_with_bandwidth.append(kSdpSctpDataChannelString);
@@ -2931,8 +2891,8 @@ TEST_F(WebRtcSdpTest, DeserializeSdpWithSctpDataChannelsAndBandwidth) {
&sdp_with_bandwidth);
// SCTP has congestion control, so we shouldn't limit the bandwidth
// as we do for RTP.
- EXPECT_TRUE(
- CompareSessionDescription(jdesc, SdpDeserialize(sdp_with_bandwidth)));
+ EXPECT_TRUE(MatchesCurrentDescriptionNoCandidates(
+ SdpDeserialize(sdp_with_bandwidth)));
}
class WebRtcSdpExtmapTest : public WebRtcSdpTest,
@@ -2994,37 +2954,38 @@ TEST_F(WebRtcSdpTest, DeserializeCandidateWithUfragPwd) {
}
TEST_F(WebRtcSdpTest, DeserializeSdpWithConferenceFlag) {
- JsepSessionDescription jdesc(kDummyType);
-
// Deserialize
- EXPECT_TRUE(SdpDeserialize(kSdpConferenceString, &jdesc));
+ std::unique_ptr<SessionDescriptionInterface> jdesc =
+ SdpDeserialize(kSdpConferenceString);
+ ASSERT_THAT(jdesc, NotNull());
// Verify
AudioContentDescription* audio =
- GetFirstAudioContentDescription(jdesc.description());
+ GetFirstAudioContentDescription(jdesc->description());
EXPECT_TRUE(audio->conference_mode());
VideoContentDescription* video =
- GetFirstVideoContentDescription(jdesc.description());
+ GetFirstVideoContentDescription(jdesc->description());
EXPECT_TRUE(video->conference_mode());
}
TEST_F(WebRtcSdpTest, SerializeSdpWithConferenceFlag) {
- JsepSessionDescription jdesc(kDummyType);
-
// We tested deserialization already above, so just test that if we serialize
// and deserialize the flag doesn't disappear.
- EXPECT_TRUE(SdpDeserialize(kSdpConferenceString, &jdesc));
+ std::unique_ptr<SessionDescriptionInterface> jdesc =
+ SdpDeserialize(kSdpConferenceString);
+ ASSERT_THAT(jdesc, NotNull());
std::string reserialized = SdpSerialize(jdesc);
- EXPECT_TRUE(SdpDeserialize(reserialized, &jdesc));
+ jdesc = SdpDeserialize(reserialized);
+ ASSERT_THAT(jdesc, NotNull());
// Verify.
AudioContentDescription* audio =
- GetFirstAudioContentDescription(jdesc.description());
+ GetFirstAudioContentDescription(jdesc->description());
EXPECT_TRUE(audio->conference_mode());
VideoContentDescription* video =
- GetFirstVideoContentDescription(jdesc.description());
+ GetFirstVideoContentDescription(jdesc->description());
EXPECT_TRUE(video->conference_mode());
}
@@ -3039,7 +3000,7 @@ TEST_F(WebRtcSdpTest, SerializeAndDeserializeRemoteNetEstimate) {
}
{
// When remote estimate is enabled, the setting is propagated via SDP.
- GetFirstVideoContentDescription(jdesc_.description())
+ GetFirstVideoContentDescription(jdesc_->description())
->set_remote_estimate(true);
std::unique_ptr<SessionDescriptionInterface> dst =
SdpDeserialize(SdpSerialize(jdesc_));
@@ -3155,11 +3116,12 @@ TEST_F(WebRtcSdpTest, DeserializeSdpWithReorderedPltypes) {
"a=rtpmap:104 ISAC/32000\r\n";
// Deserialize
- JsepSessionDescription jdesc_output(kDummyType);
- EXPECT_TRUE(SdpDeserialize(kSdpWithReorderedPlTypesString, &jdesc_output));
+ std::unique_ptr<SessionDescriptionInterface> jdesc_output =
+ SdpDeserialize(kSdpWithReorderedPlTypesString);
+ ASSERT_THAT(jdesc_output, NotNull());
const AudioContentDescription* acd =
- GetFirstAudioContentDescription(jdesc_output.description());
+ GetFirstAudioContentDescription(jdesc_output->description());
ASSERT_THAT(acd, NotNull());
ASSERT_FALSE(acd->codecs().empty());
EXPECT_EQ("ISAC", acd->codecs()[0].name);
@@ -3340,9 +3302,7 @@ TEST_F(WebRtcSdpTest, SerializeAudioFmtpWithUnknownParameter) {
codecs[0].params["unknown-future-parameter"] = "SomeFutureValue";
acd->set_codecs(codecs);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
- std::string message = SdpSerialize(jdesc_);
+ std::string message = SerializeCurrentDescription();
std::string sdp_with_fmtp = kSdpFullString;
InjectAfter("a=rtpmap:111 opus/48000/2\r\n",
"a=fmtp:111 unknown-future-parameter=SomeFutureValue\r\n",
@@ -3357,9 +3317,7 @@ TEST_F(WebRtcSdpTest, SerializeAudioFmtpWithKnownFmtpParameter) {
codecs[0].params["stereo"] = "1";
acd->set_codecs(codecs);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
- std::string message = SdpSerialize(jdesc_);
+ std::string message = SerializeCurrentDescription();
std::string sdp_with_fmtp = kSdpFullString;
InjectAfter("a=rtpmap:111 opus/48000/2\r\n", "a=fmtp:111 stereo=1\r\n",
&sdp_with_fmtp);
@@ -3374,9 +3332,7 @@ TEST_F(WebRtcSdpTest, SerializeAudioFmtpWithPTimeAndMaxPTime) {
codecs[0].params["maxptime"] = "120";
acd->set_codecs(codecs);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
- std::string message = SdpSerialize(jdesc_);
+ std::string message = SerializeCurrentDescription();
std::string sdp_with_fmtp = kSdpFullString;
InjectAfter("a=rtpmap:104 ISAC/32000\r\n",
"a=maxptime:120\r\n" // No comma here. String merging!
@@ -3394,9 +3350,7 @@ TEST_F(WebRtcSdpTest, SerializeAudioFmtpWithTelephoneEvent) {
codecs.push_back(dtmf);
acd->set_codecs(codecs);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
- std::string message = SdpSerialize(jdesc_);
+ std::string message = SerializeCurrentDescription();
std::string sdp_with_fmtp = kSdpFullString;
InjectAfter("m=audio 2345 RTP/SAVPF 111 103 104", " 105", &sdp_with_fmtp);
InjectAfter(
@@ -3414,9 +3368,7 @@ TEST_F(WebRtcSdpTest, SerializeVideoFmtp) {
codecs[0].params["x-google-min-bitrate"] = "10";
vcd->set_codecs(codecs);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
- std::string message = SdpSerialize(jdesc_);
+ std::string message = SerializeCurrentDescription();
std::string sdp_with_fmtp = kSdpFullString;
InjectAfter("a=rtpmap:120 VP8/90000\r\n",
"a=fmtp:120 x-google-min-bitrate=10\r\n", &sdp_with_fmtp);
@@ -3430,9 +3382,7 @@ TEST_F(WebRtcSdpTest, SerializeVideoPacketizationAttribute) {
codecs[0].packetization = "raw";
vcd->set_codecs(codecs);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
- std::string message = SdpSerialize(jdesc_);
+ std::string message = SerializeCurrentDescription();
std::string sdp_with_packetization = kSdpFullString;
InjectAfter("a=rtpmap:120 VP8/90000\r\n", "a=packetization:120 raw\r\n",
&sdp_with_packetization);
@@ -3442,9 +3392,10 @@ TEST_F(WebRtcSdpTest, SerializeVideoPacketizationAttribute) {
TEST_F(WebRtcSdpTest, DeserializeAndSerializeSdpWithIceLite) {
// Deserialize the baseline description, making sure it's ICE full.
std::string sdp_with_icelite = kSdpFullString;
- JsepSessionDescription jdesc_with_icelite(kDummyType);
- EXPECT_TRUE(SdpDeserialize(sdp_with_icelite, &jdesc_with_icelite));
- SessionDescription* desc = jdesc_with_icelite.description();
+ std::unique_ptr<SessionDescriptionInterface> jdesc_with_icelite =
+ SdpDeserialize(sdp_with_icelite);
+ ASSERT_THAT(jdesc_with_icelite, NotNull());
+ SessionDescription* desc = jdesc_with_icelite->description();
const TransportInfo* tinfo1 =
desc->GetTransportInfoByName("audio_content_name");
EXPECT_EQ(ICEMODE_FULL, tinfo1->description.ice_mode);
@@ -3454,8 +3405,9 @@ TEST_F(WebRtcSdpTest, DeserializeAndSerializeSdpWithIceLite) {
// Add "a=ice-lite" and deserialize, making sure it's ICE lite.
InjectAfter(kSessionTime, "a=ice-lite\r\n", &sdp_with_icelite);
- EXPECT_TRUE(SdpDeserialize(sdp_with_icelite, &jdesc_with_icelite));
- desc = jdesc_with_icelite.description();
+ jdesc_with_icelite = SdpDeserialize(sdp_with_icelite);
+ ASSERT_THAT(jdesc_with_icelite, NotNull());
+ desc = jdesc_with_icelite->description();
const TransportInfo* atinfo =
desc->GetTransportInfoByName("audio_content_name");
EXPECT_EQ(ICEMODE_LITE, atinfo->description.ice_mode);
@@ -3473,8 +3425,9 @@ TEST_F(WebRtcSdpTest, DeserializeAndSerializeSdpWithIceLite) {
TEST_F(WebRtcSdpTest, RoundTripSdpWithSctpDataChannelsWithCandidates) {
std::string sdp_with_data = kSdpString;
sdp_with_data.append(kSdpSctpDataChannelWithCandidatesString);
- JsepSessionDescription jdesc_output(kDummyType);
- EXPECT_TRUE(SdpDeserialize(sdp_with_data, &jdesc_output));
+ std::unique_ptr<SessionDescriptionInterface> jdesc_output =
+ SdpDeserialize(sdp_with_data);
+ ASSERT_THAT(jdesc_output, NotNull());
EXPECT_EQ(sdp_with_data, SdpSerialize(jdesc_output));
}
@@ -3497,9 +3450,7 @@ TEST_F(WebRtcSdpTest, SerializeDtlsSetupAttribute) {
desc_.AddTransportInfo(audio_transport_info);
desc_.AddTransportInfo(video_transport_info);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
- std::string message = SdpSerialize(jdesc_);
+ std::string message = SerializeCurrentDescription();
std::string sdp_with_dtlssetup = kSdpFullString;
// Now adding `setup` attribute.
@@ -3510,9 +3461,10 @@ TEST_F(WebRtcSdpTest, SerializeDtlsSetupAttribute) {
TEST_F(WebRtcSdpTest, DeserializeDtlsSetupAttributeActpass) {
std::string sdp_with_dtlssetup = kSdpFullString;
InjectAfter(kSessionTime, "a=setup:actpass\r\n", &sdp_with_dtlssetup);
- JsepSessionDescription jdesc_with_dtlssetup(kDummyType);
- EXPECT_TRUE(SdpDeserialize(sdp_with_dtlssetup, &jdesc_with_dtlssetup));
- SessionDescription* desc = jdesc_with_dtlssetup.description();
+ std::unique_ptr<SessionDescriptionInterface> jdesc_with_dtlssetup =
+ SdpDeserialize(sdp_with_dtlssetup);
+ ASSERT_THAT(jdesc_with_dtlssetup, NotNull());
+ SessionDescription* desc = jdesc_with_dtlssetup->description();
const TransportInfo* atinfo =
desc->GetTransportInfoByName("audio_content_name");
EXPECT_EQ(CONNECTIONROLE_ACTPASS, atinfo->description.connection_role);
@@ -3524,9 +3476,10 @@ TEST_F(WebRtcSdpTest, DeserializeDtlsSetupAttributeActpass) {
TEST_F(WebRtcSdpTest, DeserializeDtlsSetupAttributeActive) {
std::string sdp_with_dtlssetup = kSdpFullString;
InjectAfter(kSessionTime, "a=setup:active\r\n", &sdp_with_dtlssetup);
- JsepSessionDescription jdesc_with_dtlssetup(kDummyType);
- EXPECT_TRUE(SdpDeserialize(sdp_with_dtlssetup, &jdesc_with_dtlssetup));
- SessionDescription* desc = jdesc_with_dtlssetup.description();
+ std::unique_ptr<SessionDescriptionInterface> jdesc_with_dtlssetup =
+ SdpDeserialize(sdp_with_dtlssetup);
+ ASSERT_THAT(jdesc_with_dtlssetup, NotNull());
+ SessionDescription* desc = jdesc_with_dtlssetup->description();
const TransportInfo* atinfo =
desc->GetTransportInfoByName("audio_content_name");
EXPECT_EQ(CONNECTIONROLE_ACTIVE, atinfo->description.connection_role);
@@ -3537,9 +3490,10 @@ TEST_F(WebRtcSdpTest, DeserializeDtlsSetupAttributeActive) {
TEST_F(WebRtcSdpTest, DeserializeDtlsSetupAttributePassive) {
std::string sdp_with_dtlssetup = kSdpFullString;
InjectAfter(kSessionTime, "a=setup:passive\r\n", &sdp_with_dtlssetup);
- JsepSessionDescription jdesc_with_dtlssetup(kDummyType);
- EXPECT_TRUE(SdpDeserialize(sdp_with_dtlssetup, &jdesc_with_dtlssetup));
- SessionDescription* desc = jdesc_with_dtlssetup.description();
+ std::unique_ptr<SessionDescriptionInterface> jdesc_with_dtlssetup =
+ SdpDeserialize(sdp_with_dtlssetup);
+ ASSERT_THAT(jdesc_with_dtlssetup, NotNull());
+ SessionDescription* desc = jdesc_with_dtlssetup->description();
const TransportInfo* atinfo =
desc->GetTransportInfoByName("audio_content_name");
EXPECT_EQ(CONNECTIONROLE_PASSIVE, atinfo->description.connection_role);
@@ -3570,9 +3524,10 @@ TEST_F(WebRtcSdpTest, MediaContentOrderMaintainedRoundTrip) {
for (size_t j = 0; j < 3; ++j)
sdp_string += media_content_sdps[media_content_in_sdp[j]];
- JsepSessionDescription jdesc(kDummyType);
- EXPECT_TRUE(SdpDeserialize(sdp_string, &jdesc));
- SessionDescription* desc = jdesc.description();
+ std::unique_ptr<SessionDescriptionInterface> jdesc =
+ SdpDeserialize(sdp_string);
+ ASSERT_THAT(jdesc, NotNull());
+ SessionDescription* desc = jdesc->description();
EXPECT_EQ(3u, desc->contents().size());
for (size_t j = 0; j < 3; ++j) {
@@ -3587,9 +3542,8 @@ TEST_F(WebRtcSdpTest, MediaContentOrderMaintainedRoundTrip) {
}
TEST_F(WebRtcSdpTest, DeserializeBundleOnlyAttribute) {
- MakeBundleOnlyDescription();
EXPECT_TRUE(CompareSessionDescription(
- jdesc_, SdpDeserialize(kBundleOnlySdpFullString)));
+ MakeBundleOnlyDescription(), SdpDeserialize(kBundleOnlySdpFullString)));
}
// The semantics of "a=bundle-only" are only defined when it's used in
@@ -3597,38 +3551,31 @@ TEST_F(WebRtcSdpTest, DeserializeBundleOnlyAttribute) {
// nonzero port.
TEST_F(WebRtcSdpTest, IgnoreBundleOnlyWithNonzeroPort) {
// Make the base bundle-only description but unset the bundle-only flag.
- MakeBundleOnlyDescription();
- jdesc_.description()->contents()[1].bundle_only = false;
+ std::unique_ptr<SessionDescriptionInterface> sd = MakeBundleOnlyDescription();
+ sd->description()->contents()[1].bundle_only = false;
std::string modified_sdp = kBundleOnlySdpFullString;
Replace("m=video 0", "m=video 9", &modified_sdp);
- EXPECT_TRUE(CompareSessionDescription(jdesc_, SdpDeserialize(modified_sdp)));
+ EXPECT_TRUE(CompareSessionDescription(sd, SdpDeserialize(modified_sdp)));
}
TEST_F(WebRtcSdpTest, SerializeBundleOnlyAttribute) {
- MakeBundleOnlyDescription();
- TestSerialize(jdesc_);
+ TestSerialize(MakeBundleOnlyDescription());
}
TEST_F(WebRtcSdpTest, DeserializePlanBSessionDescription) {
- MakePlanBDescription();
- EXPECT_TRUE(
- CompareSessionDescription(jdesc_, SdpDeserialize(kPlanBSdpFullString)));
+ EXPECT_TRUE(CompareSessionDescription(MakePlanBDescription(),
+ SdpDeserialize(kPlanBSdpFullString)));
}
TEST_F(WebRtcSdpTest, SerializePlanBSessionDescription) {
- MakePlanBDescription();
- TestSerialize(jdesc_);
+ TestSerialize(MakePlanBDescription());
}
TEST_F(WebRtcSdpTest, DeserializeUnifiedPlanSessionDescription) {
MakeUnifiedPlanDescription();
-
- JsepSessionDescription deserialized_description(kDummyType);
- EXPECT_TRUE(
- SdpDeserialize(kUnifiedPlanSdpFullString, &deserialized_description));
-
- EXPECT_TRUE(CompareSessionDescription(jdesc_, deserialized_description));
+ EXPECT_TRUE(CompareSessionDescription(
+ jdesc_, SdpDeserialize(kUnifiedPlanSdpFullString)));
}
TEST_F(WebRtcSdpTest, SerializeUnifiedPlanSessionDescription) {
@@ -3648,14 +3595,14 @@ TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionSpecialMsid) {
kMsidSignalingSsrcAttribute |
kMsidSignalingSemantic);
- JsepSessionDescription deserialized_description(kDummyType);
- EXPECT_TRUE(SdpDeserialize(kUnifiedPlanSdpFullStringWithSpecialMsid,
- &deserialized_description));
+ std::unique_ptr<SessionDescriptionInterface> deserialized_description =
+ SdpDeserialize(kUnifiedPlanSdpFullStringWithSpecialMsid);
+ ASSERT_THAT(deserialized_description, NotNull());
EXPECT_TRUE(CompareSessionDescription(jdesc_, deserialized_description));
EXPECT_EQ(kMsidSignalingMediaSection | kMsidSignalingSsrcAttribute |
kMsidSignalingSemantic,
- deserialized_description.description()->msid_signaling());
+ deserialized_description->description()->msid_signaling());
}
// Tests the serialization of a Unified Plan SDP that is compatible for both
@@ -3687,11 +3634,8 @@ TEST_F(WebRtcSdpTest, UnifiedPlanDeserializeSessionDescriptionSpecialMsid) {
std::string unified_plan_sdp_string =
kUnifiedPlanSdpFullStringWithSpecialMsid;
RemoveSsrcMsidLinesFromSdpString(&unified_plan_sdp_string);
- JsepSessionDescription deserialized_description(kDummyType);
- EXPECT_TRUE(
- SdpDeserialize(unified_plan_sdp_string, &deserialized_description));
-
- EXPECT_TRUE(CompareSessionDescription(jdesc_, deserialized_description));
+ EXPECT_TRUE(CompareSessionDescription(
+ jdesc_, SdpDeserialize(unified_plan_sdp_string)));
}
// Tests that a Unified Plan style SDP (does not contain "a=ssrc msid" lines
@@ -3715,11 +3659,8 @@ TEST_F(WebRtcSdpTest, DeserializeUnifiedPlanSessionDescriptionNoSsrcSignaling) {
RemoveSsrcSignalingFromStreamParams();
std::string unified_plan_sdp_string = kUnifiedPlanSdpFullString;
RemoveSsrcLinesFromSdpString(&unified_plan_sdp_string);
-
- JsepSessionDescription deserialized_description(kDummyType);
- EXPECT_TRUE(
- SdpDeserialize(unified_plan_sdp_string, &deserialized_description));
- EXPECT_TRUE(CompareSessionDescription(jdesc_, deserialized_description));
+ EXPECT_TRUE(CompareSessionDescription(
+ jdesc_, SdpDeserialize(unified_plan_sdp_string)));
}
TEST_F(WebRtcSdpTest, SerializeUnifiedPlanSessionDescriptionNoSsrcSignaling) {
@@ -3730,35 +3671,38 @@ TEST_F(WebRtcSdpTest, SerializeUnifiedPlanSessionDescriptionNoSsrcSignaling) {
}
TEST_F(WebRtcSdpTest, EmptyDescriptionHasNoMsidSignaling) {
- JsepSessionDescription jsep_desc(kDummyType);
- ASSERT_TRUE(SdpDeserialize(kSdpSessionString, &jsep_desc));
- EXPECT_EQ(kMsidSignalingSemantic, jsep_desc.description()->msid_signaling());
+ std::unique_ptr<SessionDescriptionInterface> jsep_desc =
+ SdpDeserialize(kSdpSessionString);
+ ASSERT_THAT(jsep_desc, NotNull());
+ EXPECT_EQ(kMsidSignalingSemantic, jsep_desc->description()->msid_signaling());
}
TEST_F(WebRtcSdpTest, DataChannelOnlyHasNoMsidSignaling) {
- JsepSessionDescription jsep_desc(kDummyType);
std::string sdp = kSdpSessionString;
sdp += kSdpSctpDataChannelString;
- ASSERT_TRUE(SdpDeserialize(sdp, &jsep_desc));
- EXPECT_EQ(kMsidSignalingSemantic, jsep_desc.description()->msid_signaling());
+ std::unique_ptr<SessionDescriptionInterface> jsep_desc = SdpDeserialize(sdp);
+ ASSERT_THAT(jsep_desc, NotNull());
+ EXPECT_EQ(kMsidSignalingSemantic, jsep_desc->description()->msid_signaling());
}
TEST_F(WebRtcSdpTest, PlanBHasSsrcAttributeMsidSignaling) {
- JsepSessionDescription jsep_desc(kDummyType);
- ASSERT_TRUE(SdpDeserialize(kPlanBSdpFullString, &jsep_desc));
+ std::unique_ptr<SessionDescriptionInterface> jsep_desc =
+ SdpDeserialize(kPlanBSdpFullString);
+ ASSERT_THAT(jsep_desc, NotNull());
EXPECT_EQ(kMsidSignalingSsrcAttribute | kMsidSignalingSemantic,
- jsep_desc.description()->msid_signaling());
+ jsep_desc->description()->msid_signaling());
}
TEST_F(WebRtcSdpTest, UnifiedPlanHasMediaSectionMsidSignaling) {
- JsepSessionDescription jsep_desc(kDummyType);
- ASSERT_TRUE(SdpDeserialize(kUnifiedPlanSdpFullString, &jsep_desc));
+ std::unique_ptr<SessionDescriptionInterface> jsep_desc =
+ SdpDeserialize(kUnifiedPlanSdpFullString);
+ ASSERT_THAT(jsep_desc, NotNull());
EXPECT_EQ(kMsidSignalingMediaSection | kMsidSignalingSemantic,
- jsep_desc.description()->msid_signaling());
+ jsep_desc->description()->msid_signaling());
}
TEST_F(WebRtcSdpTest, SerializeOnlyMediaSectionMsid) {
- jdesc_.description()->set_msid_signaling(kMsidSignalingMediaSection);
+ jdesc_->description()->set_msid_signaling(kMsidSignalingMediaSection);
std::string sdp = SdpSerialize(jdesc_);
EXPECT_NE(std::string::npos, sdp.find(kMediaSectionMsidLine));
@@ -3766,7 +3710,7 @@ TEST_F(WebRtcSdpTest, SerializeOnlyMediaSectionMsid) {
}
TEST_F(WebRtcSdpTest, SerializeOnlySsrcAttributeMsid) {
- jdesc_.description()->set_msid_signaling(kMsidSignalingSsrcAttribute);
+ jdesc_->description()->set_msid_signaling(kMsidSignalingSsrcAttribute);
std::string sdp = SdpSerialize(jdesc_);
EXPECT_EQ(std::string::npos, sdp.find(kMediaSectionMsidLine));
@@ -3774,8 +3718,8 @@ TEST_F(WebRtcSdpTest, SerializeOnlySsrcAttributeMsid) {
}
TEST_F(WebRtcSdpTest, SerializeBothMediaSectionAndSsrcAttributeMsid) {
- jdesc_.description()->set_msid_signaling(kMsidSignalingMediaSection |
- kMsidSignalingSsrcAttribute);
+ jdesc_->description()->set_msid_signaling(kMsidSignalingMediaSection |
+ kMsidSignalingSsrcAttribute);
std::string sdp = SdpSerialize(jdesc_);
EXPECT_NE(std::string::npos, sdp.find(kMediaSectionMsidLine));
@@ -3783,7 +3727,7 @@ TEST_F(WebRtcSdpTest, SerializeBothMediaSectionAndSsrcAttributeMsid) {
}
TEST_F(WebRtcSdpTest, SerializeWithoutMsidSemantics) {
- jdesc_.description()->set_msid_signaling(kMsidSignalingNotUsed);
+ jdesc_->description()->set_msid_signaling(kMsidSignalingNotUsed);
std::string sdp = SdpSerialize(jdesc_);
EXPECT_EQ(std::string::npos, sdp.find("a=msid-semantic:"));
@@ -3835,10 +3779,11 @@ TEST_F(WebRtcSdpTest, BandwidthLimitOfNegativeOneIgnored) {
"m=video 3457 RTP/SAVPF 120\r\n"
"b=AS:-1\r\n";
- JsepSessionDescription jdesc_output(kDummyType);
- EXPECT_TRUE(SdpDeserialize(kSdpWithBandwidthOfNegativeOne, &jdesc_output));
+ std::unique_ptr<SessionDescriptionInterface> jdesc_output =
+ SdpDeserialize(kSdpWithBandwidthOfNegativeOne);
+ ASSERT_THAT(jdesc_output, NotNull());
const VideoContentDescription* vcd =
- GetFirstVideoContentDescription(jdesc_output.description());
+ GetFirstVideoContentDescription(jdesc_output->description());
ASSERT_THAT(vcd, NotNull());
EXPECT_EQ(kAutoBandwidth, vcd->bandwidth());
}
@@ -3862,10 +3807,10 @@ TEST_F(WebRtcSdpTest, IceCredentialsInCandidateStringIgnored) {
"a=candidate:a0+B/1 1 udp 2130706432 192.168.1.5 1234 typ host "
"generation 2 ufrag foo pwd bar\r\n";
- JsepSessionDescription jdesc_output(kDummyType);
- EXPECT_TRUE(
- SdpDeserialize(kSdpWithIceCredentialsInCandidateString, &jdesc_output));
- const IceCandidateCollection* candidates = jdesc_output.candidates(0);
+ std::unique_ptr<SessionDescriptionInterface> jdesc_output =
+ SdpDeserialize(kSdpWithIceCredentialsInCandidateString);
+ ASSERT_THAT(jdesc_output, NotNull());
+ const IceCandidateCollection* candidates = jdesc_output->candidates(0);
ASSERT_NE(nullptr, candidates);
ASSERT_EQ(1U, candidates->count());
Candidate c = candidates->at(0)->candidate();
@@ -3892,9 +3837,10 @@ TEST_F(WebRtcSdpTest, AttributeWithPartialMatchingNameIsIgnored) {
"a=candidate:a0+B/1 1 udp 2130706432 192.168.1.5 1234 typ host "
"generation 2\r\n";
- JsepSessionDescription jdesc_output(kDummyType);
- EXPECT_TRUE(SdpDeserialize(kSdpWithFooIceCredentials, &jdesc_output));
- const IceCandidateCollection* candidates = jdesc_output.candidates(0);
+ std::unique_ptr<SessionDescriptionInterface> jdesc_output =
+ SdpDeserialize(kSdpWithFooIceCredentials);
+ ASSERT_THAT(jdesc_output, NotNull());
+ const IceCandidateCollection* candidates = jdesc_output->candidates(0);
ASSERT_NE(nullptr, candidates);
ASSERT_EQ(1U, candidates->count());
Candidate c = candidates->at(0)->candidate();
@@ -3933,9 +3879,9 @@ TEST_F(WebRtcSdpTest, DeserializeMsidAttributeWithStreamIdAndTrackId) {
"a=rtpmap:111 opus/48000/2\r\n"
"a=msid:stream_id track_id\r\n";
- JsepSessionDescription jdesc_output(kDummyType);
- EXPECT_TRUE(SdpDeserialize(sdp, &jdesc_output));
- auto stream = jdesc_output.description()
+ std::unique_ptr<SessionDescriptionInterface> jdesc_output =
+ SdpDeserialize(sdp);
+ auto stream = jdesc_output->description()
->contents()[0]
.media_description()
->streams()[0];
@@ -3955,9 +3901,10 @@ TEST_F(WebRtcSdpTest, DeserializeMsidAttributeWithEmptyStreamIdAndTrackId) {
"a=rtpmap:111 opus/48000/2\r\n"
"a=msid:- track_id\r\n";
- JsepSessionDescription jdesc_output(kDummyType);
- EXPECT_TRUE(SdpDeserialize(sdp, &jdesc_output));
- auto stream = jdesc_output.description()
+ std::unique_ptr<SessionDescriptionInterface> jdesc_output =
+ SdpDeserialize(sdp);
+ ASSERT_THAT(jdesc_output, NotNull());
+ auto stream = jdesc_output->description()
->contents()[0]
.media_description()
->streams()[0];
@@ -4045,9 +3992,10 @@ TEST_F(WebRtcSdpTest, DeserializeMsidAttributeWithoutAppData) {
"a=rtpmap:111 opus/48000/2\r\n"
"a=msid:stream_id\r\n";
- JsepSessionDescription jdesc_output(kDummyType);
- EXPECT_TRUE(SdpDeserialize(sdp, &jdesc_output));
- auto stream = jdesc_output.description()
+ std::unique_ptr<SessionDescriptionInterface> jdesc_output =
+ SdpDeserialize(sdp);
+ ASSERT_THAT(jdesc_output, NotNull());
+ auto stream = jdesc_output->description()
->contents()[0]
.media_description()
->streams()[0];
@@ -4069,9 +4017,10 @@ TEST_F(WebRtcSdpTest, DeserializeMsidAttributeWithoutAppDataTwoStreams) {
"a=msid:stream_id\r\n"
"a=msid:stream_id2\r\n";
- JsepSessionDescription jdesc_output(kDummyType);
- EXPECT_TRUE(SdpDeserialize(sdp, &jdesc_output));
- auto stream = jdesc_output.description()
+ std::unique_ptr<SessionDescriptionInterface> jdesc_output =
+ SdpDeserialize(sdp);
+ ASSERT_THAT(jdesc_output, NotNull());
+ auto stream = jdesc_output->description()
->contents()[0]
.media_description()
->streams()[0];
@@ -4094,10 +4043,11 @@ TEST_F(WebRtcSdpTest, DeserializeMsidAttributeWithoutAppDataDuplicate) {
"a=msid:stream_id\r\n"
"a=msid:stream_id\r\n";
- JsepSessionDescription jdesc_output(kDummyType);
// This is somewhat silly but accept it. Duplicates get filtered.
- EXPECT_TRUE(SdpDeserialize(sdp, &jdesc_output));
- auto stream = jdesc_output.description()
+ std::unique_ptr<SessionDescriptionInterface> jdesc_output =
+ SdpDeserialize(sdp);
+ ASSERT_THAT(jdesc_output, NotNull());
+ auto stream = jdesc_output->description()
->contents()[0]
.media_description()
->streams()[0];
@@ -4119,11 +4069,12 @@ TEST_F(WebRtcSdpTest, DeserializeMsidAttributeWithoutAppDataMixed) {
"a=msid:stream_id\r\n"
"a=msid:stream_id2 track_id\r\n";
- JsepSessionDescription jdesc_output(kDummyType);
// Mixing the syntax like this is not a good idea but we accept it
// and the result is the second track_id.
- EXPECT_TRUE(SdpDeserialize(sdp, &jdesc_output));
- auto stream = jdesc_output.description()
+ std::unique_ptr<SessionDescriptionInterface> jdesc_output =
+ SdpDeserialize(sdp);
+ ASSERT_THAT(jdesc_output, NotNull());
+ auto stream = jdesc_output->description()
->contents()[0]
.media_description()
->streams()[0];
@@ -4147,11 +4098,12 @@ TEST_F(WebRtcSdpTest, DeserializeMsidAttributeWithoutAppDataMixed2) {
"a=msid:stream_id track_id\r\n"
"a=msid:stream_id2\r\n";
- JsepSessionDescription jdesc_output(kDummyType);
// Mixing the syntax like this is not a good idea but we accept it
// and the result is the second track_id.
- EXPECT_TRUE(SdpDeserialize(sdp, &jdesc_output));
- auto stream = jdesc_output.description()
+ std::unique_ptr<SessionDescriptionInterface> jdesc_output =
+ SdpDeserialize(sdp);
+ ASSERT_THAT(jdesc_output, NotNull());
+ auto stream = jdesc_output->description()
->contents()[0]
.media_description()
->streams()[0];
@@ -4175,11 +4127,12 @@ TEST_F(WebRtcSdpTest, DeserializeMsidAttributeWithoutAppDataMixedNoStream) {
"a=msid:stream_id\r\n"
"a=msid:- track_id\r\n";
- JsepSessionDescription jdesc_output(kDummyType);
// This is somewhat undefined behavior but accept it and expect a single
// stream.
- EXPECT_TRUE(SdpDeserialize(sdp, &jdesc_output));
- auto stream = jdesc_output.description()
+ std::unique_ptr<SessionDescriptionInterface> jdesc_output =
+ SdpDeserialize(sdp);
+ ASSERT_THAT(jdesc_output, NotNull());
+ auto stream = jdesc_output->description()
->contents()[0]
.media_description()
->streams()[0];
@@ -4223,17 +4176,16 @@ TEST_F(WebRtcSdpTest, DeserializeMsidAttributeWithDuplicateStreamIdAndTrackId) {
// Tests that if both session-level address and media-level address exist, use
// the media-level address.
TEST_F(WebRtcSdpTest, ParseConnectionData) {
- JsepSessionDescription jsep_desc(kDummyType);
-
// Sesssion-level address.
std::string sdp = kSdpFullString;
InjectAfter("s=-\r\n", "c=IN IP4 192.168.0.3\r\n", &sdp);
- EXPECT_TRUE(SdpDeserialize(sdp, &jsep_desc));
+ std::unique_ptr<SessionDescriptionInterface> jsep_desc = SdpDeserialize(sdp);
+ ASSERT_THAT(jsep_desc, NotNull());
- const auto& content1 = jsep_desc.description()->contents()[0];
+ const auto& content1 = jsep_desc->description()->contents()[0];
EXPECT_EQ("74.125.127.126:2345",
content1.media_description()->connection_address().ToString());
- const auto& content2 = jsep_desc.description()->contents()[1];
+ const auto& content2 = jsep_desc->description()->contents()[1];
EXPECT_EQ("74.125.224.39:3457",
content2.media_description()->connection_address().ToString());
}
@@ -4241,29 +4193,25 @@ TEST_F(WebRtcSdpTest, ParseConnectionData) {
// Tests that the session-level connection address will be used if the media
// level-addresses are not specified.
TEST_F(WebRtcSdpTest, ParseConnectionDataSessionLevelOnly) {
- JsepSessionDescription jsep_desc(kDummyType);
-
// Sesssion-level address.
std::string sdp = kSdpString;
InjectAfter("s=-\r\n", "c=IN IP4 192.168.0.3\r\n", &sdp);
// Remove the media level addresses.
Replace("c=IN IP4 0.0.0.0\r\n", "", &sdp);
Replace("c=IN IP4 0.0.0.0\r\n", "", &sdp);
- EXPECT_TRUE(SdpDeserialize(sdp, &jsep_desc));
+ std::unique_ptr<SessionDescriptionInterface> jsep_desc = SdpDeserialize(sdp);
+ ASSERT_THAT(jsep_desc, NotNull());
- const auto& content1 = jsep_desc.description()->contents()[0];
+ const auto& content1 = jsep_desc->description()->contents()[0];
EXPECT_EQ("192.168.0.3:9",
content1.media_description()->connection_address().ToString());
- const auto& content2 = jsep_desc.description()->contents()[1];
+ const auto& content2 = jsep_desc->description()->contents()[1];
EXPECT_EQ("192.168.0.3:9",
content2.media_description()->connection_address().ToString());
}
TEST_F(WebRtcSdpTest, ParseConnectionDataIPv6) {
- JsepSessionDescription jsep_desc(kDummyType);
-
std::string sdp = kSdpString;
- EXPECT_TRUE(SdpDeserialize(sdp, &jsep_desc));
Replace("m=audio 9 RTP/SAVPF 111 103 104\r\nc=IN IP4 0.0.0.0\r\n",
"m=audio 9 RTP/SAVPF 111 103 104\r\nc=IN IP6 "
"2001:0db8:85a3:0000:0000:8a2e:0370:7335\r\n",
@@ -4272,11 +4220,12 @@ TEST_F(WebRtcSdpTest, ParseConnectionDataIPv6) {
"m=video 9 RTP/SAVPF 120\r\nc=IN IP6 "
"2001:0db8:85a3:0000:0000:8a2e:0370:7336\r\n",
&sdp);
- EXPECT_TRUE(SdpDeserialize(sdp, &jsep_desc));
- const auto& content1 = jsep_desc.description()->contents()[0];
+ std::unique_ptr<SessionDescriptionInterface> jsep_desc = SdpDeserialize(sdp);
+ ASSERT_THAT(jsep_desc, NotNull());
+ const auto& content1 = jsep_desc->description()->contents()[0];
EXPECT_EQ("[2001:db8:85a3::8a2e:370:7335]:9",
content1.media_description()->connection_address().ToString());
- const auto& content2 = jsep_desc.description()->contents()[1];
+ const auto& content2 = jsep_desc->description()->contents()[1];
EXPECT_EQ("[2001:db8:85a3::8a2e:370:7336]:9",
content2.media_description()->connection_address().ToString());
}
@@ -4284,20 +4233,17 @@ TEST_F(WebRtcSdpTest, ParseConnectionDataIPv6) {
// Test that a c= line that contains a hostname connection address can be
// parsed.
TEST_F(WebRtcSdpTest, ParseConnectionDataWithHostnameConnectionAddress) {
- JsepSessionDescription jsep_desc(kDummyType);
std::string sdp = kSdpString;
- EXPECT_TRUE(SdpDeserialize(sdp, &jsep_desc));
-
- sdp = kSdpString;
Replace("c=IN IP4 0.0.0.0\r\n", "c=IN IP4 example.local\r\n", &sdp);
Replace("c=IN IP4 0.0.0.0\r\n", "c=IN IP4 example.local\r\n", &sdp);
- ASSERT_TRUE(SdpDeserialize(sdp, &jsep_desc));
+ std::unique_ptr<SessionDescriptionInterface> jsep_desc = SdpDeserialize(sdp);
+ ASSERT_THAT(jsep_desc, NotNull());
- ASSERT_NE(nullptr, jsep_desc.description());
- const auto& content1 = jsep_desc.description()->contents()[0];
+ ASSERT_NE(nullptr, jsep_desc->description());
+ const auto& content1 = jsep_desc->description()->contents()[0];
EXPECT_EQ("example.local:9",
content1.media_description()->connection_address().ToString());
- const auto& content2 = jsep_desc.description()->contents()[1];
+ const auto& content2 = jsep_desc->description()->contents()[1];
EXPECT_EQ("example.local:9",
content2.media_description()->connection_address().ToString());
}
@@ -4329,17 +4275,15 @@ TEST_F(WebRtcSdpTest, ParseConnectionDataFailure) {
}
TEST_F(WebRtcSdpTest, SerializeAndDeserializeWithConnectionAddress) {
- JsepSessionDescription expected_jsep(kDummyType);
- MakeDescriptionWithoutCandidates(&expected_jsep);
// Serialization.
- std::string message = SdpSerialize(expected_jsep);
+ std::string message = SdpSerialize(MakeDescriptionWithoutCandidates());
// Deserialization.
- JsepSessionDescription jdesc(kDummyType);
- EXPECT_TRUE(SdpDeserialize(message, &jdesc));
- auto audio_desc = jdesc.description()
+ std::unique_ptr<SessionDescriptionInterface> jdesc = SdpDeserialize(message);
+ ASSERT_THAT(jdesc, NotNull());
+ auto audio_desc = jdesc->description()
->GetContentByName(kAudioContentName)
->media_description();
- auto video_desc = jdesc.description()
+ auto video_desc = jdesc->description()
->GetContentByName(kVideoContentName)
->media_description();
EXPECT_EQ(audio_desc_->connection_address().ToString(),
@@ -4603,7 +4547,7 @@ TEST_F(WebRtcSdpTest, TestDeserializeIgnoresWrongRidDirectionLines) {
// unit tests for SdpSerializer.
TEST_F(WebRtcSdpTest, SerializeSimulcast_ComplexSerialization) {
MakeUnifiedPlanDescription(/* use_ssrcs = */ false);
- auto description = jdesc_.description();
+ auto description = jdesc_->description();
auto media = description->GetContentDescriptionByName(kVideoContentName3);
ASSERT_EQ(media->streams().size(), 1ul);
StreamParams& send_stream = media->mutable_streams()[0];
@@ -4647,9 +4591,7 @@ TEST_F(WebRtcSdpTest, ParseNoMid) {
TEST_F(WebRtcSdpTest, SerializeWithDefaultSctpProtocol) {
AddSctpDataChannel(false); // Don't use sctpmap
- JsepSessionDescription jsep_desc(kDummyType);
- MakeDescriptionWithoutCandidates(&jsep_desc);
- std::string message = SdpSerialize(jsep_desc);
+ std::string message = SdpSerialize(MakeDescriptionWithoutCandidates());
EXPECT_NE(std::string::npos, message.find(kMediaProtocolUdpDtlsSctp));
}
@@ -4659,9 +4601,7 @@ TEST_F(WebRtcSdpTest, DeserializeWithAllSctpProtocols) {
kMediaProtocolTcpDtlsSctp};
for (const auto& protocol : protocols) {
sctp_desc_->set_protocol(protocol);
- JsepSessionDescription jsep_desc(kDummyType);
- MakeDescriptionWithoutCandidates(&jsep_desc);
- std::string message = SdpSerialize(jsep_desc);
+ std::string message = SdpSerialize(MakeDescriptionWithoutCandidates());
EXPECT_NE(std::string::npos, message.find(protocol));
SdpParseError error;
EXPECT_THAT(SdpDeserialize(message, &error), NotNull());
@@ -4673,14 +4613,13 @@ TEST_F(WebRtcSdpTest, DeserializeWithAllSctpProtocols) {
TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithoutCname) {
std::string sdp_without_cname = kSdpFullString;
Replace("a=ssrc:1 cname:stream_1_cname\r\n", "", &sdp_without_cname);
- JsepSessionDescription new_jdesc(kDummyType);
- EXPECT_TRUE(SdpDeserialize(sdp_without_cname, &new_jdesc));
+ std::unique_ptr<SessionDescriptionInterface> new_jdesc =
+ SdpDeserialize(sdp_without_cname);
+ ASSERT_THAT(new_jdesc, NotNull());
audio_desc_->mutable_streams()[0].cname = "";
audio_desc_->mutable_streams()[0].ssrcs = {};
- ASSERT_TRUE(jdesc_.Initialize(desc_.Clone(), jdesc_.session_id(),
- jdesc_.session_version()));
- EXPECT_TRUE(CompareSessionDescription(jdesc_, new_jdesc));
+ EXPECT_TRUE(MatchesCurrentDescription(new_jdesc));
}
TEST_F(WebRtcSdpTest,
@@ -4690,29 +4629,30 @@ TEST_F(WebRtcSdpTest,
"obviously-bogus", "UDP/TL/RTSP/SAVPF", "UDP/TL/RTSP/S"};
for (auto proto : unsupported_application_protocols) {
- JsepSessionDescription jdesc_output(kDummyType);
std::string sdp = kSdpSessionString;
sdp.append("m=application 9 ");
sdp.append(proto);
sdp.append(" 101\r\n");
- EXPECT_TRUE(SdpDeserialize(sdp, &jdesc_output));
+ std::unique_ptr<SessionDescriptionInterface> jdesc_output =
+ SdpDeserialize(sdp);
+ ASSERT_THAT(jdesc_output, NotNull());
// Make sure we actually parsed a single media section
- ASSERT_EQ(1u, jdesc_output.description()->contents().size());
+ ASSERT_EQ(1u, jdesc_output->description()->contents().size());
// Content is not getting parsed as sctp but instead unsupported.
- EXPECT_EQ(nullptr, jdesc_output.description()
+ EXPECT_EQ(nullptr, jdesc_output->description()
->contents()[0]
.media_description()
->as_sctp());
- EXPECT_NE(nullptr, jdesc_output.description()
+ EXPECT_NE(nullptr, jdesc_output->description()
->contents()[0]
.media_description()
->as_unsupported());
// Reject the content
- EXPECT_TRUE(jdesc_output.description()->contents()[0].rejected);
+ EXPECT_TRUE(jdesc_output->description()->contents()[0].rejected);
}
}
@@ -4727,24 +4667,25 @@ TEST_F(WebRtcSdpTest, DeserializeSdpWithUnsupportedMediaType) {
"c=IN IP4 0.0.0.0\r\n"
"a=mid:somethingmid\r\n";
- JsepSessionDescription jdesc_output(kDummyType);
- EXPECT_TRUE(SdpDeserialize(sdp, &jdesc_output));
+ std::unique_ptr<SessionDescriptionInterface> jdesc_output =
+ SdpDeserialize(sdp);
+ ASSERT_THAT(jdesc_output, NotNull());
- ASSERT_EQ(2u, jdesc_output.description()->contents().size());
- ASSERT_NE(nullptr, jdesc_output.description()
+ ASSERT_EQ(2u, jdesc_output->description()->contents().size());
+ ASSERT_NE(nullptr, jdesc_output->description()
->contents()[0]
.media_description()
->as_unsupported());
- ASSERT_NE(nullptr, jdesc_output.description()
+ ASSERT_NE(nullptr, jdesc_output->description()
->contents()[1]
.media_description()
->as_unsupported());
- EXPECT_TRUE(jdesc_output.description()->contents()[0].rejected);
- EXPECT_TRUE(jdesc_output.description()->contents()[1].rejected);
+ EXPECT_TRUE(jdesc_output->description()->contents()[0].rejected);
+ EXPECT_TRUE(jdesc_output->description()->contents()[1].rejected);
- EXPECT_EQ(jdesc_output.description()->contents()[0].mid(), "bogusmid");
- EXPECT_EQ(jdesc_output.description()->contents()[1].mid(), "somethingmid");
+ EXPECT_EQ(jdesc_output->description()->contents()[0].mid(), "bogusmid");
+ EXPECT_EQ(jdesc_output->description()->contents()[1].mid(), "somethingmid");
}
TEST_F(WebRtcSdpTest, MediaTypeProtocolMismatch) {
@@ -4873,10 +4814,10 @@ TEST_F(WebRtcSdpTest, ParseSessionLevelExtmapAttributes) {
"a=sendonly\r\n"
"a=mid:0\r\n"
"a=rtpmap:111 opus/48000/2\r\n";
- JsepSessionDescription jdesc(kDummyType);
- EXPECT_TRUE(SdpDeserialize(sdp, &jdesc));
- ASSERT_EQ(1u, jdesc.description()->contents().size());
- const auto content = jdesc.description()->contents()[0];
+ std::unique_ptr<SessionDescriptionInterface> jdesc = SdpDeserialize(sdp);
+ ASSERT_THAT(jdesc, NotNull());
+ ASSERT_EQ(1u, jdesc->description()->contents().size());
+ const auto content = jdesc->description()->contents()[0];
const auto* audio_description = content.media_description();
ASSERT_NE(audio_description, nullptr);
const auto& extensions = audio_description->rtp_header_extensions();
@@ -4982,10 +4923,10 @@ TEST_F(WebRtcSdpTest, BackfillsDefaultFmtpValues) {
"a=rtpmap:98 AV1/90000\r\n"
"a=rtpmap:99 H265/90000\r\n"
"a=ssrc:1234 cname:test\r\n";
- JsepSessionDescription jdesc(kDummyType);
- EXPECT_TRUE(SdpDeserialize(sdp, &jdesc));
- ASSERT_EQ(1u, jdesc.description()->contents().size());
- const auto content = jdesc.description()->contents()[0];
+ std::unique_ptr<SessionDescriptionInterface> jdesc = SdpDeserialize(sdp);
+ ASSERT_THAT(jdesc, NotNull());
+ ASSERT_EQ(1u, jdesc->description()->contents().size());
+ const auto content = jdesc->description()->contents()[0];
const auto* description = content.media_description();
ASSERT_NE(description, nullptr);
const std::vector<Codec> codecs = description->codecs();
