From 8ace227e4f87a9cd1702799b20264d6c04fbfeeb Mon Sep 17 00:00:00 2001
From: Miriam Zimmerman <mutexlox@signal.org>
Date: Fri, 1 May 2026 14:59:17 -0400
Subject: [PATCH] Build fixes

---
 pc/jsep_transport.cc                         |  2 --
 pc/jsep_transport_controller.cc              |  3 ---
 ringrtc/rffi/src/peer_connection_observer.cc | 14 ++++++++------
 video/buffered_frame_decryptor.cc            |  3 +--
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/pc/jsep_transport.cc b/pc/jsep_transport.cc
index 5fc575980a..a38177e927 100644
--- a/pc/jsep_transport.cc
+++ b/pc/jsep_transport.cc
@@ -254,8 +254,6 @@ RTCError JsepTransport::SetRemoteJsepTransportDescription(
       return RTCError(RTCErrorType::INVALID_PARAMETER,
                       "Failed to setup SRTP crypto parameters.");
     }
-    custom_srtp_transport->CacheRtpAbsSendTimeHeaderExtension(
-        jsep_description.rtp_abs_sendtime_extn_id);
   }
   // end RingRTC
 
diff --git a/pc/jsep_transport_controller.cc b/pc/jsep_transport_controller.cc
index 9f6fb865ae..200efd94b0 100644
--- a/pc/jsep_transport_controller.cc
+++ b/pc/jsep_transport_controller.cc
@@ -597,9 +597,6 @@ std::unique_ptr<RtpTransport> JsepTransportController::CreateCustomSrtpTransport
   if (rtcp_dtls_transport) {
     srtp_transport->SetRtcpPacketTransportOwned(std::move(rtcp_dtls_transport));
   }
-  if (config_.enable_external_auth) {
-    srtp_transport->EnableExternalAuth();
-  }
   srtp_transport->SubscribeRtcpPacketReceived(
       this, [this](CopyOnWriteBuffer packet,
                    std::optional<Timestamp> arrival_time, EcnMarking ecn) {
diff --git a/ringrtc/rffi/src/peer_connection_observer.cc b/ringrtc/rffi/src/peer_connection_observer.cc
index 22a1536770..3abd2d67f4 100644
--- a/ringrtc/rffi/src/peer_connection_observer.cc
+++ b/ringrtc/rffi/src/peer_connection_observer.cc
@@ -5,6 +5,8 @@
 
 #include "rffi/src/peer_connection_observer.h"
 
+#include <span>
+
 #include "pc/webrtc_sdp.h"
 #include "rffi/src/ptr.h"
 #include "rtc_base/net_helper.h"
@@ -222,9 +224,9 @@ class Encryptor : public FrameEncryptorInterface {
               uint32_t _ssrc,
               // This is not supported by our SFU currently, so don't bother
               // trying to use it.
-              ArrayView<const uint8_t> _generic_video_header,
-              ArrayView<const uint8_t> plaintext,
-              ArrayView<uint8_t> ciphertext_buffer,
+              std::span<const uint8_t> _generic_video_header,
+              std::span<const uint8_t> plaintext,
+              std::span<uint8_t> ciphertext_buffer,
               size_t* ciphertext_size) override {
     bool is_audio = (media_type == MediaType::AUDIO);
     bool is_video = (media_type == MediaType::VIDEO);
@@ -339,9 +341,9 @@ class Decryptor : public FrameDecryptorInterface {
       const std::vector<uint32_t>& _csrcs,
       // This is not supported by our SFU currently, so don't bother trying to
       // use it.
-      ArrayView<const uint8_t> _generic_video_header,
-      ArrayView<const uint8_t> ciphertext,
-      ArrayView<uint8_t> plaintext_buffer) override {
+      std::span<const uint8_t> _generic_video_header,
+      std::span<const uint8_t> ciphertext,
+      std::span<uint8_t> plaintext_buffer) override {
     bool is_audio = (media_type == MediaType::AUDIO);
     bool is_video = (media_type == MediaType::VIDEO);
     if (!is_audio && !is_video) {
diff --git a/video/buffered_frame_decryptor.cc b/video/buffered_frame_decryptor.cc
index c5a0757d9c..e4edb119b4 100644
--- a/video/buffered_frame_decryptor.cc
+++ b/video/buffered_frame_decryptor.cc
@@ -80,8 +80,7 @@ BufferedFrameDecryptor::FrameDecision BufferedFrameDecryptor::DecryptFrame(
 
   // RingRTC change to allow encryption without generic descriptor
   // Place the decrypted frame inline into the existing frame.
-  ArrayView<uint8_t> encrypted_bitstream(frame->mutable_data(),
-                                              frame->size());
+  std::span<uint8_t> encrypted_bitstream(frame->mutable_data(), frame->size());
 
   // Place the decrypted frame inline into the existing frame.
   std::span<uint8_t> inline_decrypted_bitstream(frame->mutable_data(),