tor-browser

commit 5d73a38c71dafa5f8eafdc7f19c49e030a87963a
parent 03d94be6ac1af230a71b5d434316483f4986bd03
Author: Michael Froman <mfroman@mozilla.com>
Date:   Wed,  8 Oct 2025 16:50:54 -0500

Bug 1993083 - Vendor libwebrtc from cb88340bac

Upstream commit: https://webrtc.googlesource.com/src/+/cb88340bacc1292532a52a5713c01df85d8517fd
    Reland "Remove rtp_header_extensions_set()"

    This reverts commit c48e9ba24e35e55a00ee3aa1e89d9199e66781dd.

    Reason for revert: This CL was harmless.

    Bug: webrtc:425296984, b/425662432, b/426394283
    Original change's description:
    > Revert "Remove rtp_header_extensions_set()"
    >
    > This reverts commit 3ff035e2787b7da182ee79e143da0b7ac099b4a8.
    >
    > Reason for revert: Reverting https://webrtc-review.googlesource.com/c/src/+/396640 to investigate a downstream issue. This CL depends on https://webrtc-review.googlesource.com/c/src/+/396640 so to have a clean revert let's revert this one as well.
    >
    > Bug: webrtc:425296984
    > Original change's description:
    > > Remove rtp_header_extensions_set()
    > >
    > > It seems to be unused and useless.
    > >
    > > Bug: webrtc:425296984
    > > Change-Id: Iee68aec438889f8c1dd7ee69ea444606f17ff485
    > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/396860
    > > Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
    > > Commit-Queue: Harald Alvestrand <hta@webrtc.org>
    > > Cr-Commit-Position: refs/heads/main@{#44968}
    >
    > Bug: webrtc:425296984, b/425662432, b/426394283
    > Change-Id: I5e124a6fd4fbe8bc516716a6dd9645251f2bdce5
    > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/397780
    > Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
    > Reviewed-by: Christoffer Dewerin <jansson@webrtc.org>
    > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
    > Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
    > Owners-Override: Mirko Bonadei <mbonadei@webrtc.org>
    > Cr-Commit-Position: refs/heads/main@{#45006}

    Bug: webrtc:425296984
    Bug: webrtc:425296984, b/425662432, b/426394283
    Change-Id: I07ee25942294c6ee9d6adfc49c1ec3c74f28a46c
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/397860
    Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
    Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
    Commit-Queue: Harald Alvestrand <hta@webrtc.org>
    Auto-Submit: Harald Alvestrand <hta@webrtc.org>
    Reviewed-by: Christoffer Dewerin <jansson@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#45022}

Diffstat:
M
third_party/libwebrtc/README.mozilla.last-vendor
 | 
4
++--
M
third_party/libwebrtc/pc/channel.cc
 | 
6
+-----
M
third_party/libwebrtc/pc/session_description.h
 | 
11
+----------

3 files changed, 4 insertions(+), 17 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-08T21:49:25.050386+00:00.
+libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-08T21:50:44.503047+00:00.
 # base of lastest vendoring
-8c11384a5a
+cb88340bac
diff --git a/third_party/libwebrtc/pc/channel.cc b/third_party/libwebrtc/pc/channel.cc
@@ -99,11 +99,7 @@ void MediaChannelParametersFromMediaDescription(
              desc->type() == MediaType::VIDEO);
   params->is_stream_active = is_stream_active;
   params->codecs = desc->codecs();
-  // TODO(bugs.webrtc.org/11513): See if we really need
-  // rtp_header_extensions_set() and remove it if we don't.
-  if (desc->rtp_header_extensions_set()) {
-    params->extensions = extensions;
-  }
+  params->extensions = extensions;
   params->rtcp.reduced_size = desc->rtcp_reduced_size();
   params->rtcp.remote_estimate = desc->remote_estimate();
 }
diff --git a/third_party/libwebrtc/pc/session_description.h b/third_party/libwebrtc/pc/session_description.h
@@ -135,18 +135,10 @@ class MediaContentDescription {
   }
   void set_rtp_header_extensions(const RtpHeaderExtensions& extensions) {
     rtp_header_extensions_ = extensions;
-    rtp_header_extensions_set_ = true;
   }
   void AddRtpHeaderExtension(const RtpExtension& ext) {
     rtp_header_extensions_.push_back(ext);
-    rtp_header_extensions_set_ = true;
-  }
-  // We can't always tell if an empty list of header extensions is
-  // because the other side doesn't support them, or just isn't hooked up to
-  // signal them. For now we assume an empty list means no signaling, but
-  // provide the ClearRtpHeaderExtensions method to allow "no support" to be
-  // clearly indicated (i.e. when derived from other information).
-  bool rtp_header_extensions_set() const { return rtp_header_extensions_set_; }
+  }
   const StreamParamsVec& streams() const { return send_streams_; }
   // TODO(pthatcher): Remove this by giving mediamessage.cc access
   // to MediaContentDescription
@@ -262,7 +254,6 @@ class MediaContentDescription {
   std::string bandwidth_type_ = kApplicationSpecificBandwidth;
 
   std::vector<RtpExtension> rtp_header_extensions_;
-  bool rtp_header_extensions_set_ = false;
   StreamParamsVec send_streams_;
   bool conference_mode_ = false;
   RtpTransceiverDirection direction_ = RtpTransceiverDirection::kSendRecv;