commit 666bcc1bfc8e9064ae69fdca46e0ba6b078b91e8
parent 0fbd5ecf61e6dd4b85783bb9b4fcb507fc922bb8
Author: Michael Froman <mfroman@mozilla.com>
Date: Wed, 15 Oct 2025 11:34:23 -0500
Bug 1993083 - Vendor libwebrtc from 5a7e6f8ed1
Upstream commit: https://webrtc.googlesource.com/src/+/5a7e6f8ed1c1313300fb6bb48d70e056202011ed
Provide transitional opt accessor to RTCConfiguration.crypto_options
Bug: webrtc:42235111
Change-Id: I92d56d9912d5587ef5aabcf556b942ce5eaf4e26
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/402680
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@meta.com>
Cr-Commit-Position: refs/heads/main@{#45254}
Diffstat:
2 files changed, 11 insertions(+), 2 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 /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
-libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-15T16:32:58.034409+00:00.
+libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-15T16:34:14.551688+00:00.
# base of lastest vendoring
-6b9333ad21
+5a7e6f8ed1
diff --git a/third_party/libwebrtc/api/peer_connection_interface.h b/third_party/libwebrtc/api/peer_connection_interface.h
@@ -662,6 +662,15 @@ class RTC_EXPORT PeerConnectionInterface : public RefCountInterface {
// frame encryption for native WebRTC.
std::optional<CryptoOptions> crypto_options;
+ // TODO: bugs.webrtc.org/42235111 - remove after converting callers that
+ // expect an optional.
+ CryptoOptions& GetWritableCryptoOptions() {
+ if (!crypto_options) {
+ crypto_options = CryptoOptions();
+ }
+ return *crypto_options;
+ }
+
// Configure if we should include the SDP attribute extmap-allow-mixed in
// our offer on session level.
bool offer_extmap_allow_mixed = true;