Use absl::make_unique and absl::WrapUnique directly
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}diff --git a/video/BUILD.gn b/video/BUILD.gn
index c64697f..1b8221e 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -83,6 +83,7 @@
"../rtc_base/system:fallthrough",
"../system_wrappers:field_trial_api",
"../system_wrappers:metrics_api",
+ "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
# For RtxReceiveStream.
@@ -129,6 +130,7 @@
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_task_queue_api",
"../system_wrappers:system_wrappers",
+ "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -425,6 +427,7 @@
"../test:test_support",
"../test:video_test_common",
"//testing/gtest",
+ "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
if (!build_with_chromium && is_clang) {
diff --git a/video/end_to_end_tests/call_operation_tests.cc b/video/end_to_end_tests/call_operation_tests.cc
index dad4c42..c0e1ffa 100644
--- a/video/end_to_end_tests/call_operation_tests.cc
+++ b/video/end_to_end_tests/call_operation_tests.cc
@@ -115,9 +115,9 @@
&receiver_transport]() {
CreateCalls(Call::Config(event_log_.get()), Call::Config(event_log_.get()));
- sender_transport = rtc::MakeUnique<test::DirectTransport>(
+ sender_transport = absl::make_unique<test::DirectTransport>(
&task_queue_, sender_call_.get(), payload_type_map_);
- receiver_transport = rtc::MakeUnique<test::DirectTransport>(
+ receiver_transport = absl::make_unique<test::DirectTransport>(
&task_queue_, receiver_call_.get(), payload_type_map_);
sender_transport->SetReceiver(receiver_call_->Receiver());
receiver_transport->SetReceiver(sender_call_->Receiver());
@@ -175,9 +175,9 @@
&sender_transport, &receiver_transport]() {
CreateCalls(Call::Config(event_log_.get()), Call::Config(event_log_.get()));
- sender_transport = rtc::MakeUnique<test::DirectTransport>(
+ sender_transport = absl::make_unique<test::DirectTransport>(
&task_queue_, sender_call_.get(), payload_type_map_);
- receiver_transport = rtc::MakeUnique<test::DirectTransport>(
+ receiver_transport = absl::make_unique<test::DirectTransport>(
&task_queue_, receiver_call_.get(), payload_type_map_);
sender_transport->SetReceiver(receiver_call_->Receiver());
receiver_transport->SetReceiver(sender_call_->Receiver());
@@ -242,9 +242,9 @@
task_queue_.SendTask([&]() {
CreateCalls(Call::Config(event_log_.get()), Call::Config(event_log_.get()));
- sender_transport = rtc::MakeUnique<test::DirectTransport>(
+ sender_transport = absl::make_unique<test::DirectTransport>(
&task_queue_, sender_call_.get(), payload_type_map_);
- receiver_transport = rtc::MakeUnique<test::DirectTransport>(
+ receiver_transport = absl::make_unique<test::DirectTransport>(
&task_queue_, receiver_call_.get(), payload_type_map_);
sender_transport->SetReceiver(receiver_call_->Receiver());
receiver_transport->SetReceiver(sender_call_->Receiver());
diff --git a/video/end_to_end_tests/codec_tests.cc b/video/end_to_end_tests/codec_tests.cc
index 71034cc..ab246f6 100644
--- a/video/end_to_end_tests/codec_tests.cc
+++ b/video/end_to_end_tests/codec_tests.cc
@@ -142,12 +142,12 @@
InternalDecoderFactory decoder_factory;
test::FunctionVideoEncoderFactory encoder_factory(
[&internal_encoder_factory]() {
- return rtc::MakeUnique<MultiplexEncoderAdapter>(
+ return absl::make_unique<MultiplexEncoderAdapter>(
&internal_encoder_factory, SdpVideoFormat(cricket::kVp9CodecName));
});
CodecObserver test(
5, kVideoRotation_0, "multiplex", &encoder_factory,
- rtc::MakeUnique<MultiplexDecoderAdapter>(
+ absl::make_unique<MultiplexDecoderAdapter>(
&decoder_factory, SdpVideoFormat(cricket::kVp9CodecName)));
RunBaseTest(&test);
}
@@ -157,12 +157,12 @@
InternalDecoderFactory decoder_factory;
test::FunctionVideoEncoderFactory encoder_factory(
[&internal_encoder_factory]() {
- return rtc::MakeUnique<MultiplexEncoderAdapter>(
+ return absl::make_unique<MultiplexEncoderAdapter>(
&internal_encoder_factory, SdpVideoFormat(cricket::kVp9CodecName));
});
CodecObserver test(
5, kVideoRotation_90, "multiplex", &encoder_factory,
- rtc::MakeUnique<MultiplexDecoderAdapter>(
+ absl::make_unique<MultiplexDecoderAdapter>(
&decoder_factory, SdpVideoFormat(cricket::kVp9CodecName)));
RunBaseTest(&test);
}
diff --git a/video/end_to_end_tests/multi_stream_tester.cc b/video/end_to_end_tests/multi_stream_tester.cc
index 92fa938..57387aa 100644
--- a/video/end_to_end_tests/multi_stream_tester.cc
+++ b/video/end_to_end_tests/multi_stream_tester.cc
@@ -53,11 +53,11 @@
[]() { return VP8Encoder::Create(); });
task_queue_->SendTask([&]() {
- sender_call = rtc::WrapUnique(Call::Create(config));
- receiver_call = rtc::WrapUnique(Call::Create(config));
+ sender_call = absl::WrapUnique(Call::Create(config));
+ receiver_call = absl::WrapUnique(Call::Create(config));
sender_transport =
- rtc::WrapUnique(CreateSendTransport(task_queue_, sender_call.get()));
- receiver_transport = rtc::WrapUnique(
+ absl::WrapUnique(CreateSendTransport(task_queue_, sender_call.get()));
+ receiver_transport = absl::WrapUnique(
CreateReceiveTransport(task_queue_, receiver_call.get()));
sender_transport->SetReceiver(receiver_call->Receiver());
diff --git a/video/end_to_end_tests/network_state_tests.cc b/video/end_to_end_tests/network_state_tests.cc
index 9af0c47..0b2be4b 100644
--- a/video/end_to_end_tests/network_state_tests.cc
+++ b/video/end_to_end_tests/network_state_tests.cc
@@ -114,7 +114,7 @@
Call::Config config(event_log_.get());
CreateCalls(config, config);
receiver_call_->SignalChannelNetworkState(network_to_bring_up, kNetworkUp);
- sender_transport = rtc::MakeUnique<test::DirectTransport>(
+ sender_transport = absl::make_unique<test::DirectTransport>(
&task_queue_, sender_call_.get(), payload_type_map_);
sender_transport->SetReceiver(receiver_call_->Receiver());
CreateSendConfig(1, 0, 0, sender_transport.get());
diff --git a/video/end_to_end_tests/rtp_rtcp_tests.cc b/video/end_to_end_tests/rtp_rtcp_tests.cc
index 1c953ac..b54cc69 100644
--- a/video/end_to_end_tests/rtp_rtcp_tests.cc
+++ b/video/end_to_end_tests/rtp_rtcp_tests.cc
@@ -275,11 +275,11 @@
&config, &one_stream, use_rtx]() {
CreateCalls(config, config);
- send_transport = rtc::MakeUnique<test::PacketTransport>(
+ send_transport = absl::make_unique<test::PacketTransport>(
&task_queue_, sender_call_.get(), &observer,
test::PacketTransport::kSender, payload_type_map_,
FakeNetworkPipe::Config());
- receive_transport = rtc::MakeUnique<test::PacketTransport>(
+ receive_transport = absl::make_unique<test::PacketTransport>(
&task_queue_, nullptr, &observer, test::PacketTransport::kReceiver,
payload_type_map_, FakeNetworkPipe::Config());
send_transport->SetReceiver(receiver_call_->Receiver());
@@ -478,13 +478,13 @@
lossy_delayed_link.loss_percent = 2;
lossy_delayed_link.queue_delay_ms = 50;
- send_transport = rtc::MakeUnique<test::PacketTransport>(
+ send_transport = absl::make_unique<test::PacketTransport>(
&task_queue_, sender_call_.get(), &observer,
test::PacketTransport::kSender, payload_type_map_, lossy_delayed_link);
send_transport->SetReceiver(receiver_call_->Receiver());
FakeNetworkPipe::Config flawless_link;
- receive_transport = rtc::MakeUnique<test::PacketTransport>(
+ receive_transport = absl::make_unique<test::PacketTransport>(
&task_queue_, nullptr, &observer, test::PacketTransport::kReceiver,
payload_type_map_, flawless_link);
receive_transport->SetReceiver(sender_call_->Receiver());
diff --git a/video/end_to_end_tests/ssrc_tests.cc b/video/end_to_end_tests/ssrc_tests.cc
index 1bd96dd..860ac78 100644
--- a/video/end_to_end_tests/ssrc_tests.cc
+++ b/video/end_to_end_tests/ssrc_tests.cc
@@ -77,12 +77,12 @@
&input_observer]() {
CreateCalls(Call::Config(event_log_.get()), Call::Config(event_log_.get()));
- send_transport = rtc::MakeUnique<test::DirectTransport>(
+ send_transport = absl::make_unique<test::DirectTransport>(
&task_queue_, sender_call_.get(), payload_type_map_);
- receive_transport = rtc::MakeUnique<test::DirectTransport>(
+ receive_transport = absl::make_unique<test::DirectTransport>(
&task_queue_, receiver_call_.get(), payload_type_map_);
input_observer =
- rtc::MakeUnique<PacketInputObserver>(receiver_call_->Receiver());
+ absl::make_unique<PacketInputObserver>(receiver_call_->Receiver());
send_transport->SetReceiver(input_observer.get());
receive_transport->SetReceiver(sender_call_->Receiver());
diff --git a/video/end_to_end_tests/stats_tests.cc b/video/end_to_end_tests/stats_tests.cc
index 8a04461..e2f7019 100644
--- a/video/end_to_end_tests/stats_tests.cc
+++ b/video/end_to_end_tests/stats_tests.cc
@@ -40,7 +40,7 @@
StatsObserver()
: EndToEndTest(kLongTimeoutMs),
encoder_factory_([]() {
- return rtc::MakeUnique<test::DelayedEncoder>(
+ return absl::make_unique<test::DelayedEncoder>(
Clock::GetRealTimeClock(), 10);
}),
send_stream_(nullptr),
@@ -712,10 +712,10 @@
FakeNetworkPipe::Config config;
config.queue_delay_ms = kSendDelayMs;
CreateCalls(Call::Config(event_log_.get()), Call::Config(event_log_.get()));
- sender_transport = rtc::MakeUnique<test::DirectTransport>(
+ sender_transport = absl::make_unique<test::DirectTransport>(
&task_queue_, config, sender_call_.get(), payload_type_map_);
config.queue_delay_ms = kReceiveDelayMs;
- receiver_transport = rtc::MakeUnique<test::DirectTransport>(
+ receiver_transport = absl::make_unique<test::DirectTransport>(
&task_queue_, config, receiver_call_.get(), payload_type_map_);
sender_transport->SetReceiver(receiver_call_->Receiver());
receiver_transport->SetReceiver(sender_call_->Receiver());
diff --git a/video/full_stack_tests.cc b/video/full_stack_tests.cc
index 79bef26..988f1e8 100644
--- a/video/full_stack_tests.cc
+++ b/video/full_stack_tests.cc
@@ -69,7 +69,7 @@
std::unique_ptr<VideoQualityTestFixtureInterface>
CreateVideoQualityTestFixture() {
- return rtc::MakeUnique<VideoQualityTest>(nullptr);
+ return absl::make_unique<VideoQualityTest>(nullptr);
}
} // namespace
diff --git a/video/overuse_frame_detector.cc b/video/overuse_frame_detector.cc
index d6055c8..77cca61 100644
--- a/video/overuse_frame_detector.cc
+++ b/video/overuse_frame_detector.cc
@@ -446,9 +446,9 @@
OveruseFrameDetector::CreateProcessingUsage(const CpuOveruseOptions& options) {
std::unique_ptr<ProcessingUsage> instance;
if (options.filter_time_ms > 0) {
- instance = rtc::MakeUnique<SendProcessingUsage2>(options);
+ instance = absl::make_unique<SendProcessingUsage2>(options);
} else {
- instance = rtc::MakeUnique<SendProcessingUsage1>(options);
+ instance = absl::make_unique<SendProcessingUsage1>(options);
}
std::string toggling_interval =
field_trial::FindFullName("WebRTC-ForceSimulatedOveruseIntervalMs");
@@ -460,7 +460,7 @@
&overuse_period_ms, &underuse_period_ms) == 3) {
if (normal_period_ms > 0 && overuse_period_ms > 0 &&
underuse_period_ms > 0) {
- instance = rtc::MakeUnique<OverdoseInjector>(
+ instance = absl::make_unique<OverdoseInjector>(
std::move(instance), normal_period_ms, overuse_period_ms,
underuse_period_ms);
} else {
diff --git a/video/overuse_frame_detector_unittest.cc b/video/overuse_frame_detector_unittest.cc
index 3fc6c17..5ebc203 100644
--- a/video/overuse_frame_detector_unittest.cc
+++ b/video/overuse_frame_detector_unittest.cc
@@ -71,7 +71,7 @@
void SetUp() override {
observer_ = &mock_observer_;
options_.min_process_count = 0;
- overuse_detector_ = rtc::MakeUnique<OveruseFrameDetectorUnderTest>(this);
+ overuse_detector_ = absl::make_unique<OveruseFrameDetectorUnderTest>(this);
// Unfortunately, we can't call SetOptions here, since that would break
// single-threading requirements in the RunOnTqNormalUsage test.
}
diff --git a/video/picture_id_tests.cc b/video/picture_id_tests.cc
index 073a560..84d0e81 100644
--- a/video/picture_id_tests.cc
+++ b/video/picture_id_tests.cc
@@ -409,7 +409,7 @@
InternalEncoderFactory internal_encoder_factory;
test::FunctionVideoEncoderFactory encoder_factory(
[&internal_encoder_factory]() {
- return rtc::MakeUnique<SimulcastEncoderAdapter>(
+ return absl::make_unique<SimulcastEncoderAdapter>(
&internal_encoder_factory, SdpVideoFormat("VP8"));
});
SetupEncoder(&encoder_factory, "VP8");
@@ -420,7 +420,7 @@
InternalEncoderFactory internal_encoder_factory;
test::FunctionVideoEncoderFactory encoder_factory(
[&internal_encoder_factory]() {
- return rtc::MakeUnique<SimulcastEncoderAdapter>(
+ return absl::make_unique<SimulcastEncoderAdapter>(
&internal_encoder_factory, SdpVideoFormat("VP8"));
});
SetupEncoder(&encoder_factory, "VP8");
@@ -431,7 +431,7 @@
InternalEncoderFactory internal_encoder_factory;
test::FunctionVideoEncoderFactory encoder_factory(
[&internal_encoder_factory]() {
- return rtc::MakeUnique<SimulcastEncoderAdapter>(
+ return absl::make_unique<SimulcastEncoderAdapter>(
&internal_encoder_factory, SdpVideoFormat("VP8"));
});
// Make sure that the picture id is not reset if the stream count goes
diff --git a/video/rtp_video_stream_receiver_unittest.cc b/video/rtp_video_stream_receiver_unittest.cc
index b6d049e..abc00eb 100644
--- a/video/rtp_video_stream_receiver_unittest.cc
+++ b/video/rtp_video_stream_receiver_unittest.cc
@@ -11,6 +11,7 @@
#include "test/gmock.h"
#include "test/gtest.h"
+#include "absl/memory/memory.h"
#include "common_video/h264/h264_common.h"
#include "media/base/mediaconstants.h"
#include "modules/pacing/packet_router.h"
@@ -22,7 +23,6 @@
#include "modules/video_coding/rtp_frame_reference_finder.h"
#include "rtc_base/bytebuffer.h"
#include "rtc_base/logging.h"
-#include "rtc_base/ptr_util.h"
#include "system_wrappers/include/clock.h"
#include "system_wrappers/include/field_trial_default.h"
#include "test/field_trial.h"
@@ -102,7 +102,7 @@
std::unique_ptr<RtpPacketReceived> CreateRtpPacketReceived(
uint32_t ssrc = kSsrc,
uint16_t sequence_number = kSequenceNumber) {
- auto packet = rtc::MakeUnique<RtpPacketReceived>();
+ auto packet = absl::make_unique<RtpPacketReceived>();
packet->SetSsrc(ssrc);
packet->SetSequenceNumber(sequence_number);
return packet;
@@ -125,8 +125,8 @@
void SetUp() {
rtp_receive_statistics_ =
- rtc::WrapUnique(ReceiveStatistics::Create(Clock::GetRealTimeClock()));
- rtp_video_stream_receiver_ = rtc::MakeUnique<RtpVideoStreamReceiver>(
+ absl::WrapUnique(ReceiveStatistics::Create(Clock::GetRealTimeClock()));
+ rtp_video_stream_receiver_ = absl::make_unique<RtpVideoStreamReceiver>(
&mock_transport_, nullptr, &packet_router_, &config_,
rtp_receive_statistics_.get(), nullptr, process_thread_.get(),
&mock_nack_sender_, &mock_key_frame_request_sender_,
diff --git a/video/screenshare_loopback.cc b/video/screenshare_loopback.cc
index 19106d3..328ed90 100644
--- a/video/screenshare_loopback.cc
+++ b/video/screenshare_loopback.cc
@@ -333,7 +333,7 @@
flags::SelectedStream(), flags::NumSpatialLayers(), flags::SelectedSL(),
flags::InterLayerPred(), SL_descriptors);
- auto fixture = rtc::MakeUnique<VideoQualityTest>(nullptr);
+ auto fixture = absl::make_unique<VideoQualityTest>(nullptr);
if (flags::DurationSecs()) {
fixture->RunWithAnalyzer(params);
} else {
diff --git a/video/sv_loopback.cc b/video/sv_loopback.cc
index 9c33610..cb77f70 100644
--- a/video/sv_loopback.cc
+++ b/video/sv_loopback.cc
@@ -578,7 +578,7 @@
flags::VideoSelectedStream(), flags::VideoNumSpatialLayers(),
flags::VideoSelectedSL(), flags::VideoInterLayerPred(), SL_descriptors);
- auto fixture = rtc::MakeUnique<VideoQualityTest>(nullptr);
+ auto fixture = absl::make_unique<VideoQualityTest>(nullptr);
if (flags::DurationSecs()) {
fixture->RunWithAnalyzer(params);
} else {
diff --git a/video/video_loopback.cc b/video/video_loopback.cc
index 2f6d66d..089c4db 100644
--- a/video/video_loopback.cc
+++ b/video/video_loopback.cc
@@ -334,7 +334,7 @@
flags::SelectedStream(), flags::NumSpatialLayers(), flags::SelectedSL(),
flags::InterLayerPred(), SL_descriptors);
- auto fixture = rtc::MakeUnique<VideoQualityTest>(nullptr);
+ auto fixture = absl::make_unique<VideoQualityTest>(nullptr);
if (flags::DurationSecs()) {
fixture->RunWithAnalyzer(params);
} else {
diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc
index ba0e23b..756fe33 100644
--- a/video/video_quality_test.cc
+++ b/video/video_quality_test.cc
@@ -1078,10 +1078,10 @@
VideoQualityTest::TestVideoEncoderFactory::CreateVideoEncoder(
const SdpVideoFormat& format) {
if (format.name == "VP8") {
- return rtc::MakeUnique<VP8EncoderSimulcastProxy>(&internal_encoder_factory_,
- format);
+ return absl::make_unique<VP8EncoderSimulcastProxy>(
+ &internal_encoder_factory_, format);
} else if (format.name == "multiplex") {
- return rtc::MakeUnique<MultiplexEncoderAdapter>(
+ return absl::make_unique<MultiplexEncoderAdapter>(
&internal_encoder_factory_, SdpVideoFormat(cricket::kVp9CodecName));
} else {
return internal_encoder_factory_.CreateVideoEncoder(format);
@@ -1837,7 +1837,7 @@
std::unique_ptr<test::LayerFilteringTransport>
VideoQualityTest::CreateSendTransport() {
- return rtc::MakeUnique<test::LayerFilteringTransport>(
+ return absl::make_unique<test::LayerFilteringTransport>(
&task_queue_, params_.pipe, sender_call_.get(), kPayloadTypeVP8,
kPayloadTypeVP9, params_.video[0].selected_tl, params_.ss[0].selected_sl,
payload_type_map_, kVideoSendSsrcs[0],
@@ -1847,7 +1847,7 @@
std::unique_ptr<test::DirectTransport>
VideoQualityTest::CreateReceiveTransport() {
- return rtc::MakeUnique<test::DirectTransport>(
+ return absl::make_unique<test::DirectTransport>(
&task_queue_, params_.pipe, receiver_call_.get(), payload_type_map_);
}
@@ -1929,11 +1929,11 @@
send_event_log_ = RtcEventLog::Create(RtcEventLog::EncodingType::Legacy);
recv_event_log_ = RtcEventLog::Create(RtcEventLog::EncodingType::Legacy);
std::unique_ptr<RtcEventLogOutputFile> send_output(
- rtc::MakeUnique<RtcEventLogOutputFile>(
+ absl::make_unique<RtcEventLogOutputFile>(
params.logging.rtc_event_log_name + "_send",
RtcEventLog::kUnlimitedOutput));
std::unique_ptr<RtcEventLogOutputFile> recv_output(
- rtc::MakeUnique<RtcEventLogOutputFile>(
+ absl::make_unique<RtcEventLogOutputFile>(
params.logging.rtc_event_log_name + "_recv",
RtcEventLog::kUnlimitedOutput));
bool event_log_started =
@@ -1963,7 +1963,7 @@
if (graph_title.empty())
graph_title = VideoQualityTest::GenerateGraphTitle();
bool is_quick_test_enabled = field_trial::IsEnabled("WebRTC-QuickPerfTest");
- analyzer = rtc::MakeUnique<VideoAnalyzer>(
+ analyzer = absl::make_unique<VideoAnalyzer>(
send_transport.get(), params_.analyzer.test_label,
params_.analyzer.avg_psnr_threshold, params_.analyzer.avg_ssim_threshold,
is_quick_test_enabled
diff --git a/video/video_receive_stream.cc b/video/video_receive_stream.cc
index 3c10c4e..bca6d94 100644
--- a/video/video_receive_stream.cc
+++ b/video/video_receive_stream.cc
@@ -16,6 +16,7 @@
#include <string>
#include <utility>
+#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "call/rtp_stream_receiver_controller_interface.h"
#include "call/rtx_receive_stream.h"
@@ -34,7 +35,6 @@
#include "rtc_base/checks.h"
#include "rtc_base/location.h"
#include "rtc_base/logging.h"
-#include "rtc_base/ptr_util.h"
#include "rtc_base/trace_event.h"
#include "system_wrappers/include/clock.h"
#include "system_wrappers/include/field_trial.h"
@@ -141,7 +141,7 @@
media_receiver_ = receiver_controller->CreateReceiver(
config_.rtp.remote_ssrc, &rtp_video_stream_receiver_);
if (config_.rtp.rtx_ssrc) {
- rtx_receive_stream_ = rtc::MakeUnique<RtxReceiveStream>(
+ rtx_receive_stream_ = absl::make_unique<RtxReceiveStream>(
&rtp_video_stream_receiver_, config.rtp.rtx_associated_payload_types,
config_.rtp.remote_ssrc, rtp_receive_statistics_.get());
rtx_receiver_ = receiver_controller->CreateReceiver(
diff --git a/video/video_send_stream.cc b/video/video_send_stream.cc
index bb6bcb5..4885fc3 100644
--- a/video/video_send_stream.cc
+++ b/video/video_send_stream.cc
@@ -77,10 +77,10 @@
content_type_(encoder_config.content_type) {
RTC_DCHECK(config_.encoder_settings.encoder_factory);
- video_stream_encoder_ = rtc::MakeUnique<VideoStreamEncoder>(
+ video_stream_encoder_ = absl::make_unique<VideoStreamEncoder>(
num_cpu_cores, &stats_proxy_, config_.encoder_settings,
config_.pre_encode_callback,
- rtc::MakeUnique<OveruseFrameDetector>(&stats_proxy_));
+ absl::make_unique<OveruseFrameDetector>(&stats_proxy_));
// TODO(srte): Initialization should not be done posted on a task queue.
// Note that the posted task must not outlive this scope since the closure
// references local variables.
diff --git a/video/video_send_stream_impl.cc b/video/video_send_stream_impl.cc
index d8798b7..462f243 100644
--- a/video/video_send_stream_impl.cc
+++ b/video/video_send_stream_impl.cc
@@ -133,7 +133,7 @@
}
RTC_DCHECK_EQ(1U, config.rtp.flexfec.protected_media_ssrcs.size());
- return rtc::MakeUnique<FlexfecSender>(
+ return absl::make_unique<FlexfecSender>(
config.rtp.flexfec.payload_type, config.rtp.flexfec.ssrc,
config.rtp.flexfec.protected_media_ssrcs[0], config.rtp.mid,
config.rtp.extensions, RTPSender::FecExtensionSizes(), rtp_state,
diff --git a/video/video_send_stream_impl_unittest.cc b/video/video_send_stream_impl_unittest.cc
index b8f6d95..b50dfec 100644
--- a/video/video_send_stream_impl_unittest.cc
+++ b/video/video_send_stream_impl_unittest.cc
@@ -76,13 +76,13 @@
.WillOnce(Return(123000));
std::map<uint32_t, RtpState> suspended_ssrcs;
std::map<uint32_t, RtpPayloadState> suspended_payload_states;
- return rtc::MakeUnique<VideoSendStreamImpl>(
+ return absl::make_unique<VideoSendStreamImpl>(
&stats_proxy_, &test_queue_, &call_stats_, &transport_controller_,
&bitrate_allocator_, &send_delay_stats_, &video_stream_encoder_,
&event_log_, &config_, initial_encoder_max_bitrate,
initial_encoder_bitrate_priority, suspended_ssrcs,
suspended_payload_states, content_type,
- rtc::MakeUnique<FecControllerDefault>(&clock_),
+ absl::make_unique<FecControllerDefault>(&clock_),
&retransmission_limiter_);
}
diff --git a/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc
index c6122a7..89c048f 100644
--- a/video/video_send_stream_tests.cc
+++ b/video/video_send_stream_tests.cc
@@ -204,7 +204,7 @@
public:
TransmissionTimeOffsetObserver()
: SendTest(kDefaultTimeoutMs), encoder_factory_([]() {
- return rtc::MakeUnique<test::DelayedEncoder>(
+ return absl::make_unique<test::DelayedEncoder>(
Clock::GetRealTimeClock(), kEncodeDelayMs);
}) {
EXPECT_TRUE(parser_->RegisterRtpHeaderExtension(
@@ -251,7 +251,7 @@
public:
TransportWideSequenceNumberObserver()
: SendTest(kDefaultTimeoutMs), encoder_factory_([]() {
- return rtc::MakeUnique<test::FakeEncoder>(
+ return absl::make_unique<test::FakeEncoder>(
Clock::GetRealTimeClock());
}) {
EXPECT_TRUE(parser_->RegisterRtpHeaderExtension(
@@ -612,7 +612,7 @@
// that the received state is actually decodable.
TEST_F(VideoSendStreamTest, DoesNotUtilizeUlpfecForH264WithNackEnabled) {
test::FunctionVideoEncoderFactory encoder_factory([]() {
- return rtc::MakeUnique<test::FakeH264Encoder>(Clock::GetRealTimeClock());
+ return absl::make_unique<test::FakeH264Encoder>(Clock::GetRealTimeClock());
});
UlpfecObserver test(false, true, true, false, "H264", &encoder_factory);
RunBaseTest(&test);
@@ -621,7 +621,7 @@
// Without retransmissions FEC for H264 is fine.
TEST_F(VideoSendStreamTest, DoesUtilizeUlpfecForH264WithoutNackEnabled) {
test::FunctionVideoEncoderFactory encoder_factory([]() {
- return rtc::MakeUnique<test::FakeH264Encoder>(Clock::GetRealTimeClock());
+ return absl::make_unique<test::FakeH264Encoder>(Clock::GetRealTimeClock());
});
UlpfecObserver test(false, false, true, true, "H264", &encoder_factory);
RunBaseTest(&test);
@@ -647,7 +647,7 @@
TEST_F(VideoSendStreamTest, SupportsUlpfecWithMultithreadedH264) {
test::FunctionVideoEncoderFactory encoder_factory([]() {
- return rtc::MakeUnique<test::MultithreadedFakeH264Encoder>(
+ return absl::make_unique<test::MultithreadedFakeH264Encoder>(
Clock::GetRealTimeClock());
});
UlpfecObserver test(false, false, true, true, "H264", &encoder_factory);
@@ -801,7 +801,7 @@
TEST_F(VideoSendStreamTest, SupportsFlexfecH264) {
test::FunctionVideoEncoderFactory encoder_factory([]() {
- return rtc::MakeUnique<test::FakeH264Encoder>(Clock::GetRealTimeClock());
+ return absl::make_unique<test::FakeH264Encoder>(Clock::GetRealTimeClock());
});
FlexfecObserver test(false, false, "H264", &encoder_factory, 1);
RunBaseTest(&test);
@@ -809,7 +809,7 @@
TEST_F(VideoSendStreamTest, SupportsFlexfecWithNackH264) {
test::FunctionVideoEncoderFactory encoder_factory([]() {
- return rtc::MakeUnique<test::FakeH264Encoder>(Clock::GetRealTimeClock());
+ return absl::make_unique<test::FakeH264Encoder>(Clock::GetRealTimeClock());
});
FlexfecObserver test(false, true, "H264", &encoder_factory, 1);
RunBaseTest(&test);
@@ -817,7 +817,7 @@
TEST_F(VideoSendStreamTest, SupportsFlexfecWithMultithreadedH264) {
test::FunctionVideoEncoderFactory encoder_factory([]() {
- return rtc::MakeUnique<test::MultithreadedFakeH264Encoder>(
+ return absl::make_unique<test::MultithreadedFakeH264Encoder>(
Clock::GetRealTimeClock());
});
diff --git a/video/video_stream_decoder_impl.cc b/video/video_stream_decoder_impl.cc
index 19e75a8..5313d6a 100644
--- a/video/video_stream_decoder_impl.cc
+++ b/video/video_stream_decoder_impl.cc
@@ -10,9 +10,9 @@
#include "video/video_stream_decoder_impl.h"
+#include "absl/memory/memory.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/mod_ops.h"
-#include "rtc_base/ptr_util.h"
namespace webrtc {
@@ -63,7 +63,7 @@
};
bookkeeping_queue_.PostTask(
- rtc::MakeUnique<OnFrameTask>(std::move(frame), this));
+ absl::make_unique<OnFrameTask>(std::move(frame), this));
return;
}
diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc
index 3bf45ca..48b823a 100644
--- a/video/video_stream_encoder.cc
+++ b/video/video_stream_encoder.cc
@@ -611,9 +611,10 @@
experimental_thresholds = QualityScalingExperiment::GetQpThresholds(
encoder_config_.codec_type);
}
- // Since the interface is non-public, MakeUnique can't do this upcast.
+ // Since the interface is non-public, absl::make_unique can't do this
+ // upcast.
AdaptationObserverInterface* observer = this;
- quality_scaler_ = rtc::MakeUnique<QualityScaler>(
+ quality_scaler_ = absl::make_unique<QualityScaler>(
observer, experimental_thresholds ? *experimental_thresholds
: *(scaling_settings.thresholds));
}
