0143.patch - mozsearch

From: Michael Froman <mfroman@mozilla.com>

Date: Fri, 18 Jul 2025 16:07:00 -0500

Subject: Bug 1971201 - (fix-70fb834e8c) most all of libwebrtc has converted

 from rtc:: to webrtc::

Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/d51a82971b9e755d5514572fcd8ddc557153c8ef

---

 modules/rtp_rtcp/source/rtp_header_extensions.h | 4 ++--

 modules/video_capture/video_capture.h           | 2 +-

 modules/video_capture/video_capture_impl.cc     | 2 +-

 modules/video_capture/video_capture_impl.h      | 2 +-

 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/rtp_rtcp/source/rtp_header_extensions.h b/modules/rtp_rtcp/source/rtp_header_extensions.h

index cc811cae3a..46d80e424a 100644

--- a/modules/rtp_rtcp/source/rtp_header_extensions.h

+++ b/modules/rtp_rtcp/source/rtp_header_extensions.h

@@ -321,10 +321,10 @@ class CsrcAudioLevel {

   static constexpr const char* kUri =

       "urn:ietf:params:rtp-hdrext:csrc-audio-level";

-  static bool Parse(rtc::ArrayView<const uint8_t> data,

+  static bool Parse(webrtc::ArrayView<const uint8_t> data,

                     CsrcAudioLevelList* csrcAudioLevels);

   static size_t ValueSize(const CsrcAudioLevelList& csrcAudioLevels);

-  static bool Write(rtc::ArrayView<uint8_t> data,

+  static bool Write(webrtc::ArrayView<uint8_t> data,

                     const CsrcAudioLevelList& csrcAudioLevels);

};

 #endif

diff --git a/modules/video_capture/video_capture.h b/modules/video_capture/video_capture.h

index 05d5a3de32..48d9b6ed26 100644

--- a/modules/video_capture/video_capture.h

+++ b/modules/video_capture/video_capture.h

@@ -124,7 +124,7 @@ class VideoCaptureModule : public RefCountInterface {

   //  Remove capture data callback

   virtual void DeRegisterCaptureDataCallback(

-      rtc::VideoSinkInterface<VideoFrame> *dataCallback) = 0;

+      webrtc::VideoSinkInterface<VideoFrame> *dataCallback) = 0;

   // Start capture device

   virtual int32_t StartCapture(const VideoCaptureCapability& capability) = 0;

diff --git a/modules/video_capture/video_capture_impl.cc b/modules/video_capture/video_capture_impl.cc

index d47e25f271..0193bed0ba 100644

--- a/modules/video_capture/video_capture_impl.cc

+++ b/modules/video_capture/video_capture_impl.cc

@@ -120,7 +120,7 @@ void VideoCaptureImpl::RegisterCaptureDataCallback(

 void VideoCaptureImpl::DeRegisterCaptureDataCallback(

-    rtc::VideoSinkInterface<VideoFrame>* dataCallBack) {

+    webrtc::VideoSinkInterface<VideoFrame>* dataCallBack) {

   MutexLock lock(&api_lock_);

   auto it = _dataCallBacks.find(dataCallBack);

   if (it != _dataCallBacks.end()) {

diff --git a/modules/video_capture/video_capture_impl.h b/modules/video_capture/video_capture_impl.h

index f9bf4f97db..c177744e3d 100644

--- a/modules/video_capture/video_capture_impl.h

+++ b/modules/video_capture/video_capture_impl.h

@@ -67,7 +67,7 @@ class RTC_EXPORT VideoCaptureImpl : public VideoCaptureModule {

   virtual void RegisterCaptureDataCallback(

       RawVideoSinkInterface* dataCallback) override;

   void DeRegisterCaptureDataCallback(

-      rtc::VideoSinkInterface<VideoFrame>* dataCallback) override;

+      webrtc::VideoSinkInterface<VideoFrame>* dataCallback) override;

   int32_t StopCaptureIfAllClientsClose() override;

   int32_t SetCaptureRotation(VideoRotation rotation) override;