Google Git
Sign in
webrtc/src/7b785551ec7e55fbeaa2eafaa873d6453d8bef70^!/.
commit
7b785551ec7e55fbeaa2eafaa873d6453d8bef70
[log]
author
Evan Shrubsole <eshr@webrtc.org>
Fri May 09 10:34:11 2025
committer
WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com>
Fri May 09 12:24:10 2025
tree
8ac68b650cc4a49ffbbbd038fccb20d1de804d85
parent
e4e347dc78ee62bab8a8a231fd119f4ffe03672a [diff]
[cleanup] Fix redundant webrtc name specifier

This CL was uploaded by git cl split.

R=hta@webrtc.org

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

diff --git a/api/video/encoded_image.cc b/api/video/encoded_image.cc
index c5f1787..163250a 100644
--- a/api/video/encoded_image.cc
+++ b/api/video/encoded_image.cc

@@ -77,7 +77,7 @@
   timing_.encode_finish_ms = encode_finish_ms;
 }
 
-webrtc::Timestamp EncodedImage::CaptureTime() const {
+Timestamp EncodedImage::CaptureTime() const {
   return capture_time_ms_ > 0 ? Timestamp::Millis(capture_time_ms_)
                               : Timestamp::MinusInfinity();
 }

diff --git a/api/video/i010_buffer.cc b/api/video/i010_buffer.cc
index e9cbe09..59da7fb 100644
--- a/api/video/i010_buffer.cc
+++ b/api/video/i010_buffer.cc

@@ -103,7 +103,7 @@
 // static
 scoped_refptr<I010Buffer> I010Buffer::Rotate(const I010BufferInterface& src,
                                              VideoRotation rotation) {
-  if (rotation == webrtc::kVideoRotation_0)
+  if (rotation == kVideoRotation_0)
     return Copy(src);
 
   RTC_CHECK(src.DataY());
@@ -111,13 +111,11 @@
   RTC_CHECK(src.DataV());
   int rotated_width = src.width();
   int rotated_height = src.height();
-  if (rotation == webrtc::kVideoRotation_90 ||
-      rotation == webrtc::kVideoRotation_270) {
+  if (rotation == kVideoRotation_90 || rotation == kVideoRotation_270) {
     std::swap(rotated_width, rotated_height);
   }
 
-  scoped_refptr<webrtc::I010Buffer> buffer =
-      Create(rotated_width, rotated_height);
+  scoped_refptr<I010Buffer> buffer = Create(rotated_width, rotated_height);
 
   int res = libyuv::I010Rotate(
       src.DataY(), src.StrideY(), src.DataU(), src.StrideU(), src.DataV(),

diff --git a/api/video/i210_buffer.cc b/api/video/i210_buffer.cc
index c01214e..1f7919e 100644
--- a/api/video/i210_buffer.cc
+++ b/api/video/i210_buffer.cc

@@ -110,12 +110,11 @@
 
   int rotated_width = src.width();
   int rotated_height = src.height();
-  if (rotation == webrtc::kVideoRotation_90 ||
-      rotation == webrtc::kVideoRotation_270) {
+  if (rotation == kVideoRotation_90 || rotation == kVideoRotation_270) {
     std::swap(rotated_width, rotated_height);
   }
 
-  scoped_refptr<webrtc::I210Buffer> buffer =
+  scoped_refptr<I210Buffer> buffer =
       I210Buffer::Create(rotated_width, rotated_height);
 
   RTC_CHECK_EQ(0,

diff --git a/api/video/i410_buffer.cc b/api/video/i410_buffer.cc
index f6fc13f..37564b9 100644
--- a/api/video/i410_buffer.cc
+++ b/api/video/i410_buffer.cc

@@ -122,12 +122,11 @@
 
   int rotated_width = src.width();
   int rotated_height = src.height();
-  if (rotation == webrtc::kVideoRotation_90 ||
-      rotation == webrtc::kVideoRotation_270) {
+  if (rotation == kVideoRotation_90 || rotation == kVideoRotation_270) {
     std::swap(rotated_width, rotated_height);
   }
 
-  scoped_refptr<webrtc::I410Buffer> buffer =
+  scoped_refptr<I410Buffer> buffer =
       I410Buffer::Create(rotated_width, rotated_height);
 
   int res = libyuv::I410Rotate(

diff --git a/api/video/i420_buffer.cc b/api/video/i420_buffer.cc
index 39260b1..33b2ea6 100644
--- a/api/video/i420_buffer.cc
+++ b/api/video/i420_buffer.cc

@@ -120,12 +120,11 @@
 
   int rotated_width = src.width();
   int rotated_height = src.height();
-  if (rotation == webrtc::kVideoRotation_90 ||
-      rotation == webrtc::kVideoRotation_270) {
+  if (rotation == kVideoRotation_90 || rotation == kVideoRotation_270) {
     std::swap(rotated_width, rotated_height);
   }
 
-  scoped_refptr<webrtc::I420Buffer> buffer =
+  scoped_refptr<I420Buffer> buffer =
       I420Buffer::Create(rotated_width, rotated_height);
 
   RTC_CHECK_EQ(0,

diff --git a/api/video/i422_buffer.cc b/api/video/i422_buffer.cc
index 4322ace..25814a8 100644
--- a/api/video/i422_buffer.cc
+++ b/api/video/i422_buffer.cc

@@ -136,12 +136,11 @@
 
   int rotated_width = src.width();
   int rotated_height = src.height();
-  if (rotation == webrtc::kVideoRotation_90 ||
-      rotation == webrtc::kVideoRotation_270) {
+  if (rotation == kVideoRotation_90 || rotation == kVideoRotation_270) {
     std::swap(rotated_width, rotated_height);
   }
 
-  scoped_refptr<webrtc::I422Buffer> buffer =
+  scoped_refptr<I422Buffer> buffer =
       I422Buffer::Create(rotated_width, rotated_height);
 
   int res = libyuv::I422Rotate(

diff --git a/api/video/i444_buffer.cc b/api/video/i444_buffer.cc
index 7348662..ace6af1 100644
--- a/api/video/i444_buffer.cc
+++ b/api/video/i444_buffer.cc

@@ -119,12 +119,11 @@
 
   int rotated_width = src.width();
   int rotated_height = src.height();
-  if (rotation == webrtc::kVideoRotation_90 ||
-      rotation == webrtc::kVideoRotation_270) {
+  if (rotation == kVideoRotation_90 || rotation == kVideoRotation_270) {
     std::swap(rotated_width, rotated_height);
   }
 
-  scoped_refptr<webrtc::I444Buffer> buffer =
+  scoped_refptr<I444Buffer> buffer =
       I444Buffer::Create(rotated_width, rotated_height);
 
   RTC_CHECK_EQ(0,

diff --git a/api/video/rtp_video_frame_assembler.cc b/api/video/rtp_video_frame_assembler.cc
index 7d79b7a..e09688a 100644
--- a/api/video/rtp_video_frame_assembler.cc
+++ b/api/video/rtp_video_frame_assembler.cc

@@ -239,7 +239,7 @@
 bool RtpVideoFrameAssembler::Impl::ParseDependenciesDescriptorExtension(
     const RtpPacketReceived& rtp_packet,
     RTPVideoHeader& video_header) {
-  webrtc::DependencyDescriptor dependency_descriptor;
+  DependencyDescriptor dependency_descriptor;
 
   if (!rtp_packet.GetExtension<RtpDependencyDescriptorExtension>(
           video_structure_.get(), &dependency_descriptor)) {

diff --git a/api/video/video_frame.cc b/api/video/video_frame.cc
index 8483ed0..8ae4e33 100644
--- a/api/video/video_frame.cc
+++ b/api/video/video_frame.cc

@@ -265,7 +265,7 @@
 }
 
 VideoFrame::VideoFrame(const scoped_refptr<VideoFrameBuffer>& buffer,
-                       webrtc::VideoRotation rotation,
+                       VideoRotation rotation,
                        int64_t timestamp_us)
     : video_frame_buffer_(buffer),
       timestamp_rtp_(0),

diff --git a/api/video_codecs/libaom_av1_encoder_factory.cc b/api/video_codecs/libaom_av1_encoder_factory.cc
index 7652aae..f82538f 100644
--- a/api/video_codecs/libaom_av1_encoder_factory.cc
+++ b/api/video_codecs/libaom_av1_encoder_factory.cc

@@ -105,7 +105,7 @@
       const VideoEncoderFactoryInterface::StaticEncoderSettings& settings,
       const std::map<std::string, std::string>& encoder_specific_settings);
 
-  void Encode(scoped_refptr<webrtc::VideoFrameBuffer> frame_buffer,
+  void Encode(scoped_refptr<VideoFrameBuffer> frame_buffer,
               const TemporalUnitSettings& tu_settings,
               std::vector<FrameEncodeSettings> frame_settings) override;
 
@@ -269,7 +269,7 @@
 }
 
 bool ValidateEncodeParams(
-    const webrtc::VideoFrameBuffer& /* frame_buffer */,
+    const VideoFrameBuffer& /* frame_buffer */,
     const VideoEncoderInterface::TemporalUnitSettings& /* tu_settings */,
     const std::vector<VideoEncoderInterface::FrameEncodeSettings>&
         frame_settings,
@@ -537,7 +537,7 @@
 }
 
 aom_svc_params_t GetSvcParams(
-    const webrtc::VideoFrameBuffer& frame_buffer,
+    const VideoFrameBuffer& frame_buffer,
     const std::vector<VideoEncoderInterface::FrameEncodeSettings>&
         frame_settings) {
   aom_svc_params_t svc_params = {};
@@ -634,10 +634,9 @@
   return svc_params;
 }
 
-void LibaomAv1Encoder::Encode(
-    scoped_refptr<webrtc::VideoFrameBuffer> frame_buffer,
-    const TemporalUnitSettings& tu_settings,
-    std::vector<FrameEncodeSettings> frame_settings) {
+void LibaomAv1Encoder::Encode(scoped_refptr<VideoFrameBuffer> frame_buffer,
+                              const TemporalUnitSettings& tu_settings,
+                              std::vector<FrameEncodeSettings> frame_settings) {
   absl::Cleanup on_return = [&] {
     // On return call `EncodeComplete` with EncodingError result unless they
     // were already called with an EncodedData result.

diff --git a/api/video_codecs/sdp_video_format.cc b/api/video_codecs/sdp_video_format.cc
index 5c2c5da..6d70ae3 100644
--- a/api/video_codecs/sdp_video_format.cc
+++ b/api/video_codecs/sdp_video_format.cc

@@ -191,7 +191,7 @@
 }
 
 bool SdpVideoFormat::IsCodecInList(
-    ArrayView<const webrtc::SdpVideoFormat> formats) const {
+    ArrayView<const SdpVideoFormat> formats) const {
   for (const auto& format : formats) {
     if (IsSameCodec(format)) {
       return true;

diff --git a/api/video_codecs/simple_encoder_wrapper.cc b/api/video_codecs/simple_encoder_wrapper.cc
index cf0fd80..7ecec6d 100644
--- a/api/video_codecs/simple_encoder_wrapper.cc
+++ b/api/video_codecs/simple_encoder_wrapper.cc

@@ -152,10 +152,9 @@
   fps_ = fps;
 }
 
-void SimpleEncoderWrapper::Encode(
-    scoped_refptr<webrtc::VideoFrameBuffer> frame_buffer,
-    bool force_keyframe,
-    EncodeResultCallback callback) {
+void SimpleEncoderWrapper::Encode(scoped_refptr<VideoFrameBuffer> frame_buffer,
+                                  bool force_keyframe,
+                                  EncodeResultCallback callback) {
   std::vector<ScalableVideoController::LayerFrameConfig> configs =
       svc_controller_->NextFrameConfig(force_keyframe);
   std::vector<FrameEncodeSettings> encode_settings;

diff --git a/api/video_codecs/test/video_decoder_software_fallback_wrapper_unittest.cc b/api/video_codecs/test/video_decoder_software_fallback_wrapper_unittest.cc
index d452884..5ff941f 100644
--- a/api/video_codecs/test/video_decoder_software_fallback_wrapper_unittest.cc
+++ b/api/video_codecs/test/video_decoder_software_fallback_wrapper_unittest.cc

@@ -184,12 +184,12 @@
        ForwardsRegisterDecodeCompleteCallback) {
   class FakeDecodedImageCallback : public DecodedImageCallback {
     int32_t Decoded(VideoFrame& /* decodedImage */) override { return 0; }
-    int32_t Decoded(webrtc::VideoFrame& /* decodedImage */,
+    int32_t Decoded(VideoFrame& /* decodedImage */,
                     int64_t /* decode_time_ms */) override {
       RTC_DCHECK_NOTREACHED();
       return -1;
     }
-    void Decoded(webrtc::VideoFrame& /* decodedImage */,
+    void Decoded(VideoFrame& /* decodedImage */,
                  std::optional<int32_t> /* decode_time_ms */,
                  std::optional<uint8_t> /* qp */) override {
       RTC_DCHECK_NOTREACHED();

diff --git a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
index 94e31ec..903e7fe 100644
--- a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
+++ b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc

@@ -219,12 +219,11 @@
   I420Buffer::SetBlack(buffer.get());
   std::vector<VideoFrameType> types(1, VideoFrameType::kVideoFrameKey);
 
-  frame_ =
-      std::make_unique<VideoFrame>(VideoFrame::Builder()
-                                       .set_video_frame_buffer(buffer)
-                                       .set_rotation(webrtc::kVideoRotation_0)
-                                       .set_timestamp_us(0)
-                                       .build());
+  frame_ = std::make_unique<VideoFrame>(VideoFrame::Builder()
+                                            .set_video_frame_buffer(buffer)
+                                            .set_rotation(kVideoRotation_0)
+                                            .set_timestamp_us(0)
+                                            .build());
   EXPECT_EQ(expected_ret, fallback_wrapper_->Encode(*frame_, &types));
 }
 

diff --git a/api/video_codecs/video_encoder_software_fallback_wrapper.cc b/api/video_codecs/video_encoder_software_fallback_wrapper.cc
index 1ef2c60..e1b7910 100644
--- a/api/video_codecs/video_encoder_software_fallback_wrapper.cc
+++ b/api/video_codecs/video_encoder_software_fallback_wrapper.cc

@@ -144,11 +144,10 @@
 
 class VideoEncoderSoftwareFallbackWrapper final : public VideoEncoder {
  public:
-  VideoEncoderSoftwareFallbackWrapper(
-      const FieldTrialsView& field_trials,
-      std::unique_ptr<webrtc::VideoEncoder> sw_encoder,
-      std::unique_ptr<webrtc::VideoEncoder> hw_encoder,
-      bool prefer_temporal_support);
+  VideoEncoderSoftwareFallbackWrapper(const FieldTrialsView& field_trials,
+                                      std::unique_ptr<VideoEncoder> sw_encoder,
+                                      std::unique_ptr<VideoEncoder> hw_encoder,
+                                      bool prefer_temporal_support);
   ~VideoEncoderSoftwareFallbackWrapper() override;
 
   void SetFecControllerOverride(
@@ -221,8 +220,8 @@
   };
 
   EncoderState encoder_state_;
-  const std::unique_ptr<webrtc::VideoEncoder> encoder_;
-  const std::unique_ptr<webrtc::VideoEncoder> fallback_encoder_;
+  const std::unique_ptr<VideoEncoder> encoder_;
+  const std::unique_ptr<VideoEncoder> fallback_encoder_;
 
   EncodedImageCallback* callback_;
 
@@ -233,8 +232,8 @@
 
 VideoEncoderSoftwareFallbackWrapper::VideoEncoderSoftwareFallbackWrapper(
     const FieldTrialsView& field_trials,
-    std::unique_ptr<webrtc::VideoEncoder> sw_encoder,
-    std::unique_ptr<webrtc::VideoEncoder> hw_encoder,
+    std::unique_ptr<VideoEncoder> sw_encoder,
+    std::unique_ptr<VideoEncoder> hw_encoder,
     bool prefer_temporal_support)
     : encoder_state_(EncoderState::kUninitialized),
       encoder_(std::move(hw_encoder)),