Remove redundant webrtc:: prefixes in modules/video_coding/codecs/h264
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: If54d6c216a3335b3e7225fbc57cd1d1b46d3e06c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/396202
Auto-Submit: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Evan Shrubsole <eshr@webrtc.org>
Commit-Queue: Evan Shrubsole <eshr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#44891}
diff --git a/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/modules/video_coding/codecs/h264/h264_decoder_impl.cc
index f3737a1..b6c8417 100644
--- a/modules/video_coding/codecs/h264/h264_decoder_impl.cc
+++ b/modules/video_coding/codecs/h264/h264_decoder_impl.cc
@@ -119,13 +119,13 @@
// http://crbug.com/390941. Our pool is set up to zero-initialize new buffers.
// TODO(https://crbug.com/390941): Delete that feature from the video pool,
// instead add an explicit call to InitializeData here.
- webrtc::scoped_refptr<PlanarYuvBuffer> frame_buffer;
- webrtc::scoped_refptr<I444Buffer> i444_buffer;
- webrtc::scoped_refptr<I420Buffer> i420_buffer;
- webrtc::scoped_refptr<I422Buffer> i422_buffer;
- webrtc::scoped_refptr<I010Buffer> i010_buffer;
- webrtc::scoped_refptr<I210Buffer> i210_buffer;
- webrtc::scoped_refptr<I410Buffer> i410_buffer;
+ scoped_refptr<PlanarYuvBuffer> frame_buffer;
+ scoped_refptr<I444Buffer> i444_buffer;
+ scoped_refptr<I420Buffer> i420_buffer;
+ scoped_refptr<I422Buffer> i422_buffer;
+ scoped_refptr<I010Buffer> i010_buffer;
+ scoped_refptr<I210Buffer> i210_buffer;
+ scoped_refptr<I410Buffer> i410_buffer;
int bytes_per_pixel = 1;
switch (context->pix_fmt) {
case AV_PIX_FMT_YUV420P:
@@ -405,44 +405,44 @@
VideoFrame* input_frame =
static_cast<VideoFrame*>(av_buffer_get_opaque(av_frame_->buf[0]));
RTC_DCHECK(input_frame);
- webrtc::scoped_refptr<VideoFrameBuffer> frame_buffer =
+ scoped_refptr<VideoFrameBuffer> frame_buffer =
input_frame->video_frame_buffer();
// Instantiate Planar YUV buffer according to video frame buffer type
- const webrtc::PlanarYuvBuffer* planar_yuv_buffer = nullptr;
- const webrtc::PlanarYuv8Buffer* planar_yuv8_buffer = nullptr;
- const webrtc::PlanarYuv16BBuffer* planar_yuv16_buffer = nullptr;
+ const PlanarYuvBuffer* planar_yuv_buffer = nullptr;
+ const PlanarYuv8Buffer* planar_yuv8_buffer = nullptr;
+ const PlanarYuv16BBuffer* planar_yuv16_buffer = nullptr;
VideoFrameBuffer::Type video_frame_buffer_type = frame_buffer->type();
switch (video_frame_buffer_type) {
case VideoFrameBuffer::Type::kI420:
planar_yuv_buffer = frame_buffer->GetI420();
planar_yuv8_buffer =
- reinterpret_cast<const webrtc::PlanarYuv8Buffer*>(planar_yuv_buffer);
+ reinterpret_cast<const PlanarYuv8Buffer*>(planar_yuv_buffer);
break;
case VideoFrameBuffer::Type::kI444:
planar_yuv_buffer = frame_buffer->GetI444();
planar_yuv8_buffer =
- reinterpret_cast<const webrtc::PlanarYuv8Buffer*>(planar_yuv_buffer);
+ reinterpret_cast<const PlanarYuv8Buffer*>(planar_yuv_buffer);
break;
case VideoFrameBuffer::Type::kI422:
planar_yuv_buffer = frame_buffer->GetI422();
planar_yuv8_buffer =
- reinterpret_cast<const webrtc::PlanarYuv8Buffer*>(planar_yuv_buffer);
+ reinterpret_cast<const PlanarYuv8Buffer*>(planar_yuv_buffer);
break;
case VideoFrameBuffer::Type::kI010:
planar_yuv_buffer = frame_buffer->GetI010();
- planar_yuv16_buffer = reinterpret_cast<const webrtc::PlanarYuv16BBuffer*>(
- planar_yuv_buffer);
+ planar_yuv16_buffer =
+ reinterpret_cast<const PlanarYuv16BBuffer*>(planar_yuv_buffer);
break;
case VideoFrameBuffer::Type::kI210:
planar_yuv_buffer = frame_buffer->GetI210();
- planar_yuv16_buffer = reinterpret_cast<const webrtc::PlanarYuv16BBuffer*>(
- planar_yuv_buffer);
+ planar_yuv16_buffer =
+ reinterpret_cast<const PlanarYuv16BBuffer*>(planar_yuv_buffer);
break;
case VideoFrameBuffer::Type::kI410:
planar_yuv_buffer = frame_buffer->GetI410();
- planar_yuv16_buffer = reinterpret_cast<const webrtc::PlanarYuv16BBuffer*>(
- planar_yuv_buffer);
+ planar_yuv16_buffer =
+ reinterpret_cast<const PlanarYuv16BBuffer*>(planar_yuv_buffer);
break;
default:
// If this code is changed to allow other video frame buffer type,
@@ -530,7 +530,7 @@
return WEBRTC_VIDEO_CODEC_ERROR;
}
- webrtc::scoped_refptr<webrtc::VideoFrameBuffer> cropped_buffer;
+ scoped_refptr<VideoFrameBuffer> cropped_buffer;
switch (video_frame_buffer_type) {
case VideoFrameBuffer::Type::kI420:
cropped_buffer = WrapI420Buffer(
diff --git a/modules/video_coding/codecs/h264/h264_decoder_impl.h b/modules/video_coding/codecs/h264/h264_decoder_impl.h
index e9da6a7..09530e7 100644
--- a/modules/video_coding/codecs/h264/h264_decoder_impl.h
+++ b/modules/video_coding/codecs/h264/h264_decoder_impl.h
@@ -98,7 +98,7 @@
bool has_reported_init_;
bool has_reported_error_;
- webrtc::H264BitstreamParser h264_bitstream_parser_;
+ H264BitstreamParser h264_bitstream_parser_;
};
} // namespace webrtc
diff --git a/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/modules/video_coding/codecs/h264/h264_encoder_impl.cc
index 7792d53..aec0f09 100644
--- a/modules/video_coding/codecs/h264/h264_encoder_impl.cc
+++ b/modules/video_coding/codecs/h264/h264_encoder_impl.cc
@@ -420,7 +420,7 @@
return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
}
- webrtc::scoped_refptr<I420BufferInterface> frame_buffer =
+ scoped_refptr<I420BufferInterface> frame_buffer =
input_frame.video_frame_buffer()->ToI420();
if (!frame_buffer) {
RTC_LOG(LS_ERROR) << "Failed to convert "
diff --git a/modules/video_coding/codecs/h264/h264_encoder_impl.h b/modules/video_coding/codecs/h264/h264_encoder_impl.h
index 2d4a953..d8f1156 100644
--- a/modules/video_coding/codecs/h264/h264_encoder_impl.h
+++ b/modules/video_coding/codecs/h264/h264_encoder_impl.h
@@ -92,14 +92,14 @@
private:
SEncParamExt CreateEncoderParams(size_t i) const;
- webrtc::H264BitstreamParser h264_bitstream_parser_;
+ H264BitstreamParser h264_bitstream_parser_;
// Reports statistics with histograms.
void ReportInit();
void ReportError();
std::vector<ISVCEncoder*> encoders_;
std::vector<SSourcePicture> pictures_;
- std::vector<webrtc::scoped_refptr<I420Buffer>> downscaled_buffers_;
+ std::vector<scoped_refptr<I420Buffer>> downscaled_buffers_;
std::vector<LayerConfig> configurations_;
std::vector<EncodedImage> encoded_images_;
std::vector<std::unique_ptr<ScalableVideoController>> svc_controllers_;
