commit 6f1452f6ec19947eed7e5ff5058aa0218b92e885
author Harald Alvestrand <hta@webrtc.org> Wed Jun 11 07:40:17 2025
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jun 11 09:50:36 2025
tree a817a73fcd5b767cea49f8ddccdd4e282156992b
parent 7eaa388658972ee1373d382199ed1082d7d1d7c3

Remove redundant webrtc:: prefixes in ['modules/video_capture', 'system_wrappers']

Created by
tools_webrtc/remove_extra_namespace.py --namespace webrtc

and manual adjustments.

This CL was uploaded by git cl split.

R=eshr@webrtc.org

No-IWYU: Refactoring
Bug: webrtc:42232595
Change-Id: I681e5c44016aeaf06e1d18cc20a4d0777e4bcd59
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/396201
Auto-Submit: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Evan Shrubsole <eshr@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Evan Shrubsole <eshr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#44889}

modules/video_capture/linux/camera_portal.cc

diff --git a/modules/video_capture/linux/camera_portal.cc b/modules/video_capture/linux/camera_portal.cc
index 106ca16..093ad82 100644
--- a/modules/video_capture/linux/camera_portal.cc
+++ b/modules/video_capture/linux/camera_portal.cc
@@ -55,7 +55,7 @@
                              GAsyncResult* result,
                              gpointer user_data);
 
-  webrtc::Mutex notifier_lock_;
+  Mutex notifier_lock_;
   CameraPortal::PortalNotifier* notifier_ RTC_GUARDED_BY(&notifier_lock_) =
       nullptr;
 
@@ -70,7 +70,7 @@
 
 CameraPortalPrivate::~CameraPortalPrivate() {
   {
-    webrtc::MutexLock lock(&notifier_lock_);
+    MutexLock lock(&notifier_lock_);
     notifier_ = nullptr;
   }
 
@@ -237,7 +237,7 @@
 }
 
 void CameraPortalPrivate::OnPortalDone(RequestResponse result, int fd) {
-  webrtc::MutexLock lock(&notifier_lock_);
+  MutexLock lock(&notifier_lock_);
   if (notifier_) {
     notifier_->OnCameraRequestResult(result, fd);
     notifier_ = nullptr;

modules/video_capture/raw_video_sink_interface.h

diff --git a/modules/video_capture/raw_video_sink_interface.h b/modules/video_capture/raw_video_sink_interface.h
index a22ca98..eb824c7 100644
--- a/modules/video_capture/raw_video_sink_interface.h
+++ b/modules/video_capture/raw_video_sink_interface.h
@@ -28,7 +28,7 @@
 
   virtual int32_t OnRawFrame(uint8_t* videoFrame,
                              size_t videoFrameLength,
-                             const webrtc::VideoCaptureCapability& frameInfo,
+                             const VideoCaptureCapability& frameInfo,
                              VideoRotation rotation,
                              int64_t captureTime) = 0;
 };

modules/video_capture/video_capture_options.cc

diff --git a/modules/video_capture/video_capture_options.cc b/modules/video_capture/video_capture_options.cc
index dd102df..0d401cc 100644
--- a/modules/video_capture/video_capture_options.cc
+++ b/modules/video_capture/video_capture_options.cc
@@ -34,8 +34,7 @@
 void VideoCaptureOptions::Init(Callback* callback) {
 #if defined(WEBRTC_USE_PIPEWIRE)
   if (allow_pipewire_) {
-    pipewire_session_ =
-        webrtc::make_ref_counted<videocapturemodule::PipeWireSession>();
+    pipewire_session_ = make_ref_counted<videocapturemodule::PipeWireSession>();
     pipewire_session_->Init(callback, pipewire_fd_);
     return;
   }

modules/video_capture/video_capture_options.h

diff --git a/modules/video_capture/video_capture_options.h b/modules/video_capture/video_capture_options.h
index d1d4ebe..14fa4be 100644
--- a/modules/video_capture/video_capture_options.h
+++ b/modules/video_capture/video_capture_options.h
@@ -22,7 +22,7 @@
 #if defined(WEBRTC_USE_PIPEWIRE)
 namespace videocapturemodule {
 class PipeWireSession;
-}
+}  // namespace videocapturemodule
 #endif
 
 // An object that stores initialization parameters for video capturers
@@ -64,7 +64,7 @@
   bool allow_pipewire() const { return allow_pipewire_; }
   void set_allow_pipewire(bool allow) { allow_pipewire_ = allow; }
   void set_pipewire_fd(int fd) { pipewire_fd_ = fd; }
-  webrtc::scoped_refptr<videocapturemodule::PipeWireSession> pipewire_session();
+  scoped_refptr<videocapturemodule::PipeWireSession> pipewire_session();
 #endif
 
  private:
@@ -74,7 +74,7 @@
 #if defined(WEBRTC_USE_PIPEWIRE)
   bool allow_pipewire_ = false;
   int pipewire_fd_ = kInvalidPipeWireFd;
-  webrtc::scoped_refptr<videocapturemodule::PipeWireSession> pipewire_session_;
+  scoped_refptr<videocapturemodule::PipeWireSession> pipewire_session_;
 #endif
 };
 

system_wrappers/include/ntp_time.h

diff --git a/system_wrappers/include/ntp_time.h b/system_wrappers/include/ntp_time.h
index c199036..5b7e023 100644
--- a/system_wrappers/include/ntp_time.h
+++ b/system_wrappers/include/ntp_time.h
@@ -65,7 +65,7 @@
 // Converts `int64_t` milliseconds to Q32.32-formatted fixed-point seconds.
 // Performs clamping if the result overflows or underflows.
 inline int64_t Int64MsToQ32x32(int64_t milliseconds) {
-  // TODO(bugs.webrtc.org/10893): Change to use `webrtc::saturated_cast` once
+  // TODO(bugs.webrtc.org/10893): Change to use `saturated_cast` once
   // the bug has been fixed.
   double result =
       std::round(milliseconds * (NtpTime::kFractionsPerSecond / 1000.0));
@@ -88,7 +88,7 @@
 // Converts `int64_t` milliseconds to UQ32.32-formatted fixed-point seconds.
 // Performs clamping if the result overflows or underflows.
 inline uint64_t Int64MsToUQ32x32(int64_t milliseconds) {
-  // TODO(bugs.webrtc.org/10893): Change to use `webrtc::saturated_cast` once
+  // TODO(bugs.webrtc.org/10893): Change to use `saturated_cast` once
   // the bug has been fixed.
   double result =
       std::round(milliseconds * (NtpTime::kFractionsPerSecond / 1000.0));