zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use absl::make_unique and absl::WrapUnique directly

Browse Source 
Instead of going through our wrappers in ptr_util.h.

This CL was generated by the following script:

  git grep -l ptr_util | xargs perl -pi -e 's,#include "rtc_base/ptr_util.h",#include "absl/memory/memory.h",'
  git grep -l MakeUnique | xargs perl -pi -e 's,\b(rtc::)?MakeUnique\b,absl::make_unique,g'
  git grep -l WrapUnique | xargs perl -pi -e 's,\b(rtc::)?WrapUnique\b,absl::WrapUnique,g'
  git checkout -- rtc_base/ptr_util{.h,_unittest.cc}
  git cl format

Followed by manually adding dependencies on
//third_party/abseil-cpp/absl/memory until `gn check` stopped
complaining.

Bug: webrtc:9473
Change-Id: I89ccd363f070479b8c431eb2c3d404a46eaacc1c
Reviewed-on: https://webrtc-review.googlesource.com/86600
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23850}
This commit is contained in:
Karl Wiberg
2018-07-05 11:40:33 +02:00
committed by Commit Bot
parent 431f14ef69
commit 918f50c5d1
322 changed files with 1190 additions and 1057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/video_coding/codecs/h264/h264.cc
View File

@ -19,9 +19,9 @@
#include "modules/video_coding/codecs/h264/h264_encoder_impl.h"
#endif
#include "absl/memory/memory.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/ptr_util.h"
namespace webrtc {
@ -87,7 +87,7 @@ std::unique_ptr<H264Encoder> H264Encoder::Create(
#if defined(WEBRTC_USE_H264)
RTC_CHECK(g_rtc_use_h264);
RTC_LOG(LS_INFO) << "Creating H264EncoderImpl.";
return rtc::MakeUnique<H264EncoderImpl>(codec);
return absl::make_unique<H264EncoderImpl>(codec);
#else
RTC_NOTREACHED();
return nullptr;
@ -103,7 +103,7 @@ std::unique_ptr<H264Decoder> H264Decoder::Create() {
#if defined(WEBRTC_USE_H264)
RTC_CHECK(g_rtc_use_h264);
RTC_LOG(LS_INFO) << "Creating H264DecoderImpl.";
return rtc::MakeUnique<H264DecoderImpl>();
return absl::make_unique<H264DecoderImpl>();
#else
RTC_NOTREACHED();
return nullptr;

6
modules/video_coding/codecs/h264/h264_simulcast_unittest.cc
View File

@ -10,10 +10,10 @@
#include <memory>
#include "absl/memory/memory.h"
#include "api/test/create_simulcast_test_fixture.h"
#include "api/test/simulcast_test_fixture.h"
#include "modules/video_coding/codecs/h264/include/h264.h"
#include "rtc_base/ptr_util.h"
#include "test/function_video_decoder_factory.h"
#include "test/function_video_encoder_factory.h"
#include "test/gtest.h"
@ -24,10 +24,10 @@ namespace test {
namespace {
std::unique_ptr<SimulcastTestFixture> CreateSpecificSimulcastTestFixture() {
std::unique_ptr<VideoEncoderFactory> encoder_factory =
rtc::MakeUnique<FunctionVideoEncoderFactory>(
absl::make_unique<FunctionVideoEncoderFactory>(
[]() { return H264Encoder::Create(cricket::VideoCodec("H264")); });
std::unique_ptr<VideoDecoderFactory> decoder_factory =
rtc::MakeUnique<FunctionVideoDecoderFactory>(
absl::make_unique<FunctionVideoDecoderFactory>(
[]() { return H264Decoder::Create(); });
return CreateSimulcastTestFixture(std::move(encoder_factory),
std::move(decoder_factory),

10
modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc
View File

@ -8,6 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "absl/memory/memory.h"
#include "api/test/mock_video_decoder_factory.h"
#include "api/test/mock_video_encoder_factory.h"
#include "api/video_codecs/sdp_video_format.h"
@ -20,7 +21,6 @@
#include "modules/video_coding/codecs/test/video_codec_unittest.h"
#include "modules/video_coding/codecs/vp9/include/vp9.h"
#include "rtc_base/keep_ref_until_done.h"
#include "rtc_base/ptr_util.h"
#include "test/video_codec_settings.h"
using testing::_;
@ -40,12 +40,12 @@ class TestMultiplexAdapter : public VideoCodecUnitTest {
protected:
std::unique_ptr<VideoDecoder> CreateDecoder() override {
return rtc::MakeUnique<MultiplexDecoderAdapter>(
return absl::make_unique<MultiplexDecoderAdapter>(
decoder_factory_.get(), SdpVideoFormat(kMultiplexAssociatedCodecName));
}
std::unique_ptr<VideoEncoder> CreateEncoder() override {
return rtc::MakeUnique<MultiplexEncoderAdapter>(
return absl::make_unique<MultiplexEncoderAdapter>(
encoder_factory_.get(), SdpVideoFormat(kMultiplexAssociatedCodecName));
}
@ -65,7 +65,7 @@ class TestMultiplexAdapter : public VideoCodecUnitTest {
yuv_buffer->StrideY(), yuv_buffer->DataU(), yuv_buffer->StrideU(),
yuv_buffer->DataV(), yuv_buffer->StrideV(), yuv_buffer->DataY(),
yuv_buffer->StrideY(), rtc::KeepRefUntilDone(yuv_buffer));
return rtc::WrapUnique<VideoFrame>(
return absl::WrapUnique<VideoFrame>(
new VideoFrame(yuva_buffer, 123 /* RTP timestamp */,
345 /* render_time_ms */, kVideoRotation_0));
}
@ -78,7 +78,7 @@ class TestMultiplexAdapter : public VideoCodecUnitTest {
yuva_buffer->StrideA(), yuva_buffer->DataU(), yuva_buffer->StrideU(),
yuva_buffer->DataV(), yuva_buffer->StrideV(),
rtc::KeepRefUntilDone(yuva_frame.video_frame_buffer()));
return rtc::WrapUnique<VideoFrame>(
return absl::WrapUnique<VideoFrame>(
new VideoFrame(axx_buffer, 123 /* RTP timestamp */,
345 /* render_time_ms */, kVideoRotation_0));
}

8
modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
View File

@ -14,6 +14,7 @@
#include <memory>
#include <utility>
#include "absl/memory/memory.h"
#include "api/video_codecs/sdp_video_format.h"
#include "call/video_config.h"
#include "common_types.h" // NOLINT(build/include)
@ -28,7 +29,6 @@
#include "rtc_base/cpu_time.h"
#include "rtc_base/event.h"
#include "rtc_base/file.h"
#include "rtc_base/ptr_util.h"
#include "rtc_base/strings/string_builder.h"
#include "system_wrappers/include/cpu_info.h"
#include "system_wrappers/include/sleep.h"
@ -380,8 +380,8 @@ class VideoCodecTestFixtureImpl::CpuProcessTime final {
};
VideoCodecTestFixtureImpl::VideoCodecTestFixtureImpl(Config config)
: encoder_factory_(rtc::MakeUnique<InternalEncoderFactory>()),
decoder_factory_(rtc::MakeUnique<InternalDecoderFactory>()),
: encoder_factory_(absl::make_unique<InternalEncoderFactory>()),
decoder_factory_(absl::make_unique<InternalDecoderFactory>()),
config_(config) {}
VideoCodecTestFixtureImpl::VideoCodecTestFixtureImpl(
@ -647,7 +647,7 @@ void VideoCodecTestFixtureImpl::SetUpAndInitObjects(
task_queue->SendTask([this]() {
CreateEncoderAndDecoder();
processor_ = rtc::MakeUnique<VideoProcessor>(
processor_ = absl::make_unique<VideoProcessor>(
encoder_.get(), &decoders_, source_frame_reader_.get(), config_,
&stats_,
encoded_frame_writers_.empty() ? nullptr : &encoded_frame_writers_,

34
modules/video_coding/codecs/test/videocodec_test_libvpx.cc
View File

@ -10,6 +10,7 @@
#include <vector>
#include "absl/memory/memory.h"
#include "api/test/create_videocodec_test_fixture.h"
#include "api/video_codecs/sdp_video_format.h"
#include "media/base/mediaconstants.h"
@ -18,7 +19,6 @@
#include "media/engine/simulcast_encoder_adapter.h"
#include "modules/video_coding/utility/vp8_header_parser.h"
#include "modules/video_coding/utility/vp9_uncompressed_header_parser.h"
#include "rtc_base/ptr_util.h"
#include "test/function_video_encoder_factory.h"
#include "test/gtest.h"
#include "test/testsupport/fileutils.h"
@ -98,7 +98,7 @@ TEST(VideoCodecTestLibvpx, HighBitrateVP9) {
config.SetCodecSettings(cricket::kVp9CodecName, 1, 1, 1, false, true, false,
kCifWidth, kCifHeight);
config.num_frames = kNumFramesShort;
const auto frame_checker = rtc::MakeUnique<QpFrameChecker>();
const auto frame_checker = absl::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@ -116,7 +116,7 @@ TEST(VideoCodecTestLibvpx, ChangeBitrateVP9) {
auto config = CreateConfig();
config.SetCodecSettings(cricket::kVp9CodecName, 1, 1, 1, false, true, false,
kCifWidth, kCifHeight);
const auto frame_checker = rtc::MakeUnique<QpFrameChecker>();
const auto frame_checker = absl::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@ -140,7 +140,7 @@ TEST(VideoCodecTestLibvpx, ChangeFramerateVP9) {
auto config = CreateConfig();
config.SetCodecSettings(cricket::kVp9CodecName, 1, 1, 1, false, true, false,
kCifWidth, kCifHeight);
const auto frame_checker = rtc::MakeUnique<QpFrameChecker>();
const auto frame_checker = absl::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@ -167,7 +167,7 @@ TEST(VideoCodecTestLibvpx, DenoiserOnVP9) {
config.SetCodecSettings(cricket::kVp9CodecName, 1, 1, 1, true, true, false,
kCifWidth, kCifHeight);
config.num_frames = kNumFramesShort;
const auto frame_checker = rtc::MakeUnique<QpFrameChecker>();
const auto frame_checker = absl::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@ -185,7 +185,7 @@ TEST(VideoCodecTestLibvpx, VeryLowBitrateVP9) {
auto config = CreateConfig();
config.SetCodecSettings(cricket::kVp9CodecName, 1, 1, 1, false, true, true,
kCifWidth, kCifHeight);
const auto frame_checker = rtc::MakeUnique<QpFrameChecker>();
const auto frame_checker = absl::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@ -209,7 +209,7 @@ TEST(VideoCodecTestLibvpx, HighBitrateVP8) {
config.SetCodecSettings(cricket::kVp8CodecName, 1, 1, 1, true, true, false,
kCifWidth, kCifHeight);
config.num_frames = kNumFramesShort;
const auto frame_checker = rtc::MakeUnique<QpFrameChecker>();
const auto frame_checker = absl::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@ -245,7 +245,7 @@ TEST(VideoCodecTestLibvpx, MAYBE_ChangeBitrateVP8) {
auto config = CreateConfig();
config.SetCodecSettings(cricket::kVp8CodecName, 1, 1, 1, true, true, false,
kCifWidth, kCifHeight);
const auto frame_checker = rtc::MakeUnique<QpFrameChecker>();
const auto frame_checker = absl::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@ -279,7 +279,7 @@ TEST(VideoCodecTestLibvpx, MAYBE_ChangeFramerateVP8) {
auto config = CreateConfig();
config.SetCodecSettings(cricket::kVp8CodecName, 1, 1, 1, true, true, false,
kCifWidth, kCifHeight);
const auto frame_checker = rtc::MakeUnique<QpFrameChecker>();
const auto frame_checker = absl::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@ -318,7 +318,7 @@ TEST(VideoCodecTestLibvpx, MAYBE_TemporalLayersVP8) {
auto config = CreateConfig();
config.SetCodecSettings(cricket::kVp8CodecName, 1, 1, 3, true, true, false,
kCifWidth, kCifHeight);
const auto frame_checker = rtc::MakeUnique<QpFrameChecker>();
const auto frame_checker = absl::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@ -356,7 +356,7 @@ TEST(VideoCodecTestLibvpx, MAYBE_MultiresVP8) {
config.num_frames = 100;
config.SetCodecSettings(cricket::kVp8CodecName, 3, 1, 3, true, true, false,
1280, 720);
const auto frame_checker = rtc::MakeUnique<QpFrameChecker>();
const auto frame_checker = absl::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@ -381,13 +381,13 @@ TEST(VideoCodecTestLibvpx, MAYBE_SimulcastVP8) {
config.num_frames = 100;
config.SetCodecSettings(cricket::kVp8CodecName, 3, 1, 3, true, true, false,
1280, 720);
const auto frame_checker = rtc::MakeUnique<QpFrameChecker>();
const auto frame_checker = absl::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
InternalEncoderFactory internal_encoder_factory;
std::unique_ptr<VideoEncoderFactory> adapted_encoder_factory =
rtc::MakeUnique<FunctionVideoEncoderFactory>([&]() {
return rtc::MakeUnique<SimulcastEncoderAdapter>(
absl::make_unique<FunctionVideoEncoderFactory>([&]() {
return absl::make_unique<SimulcastEncoderAdapter>(
&internal_encoder_factory, SdpVideoFormat(cricket::kVp8CodecName));
});
std::unique_ptr<InternalDecoderFactory> internal_decoder_factory(
@ -418,7 +418,7 @@ TEST(VideoCodecTestLibvpx, MAYBE_SvcVP9) {
config.num_frames = 100;
config.SetCodecSettings(cricket::kVp9CodecName, 1, 3, 3, true, true, false,
1280, 720);
const auto frame_checker = rtc::MakeUnique<QpFrameChecker>();
const auto frame_checker = absl::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@ -439,7 +439,7 @@ TEST(VideoCodecTestLibvpx, DISABLED_MultiresVP8RdPerf) {
config.print_frame_level_stats = true;
config.SetCodecSettings(cricket::kVp8CodecName, 3, 1, 3, true, true, false,
1280, 720);
const auto frame_checker = rtc::MakeUnique<QpFrameChecker>();
const auto frame_checker = absl::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@ -466,7 +466,7 @@ TEST(VideoCodecTestLibvpx, DISABLED_SvcVP9RdPerf) {
config.print_frame_level_stats = true;
config.SetCodecSettings(cricket::kVp9CodecName, 1, 3, 3, true, true, false,
1280, 720);
const auto frame_checker = rtc::MakeUnique<QpFrameChecker>();
const auto frame_checker = absl::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);

6
modules/video_coding/codecs/test/videocodec_test_mediacodec.cc
View File

@ -12,12 +12,12 @@
#include <tuple>
#include <vector>
#include "absl/memory/memory.h"
#include "api/test/create_videocodec_test_fixture.h"
#include "common_types.h" // NOLINT(build/include)
#include "media/base/mediaconstants.h"
#include "modules/video_coding/codecs/test/android_codec_factory_helper.h"
#include "modules/video_coding/codecs/test/videocodec_test_fixture_impl.h"
#include "rtc_base/ptr_util.h"
#include "test/gtest.h"
#include "test/testsupport/fileutils.h"
@ -71,7 +71,7 @@ TEST(VideoCodecTestMediaCodec, ForemanCif500kbpsVp8) {
TEST(VideoCodecTestMediaCodec, ForemanCif500kbpsH264CBP) {
auto config = CreateConfig();
const auto frame_checker =
rtc::MakeUnique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
absl::make_unique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
config.encoded_frame_checker = frame_checker.get();
config.SetCodecSettings(cricket::kH264CodecName, 1, 1, 1, false, false, false,
352, 288);
@ -96,7 +96,7 @@ TEST(VideoCodecTestMediaCodec, ForemanCif500kbpsH264CBP) {
TEST(VideoCodecTestMediaCodec, DISABLED_ForemanCif500kbpsH264CHP) {
auto config = CreateConfig();
const auto frame_checker =
rtc::MakeUnique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
absl::make_unique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
config.h264_codec_settings.profile = H264::kProfileConstrainedHigh;
config.encoded_frame_checker = frame_checker.get();

4
modules/video_coding/codecs/test/videocodec_test_openh264.cc
View File

@ -40,7 +40,7 @@ VideoCodecTestFixture::Config CreateConfig() {
TEST(VideoCodecTestOpenH264, ConstantHighBitrate) {
auto frame_checker =
rtc::MakeUnique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
absl::make_unique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
auto config = CreateConfig();
config.SetCodecSettings(cricket::kH264CodecName, 1, 1, 1, false, true, false,
kCifWidth, kCifHeight);
@ -61,7 +61,7 @@ TEST(VideoCodecTestOpenH264, ConstantHighBitrate) {
// large frames into multiple slices and limit length of NAL units.
TEST(VideoCodecTestOpenH264, SingleNalUnit) {
auto frame_checker =
rtc::MakeUnique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
absl::make_unique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
auto config = CreateConfig();
config.h264_codec_settings.packetization_mode =
H264PacketizationMode::SingleNalUnit;

4
modules/video_coding/codecs/test/videocodec_test_videotoolbox.cc
View File

@ -54,7 +54,7 @@ std::unique_ptr<VideoCodecTestFixture> CreateTestFixtureWithConfig(
// longer in use.
MAYBE_TEST(VideoCodecTestVideoToolbox, ForemanCif500kbpsH264CBP) {
const auto frame_checker =
rtc::MakeUnique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
absl::make_unique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
auto config = CreateConfig();
config.SetCodecSettings(cricket::kH264CodecName, 1, 1, 1, false, false, false,
352, 288);
@ -70,7 +70,7 @@ MAYBE_TEST(VideoCodecTestVideoToolbox, ForemanCif500kbpsH264CBP) {
MAYBE_TEST(VideoCodecTestVideoToolbox, ForemanCif500kbpsH264CHP) {
const auto frame_checker =
rtc::MakeUnique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
absl::make_unique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
auto config = CreateConfig();
config.h264_codec_settings.profile = H264::kProfileConstrainedHigh;
config.SetCodecSettings(cricket::kH264CodecName, 1, 1, 1, false, false, false,

2
modules/video_coding/codecs/test/videoprocessor.cc
View File

@ -219,7 +219,7 @@ VideoProcessor::VideoProcessor(webrtc::VideoEncoder* encoder,
for (size_t i = 0; i < num_simulcast_or_spatial_layers_; ++i) {
decode_callback_.push_back(
rtc::MakeUnique<VideoProcessorDecodeCompleteCallback>(this, i));
absl::make_unique<VideoProcessorDecodeCompleteCallback>(this, i));
RTC_CHECK_EQ(
decoders_->at(i)->InitDecode(&config_.codec_settings,
static_cast<int>(config_.NumberOfCores())),

4
modules/video_coding/codecs/test/videoprocessor_unittest.cc
View File

@ -10,6 +10,7 @@
#include <memory>
#include "absl/memory/memory.h"
#include "api/test/videocodec_test_fixture.h"
#include "api/video/i420_buffer.h"
#include "common_types.h" // NOLINT(build/include)
@ -19,7 +20,6 @@
#include "modules/video_coding/include/mock/mock_video_codec_interface.h"
#include "modules/video_coding/include/video_coding.h"
#include "rtc_base/event.h"
#include "rtc_base/ptr_util.h"
#include "rtc_base/task_queue_for_test.h"
#include "test/gmock.h"
#include "test/gtest.h"
@ -54,7 +54,7 @@ class VideoProcessorTest : public testing::Test {
EXPECT_CALL(frame_reader_mock_, FrameLength())
.WillRepeatedly(Return(kFrameSize));
q_.SendTask([this] {
video_processor_ = rtc::MakeUnique<VideoProcessor>(
video_processor_ = absl::make_unique<VideoProcessor>(
&encoder_mock_, &decoders_, &frame_reader_mock_, config_, &stats_,
nullptr /* encoded_frame_writer */,
nullptr /* decoded_frame_writer */);

4
modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
View File

@ -11,11 +11,11 @@
#include <algorithm>
#include <string>
#include "absl/memory/memory.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
#include "modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h"
#include "rtc_base/checks.h"
#include "rtc_base/numerics/exp_filter.h"
#include "rtc_base/ptr_util.h"
#include "rtc_base/timeutils.h"
#include "system_wrappers/include/field_trial.h"
#include "system_wrappers/include/metrics.h"
@ -56,7 +56,7 @@ void GetPostProcParamsFromFieldTrialGroup(
} // namespace
std::unique_ptr<VP8Decoder> VP8Decoder::Create() {
return rtc::MakeUnique<LibvpxVp8Decoder>();
return absl::make_unique<LibvpxVp8Decoder>();
}
class LibvpxVp8Decoder::QpSmoother {

4
modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
View File

@ -12,12 +12,12 @@
#include <string>
#include <vector>
#include "absl/memory/memory.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
#include "modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h"
#include "modules/video_coding/utility/simulcast_rate_allocator.h"
#include "modules/video_coding/utility/simulcast_utility.h"
#include "rtc_base/checks.h"
#include "rtc_base/ptr_util.h"
#include "rtc_base/timeutils.h"
#include "rtc_base/trace_event.h"
#include "system_wrappers/include/field_trial.h"
@ -123,7 +123,7 @@ bool UpdateVpxConfiguration(TemporalLayers* temporal_layers,
} // namespace
std::unique_ptr<VP8Encoder> VP8Encoder::Create() {
return rtc::MakeUnique<LibvpxVp8Encoder>();
return absl::make_unique<LibvpxVp8Encoder>();
}
vpx_enc_frame_flags_t LibvpxVp8Encoder::EncodeFlags(

6
modules/video_coding/codecs/vp8/libvpx_vp8_simulcast_test.cc
View File

@ -10,10 +10,10 @@
#include <memory>
#include "absl/memory/memory.h"
#include "api/test/create_simulcast_test_fixture.h"
#include "api/test/simulcast_test_fixture.h"
#include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "rtc_base/ptr_util.h"
#include "test/function_video_decoder_factory.h"
#include "test/function_video_encoder_factory.h"
#include "test/gtest.h"
@ -24,10 +24,10 @@ namespace test {
namespace {
std::unique_ptr<SimulcastTestFixture> CreateSpecificSimulcastTestFixture() {
std::unique_ptr<VideoEncoderFactory> encoder_factory =
rtc::MakeUnique<FunctionVideoEncoderFactory>(
absl::make_unique<FunctionVideoEncoderFactory>(
[]() { return VP8Encoder::Create(); });
std::unique_ptr<VideoDecoderFactory> decoder_factory =
rtc::MakeUnique<FunctionVideoDecoderFactory>(
absl::make_unique<FunctionVideoDecoderFactory>(
[]() { return VP8Decoder::Create(); });
return CreateSimulcastTestFixture(std::move(encoder_factory),
std::move(decoder_factory),

10
modules/video_coding/codecs/vp8/temporal_layers.cc
View File

@ -14,13 +14,13 @@
#include <set>
#include <vector>
#include "absl/memory/memory.h"
#include "modules/include/module_common_types.h"
#include "modules/video_coding/codecs/vp8/default_temporal_layers.h"
#include "modules/video_coding/codecs/vp8/screenshare_layers.h"
#include "modules/video_coding/include/video_codec_interface.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/ptr_util.h"
#include "system_wrappers/include/clock.h"
#include "system_wrappers/include/field_trial.h"
@ -51,10 +51,10 @@ std::unique_ptr<TemporalLayers> TemporalLayers::CreateTemporalLayers(
size_t spatial_id) {
if (IsConferenceModeScreenshare(codec) && spatial_id == 0) {
// Conference mode temporal layering for screen content in base stream.
return rtc::MakeUnique<ScreenshareLayers>(2, Clock::GetRealTimeClock());
return absl::make_unique<ScreenshareLayers>(2, Clock::GetRealTimeClock());
}
return rtc::MakeUnique<DefaultTemporalLayers>(
return absl::make_unique<DefaultTemporalLayers>(
NumTemporalLayers(codec, spatial_id));
}
@ -64,10 +64,10 @@ TemporalLayers::CreateTemporalLayersChecker(const VideoCodec& codec,
if (IsConferenceModeScreenshare(codec) && spatial_id == 0) {
// Conference mode temporal layering for screen content in base stream,
// use generic checker.
return rtc::MakeUnique<TemporalLayersChecker>(2);
return absl::make_unique<TemporalLayersChecker>(2);
}
return rtc::MakeUnique<DefaultTemporalLayersChecker>(
return absl::make_unique<DefaultTemporalLayersChecker>(
NumTemporalLayers(codec, spatial_id));
}

8
modules/video_coding/codecs/vp9/vp9_impl.cc
View File

@ -20,6 +20,7 @@
#include "vpx/vpx_decoder.h"
#include "vpx/vpx_encoder.h"
#include "absl/memory/memory.h"
#include "common_video/include/video_frame_buffer.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
@ -27,7 +28,6 @@
#include "rtc_base/checks.h"
#include "rtc_base/keep_ref_until_done.h"
#include "rtc_base/logging.h"
#include "rtc_base/ptr_util.h"
#include "rtc_base/timeutils.h"
#include "rtc_base/trace_event.h"
@ -59,12 +59,12 @@ std::vector<SdpVideoFormat> SupportedVP9Codecs() {
}
std::unique_ptr<VP9Encoder> VP9Encoder::Create() {
return rtc::MakeUnique<VP9EncoderImpl>(cricket::VideoCodec());
return absl::make_unique<VP9EncoderImpl>(cricket::VideoCodec());
}
std::unique_ptr<VP9Encoder> VP9Encoder::Create(
const cricket::VideoCodec& codec) {
return rtc::MakeUnique<VP9EncoderImpl>(codec);
return absl::make_unique<VP9EncoderImpl>(codec);
}
void VP9EncoderImpl::EncoderOutputCodedPacketCallback(vpx_codec_cx_pkt* pkt,
@ -971,7 +971,7 @@ const char* VP9EncoderImpl::ImplementationName() const {
}
std::unique_ptr<VP9Decoder> VP9Decoder::Create() {
return rtc::MakeUnique<VP9DecoderImpl>();
return absl::make_unique<VP9DecoderImpl>();
}
VP9DecoderImpl::VP9DecoderImpl()