commit 0a9d0d475a099ffe6e1a42c14b438d1e4010acbc
parent 1aaa6c0240a9267b9beab0958b31fc137e79341b
Author: Dan Baker <dbaker@mozilla.com>
Date: Thu, 20 Nov 2025 13:07:23 -0700
Bug 2000941 - Vendor libwebrtc from 15bb3e5cb4
Upstream commit: https://webrtc.googlesource.com/src/+/15bb3e5cb447a86ae78ea1398c30057aace46f40
Exchange JsepSessionDescription for SessionDescriptionInterface
For the SdpSerialize utility method in webrtc_sdp.*.
Also updating a few test methods to require the interface and not
the implementation.
This should be a no-op change since JsepSessionDescription inherits
from SessionDescriptionInterface.
Bug: webrtc:442220720
Change-Id: Iee266834b744efd1295e1519027a7d4e854995ae
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/407620
Reviewed-by: Evan Shrubsole <eshr@webrtc.org>
Auto-Submit: Tomas Gunnarsson <tommi@webrtc.org>
Commit-Queue: Evan Shrubsole <eshr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#45546}
Diffstat:
4 files changed, 11 insertions(+), 11 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-11-20T20:04:30.515255+00:00.
+libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-11-20T20:07:10.185763+00:00.
# base of lastest vendoring
-619f10796e
+15bb3e5cb4
diff --git a/third_party/libwebrtc/pc/webrtc_sdp.cc b/third_party/libwebrtc/pc/webrtc_sdp.cc
@@ -3222,7 +3222,7 @@ bool ParseMediaDescription(
} // namespace
-std::string SdpSerialize(const JsepSessionDescription& jdesc) {
+std::string SdpSerialize(const SessionDescriptionInterface& jdesc) {
const SessionDescription* desc = jdesc.description();
if (!desc) {
return "";
diff --git a/third_party/libwebrtc/pc/webrtc_sdp.h b/third_party/libwebrtc/pc/webrtc_sdp.h
@@ -36,12 +36,12 @@ namespace webrtc {
class JsepSessionDescription;
struct SdpParseError;
-// Serializes the passed in JsepSessionDescription.
+// Serializes the passed in SessionDescriptionInterface.
// Serialize SessionDescription including candidates if
-// JsepSessionDescription has candidates.
-// jdesc - The JsepSessionDescription object to be serialized.
+// SessionDescriptionInterface has candidates.
+// jdesc - The SessionDescriptionInterface object to be serialized.
// return - SDP string serialized from the arguments.
-std::string SdpSerialize(const JsepSessionDescription& jdesc);
+std::string SdpSerialize(const SessionDescriptionInterface& jdesc);
// Serializes the passed in IceCandidate to a SDP string.
// candidate - The candidate to be serialized.
diff --git a/third_party/libwebrtc/pc/webrtc_sdp_unittest.cc b/third_party/libwebrtc/pc/webrtc_sdp_unittest.cc
@@ -1483,8 +1483,8 @@ class WebRtcSdpTest : public ::testing::Test {
EXPECT_EQ(desc1.extmap_allow_mixed(), desc2.extmap_allow_mixed());
}
- bool CompareSessionDescription(const JsepSessionDescription& desc1,
- const JsepSessionDescription& desc2) {
+ bool CompareSessionDescription(const SessionDescriptionInterface& desc1,
+ const SessionDescriptionInterface& desc2) {
EXPECT_EQ(desc1.session_id(), desc2.session_id());
EXPECT_EQ(desc1.session_version(), desc2.session_version());
CompareSessionDescription(*desc1.description(), *desc2.description());
@@ -1517,7 +1517,7 @@ class WebRtcSdpTest : public ::testing::Test {
}
// Update the candidates in `jdesc` to use the given `ufrag` and `pwd`.
- bool UpdateCandidateUfragPwd(JsepSessionDescription* jdesc,
+ bool UpdateCandidateUfragPwd(SessionDescriptionInterface* jdesc,
int mline_index,
const std::string& ufrag,
const std::string& pwd) {
@@ -1925,7 +1925,7 @@ class WebRtcSdpTest : public ::testing::Test {
// no order. If deserializer has already been tested, serializing then
// deserializing and comparing JsepSessionDescription will test
// the serializer sufficiently.
- void TestSerialize(const JsepSessionDescription& jdesc) {
+ void TestSerialize(const SessionDescriptionInterface& jdesc) {
std::string message = SdpSerialize(jdesc);
JsepSessionDescription jdesc_output_des(kDummyType);
SdpParseError error;