commit ddb6de6758304aabae2cb2cf9acc459c31f74247 parent 2df9e30d00807dc8bfc47a08b0ab1cef1742c0c2 Author: Michael Froman <mfroman@mozilla.com> Date: Wed, 8 Oct 2025 17:59:04 -0500 Bug 1993083 - (fix-0bdeb7818c) remove remaining deprecated 'rtc::' usages Diffstat:
9 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_header_extensions.cc b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_header_extensions.cc @@ -436,7 +436,7 @@ bool PlayoutDelayLimits::Write(ArrayView<uint8_t> data, constexpr RTPExtensionType CsrcAudioLevel::kId; constexpr const char* CsrcAudioLevel::kUri; -bool CsrcAudioLevel::Parse(rtc::ArrayView<const uint8_t> data, +bool CsrcAudioLevel::Parse(ArrayView<const uint8_t> data, CsrcAudioLevelList* csrcAudioLevels) { if (data.size() < 1 || data.size() > kRtpCsrcSize) return false; @@ -452,7 +452,7 @@ size_t CsrcAudioLevel::ValueSize(const CsrcAudioLevelList& csrcAudioLevels) { return csrcAudioLevels.numAudioLevels; } -bool CsrcAudioLevel::Write(rtc::ArrayView<uint8_t> data, +bool CsrcAudioLevel::Write(ArrayView<uint8_t> data, const CsrcAudioLevelList& csrcAudioLevels) { RTC_DCHECK_GE(csrcAudioLevels.numAudioLevels, 0); for(uint8_t i = 0; i < csrcAudioLevels.numAudioLevels; i++) { diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc @@ -287,12 +287,12 @@ void RTPSenderVideoFrameTransformerDelegate::Reset() { } // Wait until all pending tasks are executed, to ensure that the last ref // standing is not on the transformation queue. - rtc::Event flush; + Event flush; transformation_queue_->PostTask([this, &flush]() { RTC_DCHECK_RUN_ON(transformation_queue_.get()); flush.Set(); }); - flush.Wait(rtc::Event::kForever); + flush.Wait(Event::kForever); } std::unique_ptr<TransformableVideoFrameInterface> CloneSenderVideoFrame( diff --git a/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc b/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.cc @@ -180,7 +180,7 @@ DeviceInfoV4l2::DeviceInfoV4l2() : DeviceInfoImpl() #endif { #ifdef WEBRTC_LINUX - _inotifyEventThread = rtc::PlatformThread::SpawnJoinable( + _inotifyEventThread = PlatformThread::SpawnJoinable( [this] { InotifyProcess(); }, "InotifyEventThread"); diff --git a/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.h b/third_party/libwebrtc/modules/video_capture/linux/device_info_v4l2.h @@ -61,7 +61,7 @@ class DeviceInfoV4l2 : public DeviceInfoImpl { int EventCheck(int fd); int HandleEvents(int fd); int ProcessInotifyEvents(); - rtc::PlatformThread _inotifyEventThread; + PlatformThread _inotifyEventThread; void InotifyProcess(); int _fd_v4l, _fd_dev, _wd_v4l, _wd_dev; /* accessed on InotifyEventThread thread */ std::atomic<bool> _isShutdown; diff --git a/third_party/libwebrtc/moz-patch-stack/s0001.patch b/third_party/libwebrtc/moz-patch-stack/s0001.patch @@ -609,7 +609,7 @@ index e06698e0db..2629fe0aab 100644 method_ = new_method; } diff --git a/modules/rtp_rtcp/source/rtp_header_extensions.cc b/modules/rtp_rtcp/source/rtp_header_extensions.cc -index 3f9a852e18..8bc0ab998c 100644 +index 3f9a852e18..8f52699e89 100644 --- a/modules/rtp_rtcp/source/rtp_header_extensions.cc +++ b/modules/rtp_rtcp/source/rtp_header_extensions.cc @@ -420,6 +420,45 @@ bool PlayoutDelayLimits::Write(ArrayView<uint8_t> data, @@ -629,7 +629,7 @@ index 3f9a852e18..8bc0ab998c 100644 +constexpr RTPExtensionType CsrcAudioLevel::kId; +constexpr const char* CsrcAudioLevel::kUri; + -+bool CsrcAudioLevel::Parse(rtc::ArrayView<const uint8_t> data, ++bool CsrcAudioLevel::Parse(ArrayView<const uint8_t> data, + CsrcAudioLevelList* csrcAudioLevels) { + if (data.size() < 1 || data.size() > kRtpCsrcSize) + return false; @@ -645,7 +645,7 @@ index 3f9a852e18..8bc0ab998c 100644 + return csrcAudioLevels.numAudioLevels; +} + -+bool CsrcAudioLevel::Write(rtc::ArrayView<uint8_t> data, ++bool CsrcAudioLevel::Write(ArrayView<uint8_t> data, + const CsrcAudioLevelList& csrcAudioLevels) { + RTC_DCHECK_GE(csrcAudioLevels.numAudioLevels, 0); + for(uint8_t i = 0; i < csrcAudioLevels.numAudioLevels; i++) { diff --git a/third_party/libwebrtc/moz-patch-stack/s0048.patch b/third_party/libwebrtc/moz-patch-stack/s0048.patch @@ -9,7 +9,7 @@ Subject: Bug 1772380 - Build 1766646 - (fix-c89fdd716c) fixes for the 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/modules/video_capture/linux/device_info_v4l2.cc b/modules/video_capture/linux/device_info_v4l2.cc -index c5d33ff9a4..04caaea592 100644 +index c5d33ff9a4..6755a46146 100644 --- a/modules/video_capture/linux/device_info_v4l2.cc +++ b/modules/video_capture/linux/device_info_v4l2.cc @@ -151,11 +151,6 @@ int DeviceInfoV4l2::ProcessInotifyEvents() @@ -38,7 +38,7 @@ index c5d33ff9a4..04caaea592 100644 - { - _inotifyEventThread->Start(); - } -+ _inotifyEventThread = rtc::PlatformThread::SpawnJoinable( ++ _inotifyEventThread = PlatformThread::SpawnJoinable( + [this] { + InotifyProcess(); + }, "InotifyEventThread"); @@ -58,7 +58,7 @@ index c5d33ff9a4..04caaea592 100644 #endif } diff --git a/modules/video_capture/linux/device_info_v4l2.h b/modules/video_capture/linux/device_info_v4l2.h -index 119cb07ab8..0bec3eb765 100644 +index 119cb07ab8..60df9bb244 100644 --- a/modules/video_capture/linux/device_info_v4l2.h +++ b/modules/video_capture/linux/device_info_v4l2.h @@ -60,8 +60,7 @@ class DeviceInfoV4l2 : public DeviceInfoImpl { @@ -67,7 +67,7 @@ index 119cb07ab8..0bec3eb765 100644 int ProcessInotifyEvents(); - std::unique_ptr<rtc::PlatformThread> _inotifyEventThread; - static void InotifyEventThread(void*); -+ rtc::PlatformThread _inotifyEventThread; ++ PlatformThread _inotifyEventThread; void InotifyProcess(); int _fd_v4l, _fd_dev, _wd_v4l, _wd_dev; /* accessed on InotifyEventThread thread */ std::atomic<bool> _isShutdown; diff --git a/third_party/libwebrtc/moz-patch-stack/s0049.patch b/third_party/libwebrtc/moz-patch-stack/s0049.patch @@ -12,7 +12,7 @@ Subject: Bug 1766646 - (fix-ae0d117d51) ifdef our Csrc impl vs upstream's 5 files changed, 20 insertions(+) diff --git a/modules/rtp_rtcp/source/rtp_header_extensions.cc b/modules/rtp_rtcp/source/rtp_header_extensions.cc -index 8bc0ab998c..79bba05899 100644 +index 8f52699e89..c417026aa9 100644 --- a/modules/rtp_rtcp/source/rtp_header_extensions.cc +++ b/modules/rtp_rtcp/source/rtp_header_extensions.cc @@ -181,6 +181,7 @@ bool AudioLevelExtension::Write(ArrayView<uint8_t> data, @@ -39,7 +39,7 @@ index 8bc0ab998c..79bba05899 100644 // CSRCAudioLevel // Sample Audio Level Encoding Using the One-Byte Header Format // Note that the range of len is 1 to 15 which is encoded as 0 to 14 -@@ -458,6 +461,7 @@ bool CsrcAudioLevel::Write(rtc::ArrayView<uint8_t> data, +@@ -458,6 +461,7 @@ bool CsrcAudioLevel::Write(ArrayView<uint8_t> data, // This extension if used must have at least one audio level return csrcAudioLevels.numAudioLevels; } diff --git a/third_party/libwebrtc/moz-patch-stack/s0073.patch b/third_party/libwebrtc/moz-patch-stack/s0073.patch @@ -10,7 +10,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/91d9e8b6a5c430a73 1 file changed, 9 insertions(+) diff --git a/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc b/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc -index 9fe88fdabd..86544690b2 100644 +index 9fe88fdabd..001a873e20 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc +++ b/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc @@ -34,6 +34,7 @@ @@ -27,12 +27,12 @@ index 9fe88fdabd..86544690b2 100644 } + // Wait until all pending tasks are executed, to ensure that the last ref + // standing is not on the transformation queue. -+ rtc::Event flush; ++ Event flush; + transformation_queue_->PostTask([this, &flush]() { + RTC_DCHECK_RUN_ON(transformation_queue_.get()); + flush.Set(); + }); -+ flush.Wait(rtc::Event::kForever); ++ flush.Wait(Event::kForever); } std::unique_ptr<TransformableVideoFrameInterface> CloneSenderVideoFrame( diff --git a/third_party/libwebrtc/moz-patch-stack/s0081.patch b/third_party/libwebrtc/moz-patch-stack/s0081.patch @@ -50,7 +50,7 @@ index 1e75f35909..eb5d7a8e30 100644 * Fills the membervariable _captureCapabilities with capabilites for the * given device name. diff --git a/modules/video_capture/linux/device_info_v4l2.cc b/modules/video_capture/linux/device_info_v4l2.cc -index 04caaea592..401c38f9c5 100644 +index 6755a46146..bb533c6792 100644 --- a/modules/video_capture/linux/device_info_v4l2.cc +++ b/modules/video_capture/linux/device_info_v4l2.cc @@ -232,7 +232,8 @@ int32_t DeviceInfoV4l2::GetDeviceName(uint32_t deviceNumber, @@ -64,7 +64,7 @@ index 04caaea592..401c38f9c5 100644 uint32_t count = 0; char device[20]; diff --git a/modules/video_capture/linux/device_info_v4l2.h b/modules/video_capture/linux/device_info_v4l2.h -index 0bec3eb765..55415845ad 100644 +index 60df9bb244..243b0c999d 100644 --- a/modules/video_capture/linux/device_info_v4l2.h +++ b/modules/video_capture/linux/device_info_v4l2.h @@ -36,7 +36,8 @@ class DeviceInfoV4l2 : public DeviceInfoImpl {