Use std::make_unique instead of absl::make_unique.
WebRTC is now using C++14 so there is no need to use the Abseil version
of std::make_unique.
This CL has been created with the following steps:
git grep -l absl::make_unique | sort | uniq > /tmp/make_unique.txt
git grep -l absl::WrapUnique | sort | uniq > /tmp/wrap_unique.txt
git grep -l "#include <memory>" | sort | uniq > /tmp/memory.txt
diff --new-line-format="" --unchanged-line-format="" \
/tmp/make_unique.txt /tmp/wrap_unique.txt | sort | \
uniq > /tmp/only_make_unique.txt
diff --new-line-format="" --unchanged-line-format="" \
/tmp/only_make_unique.txt /tmp/memory.txt | \
xargs grep -l "absl/memory" > /tmp/add-memory.txt
git grep -l "\babsl::make_unique\b" | \
xargs sed -i "s/\babsl::make_unique\b/std::make_unique/g"
git checkout PRESUBMIT.py abseil-in-webrtc.md
cat /tmp/add-memory.txt | \
xargs sed -i \
's/#include "absl\/memory\/memory.h"/#include <memory>/g'
git cl format
# Manual fix order of the new inserted #include <memory>
cat /tmp/only_make_unique | xargs grep -l "#include <memory>" | \
xargs sed -i '/#include "absl\/memory\/memory.h"/d'
git ls-files | grep BUILD.gn | \
xargs sed -i '/\/\/third_party\/abseil-cpp\/absl\/memory/d'
python tools_webrtc/gn_check_autofix.py \
-m tryserver.webrtc -b linux_rel
# Repead the gn_check_autofix step for other platforms
git ls-files | grep BUILD.gn | \
xargs sed -i 's/absl\/memory:memory/absl\/memory/g'
git cl format
Bug: webrtc:10945
Change-Id: I3fe28ea80f4dd3ba3cf28effd151d5e1f19aff89
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153221
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Alessio Bazzica <alessiob@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29209}
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index cb57710..8c5fb00 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -103,7 +103,6 @@
"../../api/audio_codecs:audio_codecs_api",
"../../common_audio",
"../../rtc_base:checks",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -764,7 +763,6 @@
"../../rtc_base:rtc_numerics",
"../../rtc_base:safe_minmax",
"../../system_wrappers:field_trial",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -916,7 +914,6 @@
"../../rtc_base/system:file_wrapper",
"../../system_wrappers",
"../../system_wrappers:field_trial",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -1024,7 +1021,6 @@
"../../system_wrappers",
"../../system_wrappers:field_trial",
"../../system_wrappers:metrics",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -1098,7 +1094,6 @@
"../../test:rtp_test_utils",
"../rtp_rtcp",
"../rtp_rtcp:rtp_rtcp_format",
- "//third_party/abseil-cpp/absl/memory:memory",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -1181,7 +1176,6 @@
"../../rtc_base:rtc_base_approved",
"../rtp_rtcp",
"../rtp_rtcp:rtp_rtcp_format",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
public_deps = [
@@ -1324,7 +1318,6 @@
"../../system_wrappers",
"../../test:fileutils",
"../../test:test_support",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -1475,7 +1468,6 @@
"../../rtc_base:rtc_base_approved",
"../../test:audio_codec_mocks",
"../../test:test_support",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -1599,9 +1591,9 @@
testonly = true
deps = audio_coding_deps + [
+ "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/flags:flag",
"//third_party/abseil-cpp/absl/flags:parse",
- "//third_party/abseil-cpp/absl/memory",
":audio_coding",
":audio_encoder_cng",
":neteq_input_audio_tools",
diff --git a/modules/audio_coding/acm2/audio_coding_module_unittest.cc b/modules/audio_coding/acm2/audio_coding_module_unittest.cc
index 6b75c35..5b68085 100644
--- a/modules/audio_coding/acm2/audio_coding_module_unittest.cc
+++ b/modules/audio_coding/acm2/audio_coding_module_unittest.cc
@@ -17,7 +17,6 @@
#include <memory>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/audio_codecs/audio_encoder.h"
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
@@ -1663,7 +1662,7 @@
config.num_channels = 1;
config.payload_type = 0;
AudioEncoderPcmU encoder(config);
- auto mock_encoder = absl::make_unique<MockAudioEncoder>();
+ auto mock_encoder = std::make_unique<MockAudioEncoder>();
// Set expectations on the mock encoder and also delegate the calls to the
// real encoder.
EXPECT_CALL(*mock_encoder, SampleRateHz())
diff --git a/modules/audio_coding/audio_network_adaptor/event_log_writer.cc b/modules/audio_coding/audio_network_adaptor/event_log_writer.cc
index d6893cd..0a79484 100644
--- a/modules/audio_coding/audio_network_adaptor/event_log_writer.cc
+++ b/modules/audio_coding/audio_network_adaptor/event_log_writer.cc
@@ -14,9 +14,9 @@
#include <algorithm>
#include <cstdlib>
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "api/rtc_event_log/rtc_event.h"
#include "api/rtc_event_log/rtc_event_log.h"
@@ -69,9 +69,9 @@
}
void EventLogWriter::LogEncoderConfig(const AudioEncoderRuntimeConfig& config) {
- auto config_copy = absl::make_unique<AudioEncoderRuntimeConfig>(config);
- event_log_->Log(absl::make_unique<RtcEventAudioNetworkAdaptation>(
- std::move(config_copy)));
+ auto config_copy = std::make_unique<AudioEncoderRuntimeConfig>(config);
+ event_log_->Log(
+ std::make_unique<RtcEventAudioNetworkAdaptation>(std::move(config_copy)));
last_logged_config_ = config;
}
diff --git a/modules/audio_coding/codecs/cng/audio_encoder_cng.cc b/modules/audio_coding/codecs/cng/audio_encoder_cng.cc
index 9a29261..a4e0ffb 100644
--- a/modules/audio_coding/codecs/cng/audio_encoder_cng.cc
+++ b/modules/audio_coding/codecs/cng/audio_encoder_cng.cc
@@ -14,7 +14,6 @@
#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "modules/audio_coding/codecs/cng/webrtc_cng.h"
#include "rtc_base/checks.h"
@@ -317,7 +316,7 @@
std::unique_ptr<AudioEncoder> CreateComfortNoiseEncoder(
AudioEncoderCngConfig&& config) {
- return absl::make_unique<AudioEncoderCng>(std::move(config));
+ return std::make_unique<AudioEncoderCng>(std::move(config));
}
} // namespace webrtc
diff --git a/modules/audio_coding/codecs/opus/audio_encoder_multi_channel_opus_impl.cc b/modules/audio_coding/codecs/opus/audio_encoder_multi_channel_opus_impl.cc
index 84a62a1..0614a0b 100644
--- a/modules/audio_coding/codecs/opus/audio_encoder_multi_channel_opus_impl.cc
+++ b/modules/audio_coding/codecs/opus/audio_encoder_multi_channel_opus_impl.cc
@@ -24,7 +24,6 @@
#include <string>
#include <vector>
-#include "absl/memory/memory.h"
#include "absl/strings/match.h"
#include "modules/audio_coding/codecs/opus/audio_coder_opus_common.h"
#include "rtc_base/arraysize.h"
@@ -134,8 +133,8 @@
if (!config.IsOk()) {
return nullptr;
}
- return absl::make_unique<AudioEncoderMultiChannelOpusImpl>(config,
- payload_type);
+ return std::make_unique<AudioEncoderMultiChannelOpusImpl>(config,
+ payload_type);
}
AudioEncoderMultiChannelOpusImpl::AudioEncoderMultiChannelOpusImpl(
diff --git a/modules/audio_coding/codecs/opus/audio_encoder_opus.cc b/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
index f901d3c..70081d7 100644
--- a/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
+++ b/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
@@ -12,10 +12,10 @@
#include <algorithm>
#include <iterator>
+#include <memory>
#include <string>
#include <utility>
-#include "absl/memory/memory.h"
#include "absl/strings/match.h"
#include "modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h"
#include "modules/audio_coding/audio_network_adaptor/controller_manager.h"
@@ -244,15 +244,13 @@
if (sscanf(field_trial_string.c_str(), "Enabled-%d-%d-%f", &min_rate,
&max_rate, &slope) == 3 &&
IsValidPacketLossRate(min_rate) && IsValidPacketLossRate(max_rate)) {
- return absl::make_unique<
- AudioEncoderOpusImpl::NewPacketLossRateOptimizer>(
+ return std::make_unique<AudioEncoderOpusImpl::NewPacketLossRateOptimizer>(
ToFraction(min_rate), ToFraction(max_rate), slope);
}
RTC_LOG(LS_WARNING) << "Invalid parameters for "
<< kPacketLossOptimizationName
<< ", using default values.";
- return absl::make_unique<
- AudioEncoderOpusImpl::NewPacketLossRateOptimizer>();
+ return std::make_unique<AudioEncoderOpusImpl::NewPacketLossRateOptimizer>();
}
return nullptr;
}
@@ -300,7 +298,7 @@
const AudioEncoderOpusConfig& config,
int payload_type) {
RTC_DCHECK(config.IsOk());
- return absl::make_unique<AudioEncoderOpusImpl>(config, payload_type);
+ return std::make_unique<AudioEncoderOpusImpl>(config, payload_type);
}
absl::optional<AudioEncoderOpusConfig> AudioEncoderOpusImpl::SdpToConfig(
@@ -417,7 +415,7 @@
return DefaultAudioNetworkAdaptorCreator(config_string, event_log);
},
// We choose 5sec as initial time constant due to empirical data.
- absl::make_unique<SmoothingFilterImpl>(5000)) {}
+ std::make_unique<SmoothingFilterImpl>(5000)) {}
AudioEncoderOpusImpl::AudioEncoderOpusImpl(
const AudioEncoderOpusConfig& config,
diff --git a/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc b/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
index 3870ecd..698b441 100644
--- a/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
+++ b/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
@@ -14,7 +14,6 @@
#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "common_audio/mocks/mock_smoothing_filter.h"
#include "modules/audio_coding/audio_network_adaptor/mock/mock_audio_network_adaptor.h"
#include "modules/audio_coding/codecs/opus/audio_encoder_opus.h"
@@ -55,7 +54,7 @@
std::unique_ptr<AudioEncoderOpusStates> CreateCodec(int sample_rate_hz,
size_t num_channels) {
std::unique_ptr<AudioEncoderOpusStates> states =
- absl::make_unique<AudioEncoderOpusStates>();
+ std::make_unique<AudioEncoderOpusStates>();
states->mock_audio_network_adaptor = nullptr;
states->fake_clock.reset(new rtc::ScopedFakeClock());
states->fake_clock->SetTime(Timestamp::us(kInitialTimeUs));
diff --git a/modules/audio_coding/neteq/delay_manager.cc b/modules/audio_coding/neteq/delay_manager.cc
index afa2a3f..3fda038 100644
--- a/modules/audio_coding/neteq/delay_manager.cc
+++ b/modules/audio_coding/neteq/delay_manager.cc
@@ -15,10 +15,10 @@
#include <stdlib.h>
#include <algorithm>
+#include <memory>
#include <numeric>
#include <string>
-#include "absl/memory/memory.h"
#include "modules/audio_coding/neteq/delay_peak_detector.h"
#include "modules/audio_coding/neteq/histogram.h"
#include "modules/audio_coding/neteq/statistics_calculator.h"
@@ -149,9 +149,9 @@
const HistogramMode mode = RELATIVE_ARRIVAL_DELAY;
DelayHistogramConfig config = GetDelayHistogramConfig();
const int quantile = config.quantile;
- std::unique_ptr<Histogram> histogram = absl::make_unique<Histogram>(
+ std::unique_ptr<Histogram> histogram = std::make_unique<Histogram>(
kDelayBuckets, config.forget_factor, config.start_forget_weight);
- return absl::make_unique<DelayManager>(
+ return std::make_unique<DelayManager>(
max_packets_in_buffer, base_minimum_delay_ms, quantile, mode,
enable_rtx_handling, peak_detector, tick_timer, statistics,
std::move(histogram));
diff --git a/modules/audio_coding/neteq/delay_manager_unittest.cc b/modules/audio_coding/neteq/delay_manager_unittest.cc
index 6979789..c691fd5 100644
--- a/modules/audio_coding/neteq/delay_manager_unittest.cc
+++ b/modules/audio_coding/neteq/delay_manager_unittest.cc
@@ -14,7 +14,8 @@
#include <math.h>
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "modules/audio_coding/neteq/histogram.h"
#include "modules/audio_coding/neteq/mock/mock_delay_peak_detector.h"
#include "modules/audio_coding/neteq/mock/mock_histogram.h"
@@ -80,7 +81,7 @@
if (use_mock_histogram_) {
mock_histogram_ = new MockHistogram(kMaxIat, kForgetFactor);
std::unique_ptr<Histogram> histogram(mock_histogram_);
- dm_ = absl::make_unique<DelayManager>(
+ dm_ = std::make_unique<DelayManager>(
kMaxNumberOfPackets, kMinDelayMs, kDefaultHistogramQuantile,
histogram_mode_, enable_rtx_handling_, &detector_, &tick_timer_,
&stats_, std::move(histogram));
diff --git a/modules/audio_coding/neteq/neteq_decoder_plc_unittest.cc b/modules/audio_coding/neteq/neteq_decoder_plc_unittest.cc
index 21b15a9..49eb1cc 100644
--- a/modules/audio_coding/neteq/neteq_decoder_plc_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_decoder_plc_unittest.cc
@@ -11,10 +11,10 @@
// Test to verify correct operation when using the decoder-internal PLC.
#include <algorithm>
+#include <memory>
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h"
#include "modules/audio_coding/neteq/tools/audio_checksum.h"
@@ -156,31 +156,31 @@
// The input is mostly useless. It sends zero-samples to a PCM16b encoder,
// but the actual encoded samples will never be used by the decoder in the
// test. See below about the decoder.
- auto generator = absl::make_unique<ZeroSampleGenerator>();
+ auto generator = std::make_unique<ZeroSampleGenerator>();
constexpr int kSampleRateHz = 32000;
constexpr int kPayloadType = 100;
AudioEncoderPcm16B::Config encoder_config;
encoder_config.sample_rate_hz = kSampleRateHz;
encoder_config.payload_type = kPayloadType;
- auto encoder = absl::make_unique<AudioEncoderPcm16B>(encoder_config);
+ auto encoder = std::make_unique<AudioEncoderPcm16B>(encoder_config);
constexpr int kRunTimeMs = 10000;
- auto input = absl::make_unique<EncodeNetEqInput>(
+ auto input = std::make_unique<EncodeNetEqInput>(
std::move(generator), std::move(encoder), kRunTimeMs);
// Wrap the input in a loss function.
auto lossy_input =
- absl::make_unique<LossyInput>(loss_cadence, std::move(input));
+ std::make_unique<LossyInput>(loss_cadence, std::move(input));
// Settinng up decoders.
NetEqTest::DecoderMap decoders;
// Using a fake decoder which simply reads the output audio from a file.
- auto input_file = absl::make_unique<InputAudioFile>(
+ auto input_file = std::make_unique<InputAudioFile>(
webrtc::test::ResourcePath("audio_coding/testfile32kHz", "pcm"));
AudioDecoderPlc dec(std::move(input_file), kSampleRateHz);
// Masquerading as a PCM16b decoder.
decoders.emplace(kPayloadType, SdpAudioFormat("l16", 32000, 1));
// Output is simply a checksum calculator.
- auto output = absl::make_unique<AudioChecksumWithOutput>(checksum);
+ auto output = std::make_unique<AudioChecksumWithOutput>(checksum);
// No callback objects.
NetEqTest::Callbacks callbacks;
diff --git a/modules/audio_coding/neteq/neteq_impl_unittest.cc b/modules/audio_coding/neteq/neteq_impl_unittest.cc
index ded54bf..39c4e52 100644
--- a/modules/audio_coding/neteq/neteq_impl_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_impl_unittest.cc
@@ -14,7 +14,6 @@
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "modules/audio_coding/neteq/accelerate.h"
#include "modules/audio_coding/neteq/expand.h"
@@ -109,7 +108,7 @@
config_.max_packets_in_buffer, config_.min_delay_ms, 1020054733,
DelayManager::HistogramMode::INTER_ARRIVAL_TIME,
config_.enable_rtx_handling, delay_peak_detector_, tick_timer_,
- deps.stats.get(), absl::make_unique<Histogram>(50, 32745)));
+ deps.stats.get(), std::make_unique<Histogram>(50, 32745)));
mock_delay_manager_ = mock.get();
deps.delay_manager = std::move(mock);
}
@@ -1567,7 +1566,7 @@
new rtc::RefCountedObject<test::FunctionAudioDecoderFactory>(
[sampling_freq, speech_type]() {
std::unique_ptr<AudioDecoder> decoder =
- absl::make_unique<Decoder120ms>(sampling_freq, speech_type);
+ std::make_unique<Decoder120ms>(sampling_freq, speech_type);
RTC_CHECK_EQ(2, decoder->Channels());
return decoder;
});
diff --git a/modules/audio_coding/neteq/packet_buffer_unittest.cc b/modules/audio_coding/neteq/packet_buffer_unittest.cc
index 688ce8d..0b638bf 100644
--- a/modules/audio_coding/neteq/packet_buffer_unittest.cc
+++ b/modules/audio_coding/neteq/packet_buffer_unittest.cc
@@ -12,7 +12,8 @@
#include "modules/audio_coding/neteq/packet_buffer.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "modules/audio_coding/neteq/mock/mock_decoder_database.h"
#include "modules/audio_coding/neteq/mock/mock_statistics_calculator.h"
@@ -704,7 +705,7 @@
Packet packet_1 = gen.NextPacket(kPayloadSizeBytes, nullptr);
std::unique_ptr<MockEncodedAudioFrame> mock_audio_frame =
- absl::make_unique<MockEncodedAudioFrame>();
+ std::make_unique<MockEncodedAudioFrame>();
EXPECT_CALL(*mock_audio_frame, Duration())
.WillRepeatedly(Return(kFrameSizeSamples));
Packet packet_2 =
diff --git a/modules/audio_coding/neteq/tools/neteq_test_factory.cc b/modules/audio_coding/neteq/tools/neteq_test_factory.cc
index 8147142..3c3add4 100644
--- a/modules/audio_coding/neteq/tools/neteq_test_factory.cc
+++ b/modules/audio_coding/neteq/tools/neteq_test_factory.cc
@@ -22,7 +22,6 @@
#include <string>
#include <utility>
-#include "absl/memory/memory.h"
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "modules/audio_coding/neteq/include/neteq.h"
#include "modules/audio_coding/neteq/tools/audio_sink.h"
@@ -194,19 +193,19 @@
// If an output file is requested, open it.
std::unique_ptr<AudioSink> output;
if (!config.output_audio_filename.has_value()) {
- output = absl::make_unique<VoidAudioSink>();
+ output = std::make_unique<VoidAudioSink>();
std::cout << "No output audio file" << std::endl;
} else if (config.output_audio_filename->size() >= 4 &&
config.output_audio_filename->substr(
config.output_audio_filename->size() - 4) == ".wav") {
// Open a wav file with the known sample rate.
- output = absl::make_unique<OutputWavFile>(*config.output_audio_filename,
- *sample_rate_hz);
+ output = std::make_unique<OutputWavFile>(*config.output_audio_filename,
+ *sample_rate_hz);
std::cout << "Output WAV file: " << *config.output_audio_filename
<< std::endl;
} else {
// Open a pcm file.
- output = absl::make_unique<OutputAudioFile>(*config.output_audio_filename);
+ output = std::make_unique<OutputAudioFile>(*config.output_audio_filename);
std::cout << "Output PCM file: " << *config.output_audio_filename
<< std::endl;
}
@@ -254,9 +253,8 @@
std::unique_ptr<AudioDecoder> decoder =
decoder_factory->MakeAudioDecoder(format, codec_pair_id);
if (!decoder && format.name == "replacement") {
- decoder = absl::make_unique<FakeDecodeFromFile>(
- absl::make_unique<InputAudioFile>(
- config.replacement_audio_file),
+ decoder = std::make_unique<FakeDecodeFromFile>(
+ std::make_unique<InputAudioFile>(config.replacement_audio_file),
format.clockrate_hz, format.num_channels > 1);
}
return decoder;
@@ -274,11 +272,11 @@
// Create a text log file if needed.
std::unique_ptr<std::ofstream> text_log;
if (config.textlog_filename.has_value()) {
- text_log = absl::make_unique<std::ofstream>(*config.textlog_filename);
+ text_log = std::make_unique<std::ofstream>(*config.textlog_filename);
}
NetEqTest::Callbacks callbacks;
- stats_plotter_ = absl::make_unique<NetEqStatsPlotter>(
+ stats_plotter_ = std::make_unique<NetEqStatsPlotter>(
config.matlabplot, config.pythonplot, config.concealment_events,
config.plot_scripts_basename.value_or(""));
@@ -291,9 +289,9 @@
neteq_config.sample_rate_hz = *sample_rate_hz;
neteq_config.max_packets_in_buffer = config.max_nr_packets_in_buffer;
neteq_config.enable_fast_accelerate = config.enable_fast_accelerate;
- return absl::make_unique<NetEqTest>(neteq_config, decoder_factory, codecs,
- std::move(text_log), std::move(input),
- std::move(output), callbacks);
+ return std::make_unique<NetEqTest>(neteq_config, decoder_factory, codecs,
+ std::move(text_log), std::move(input),
+ std::move(output), callbacks);
}
} // namespace test
diff --git a/modules/audio_coding/neteq/tools/rtc_event_log_source.cc b/modules/audio_coding/neteq/tools/rtc_event_log_source.cc
index f864aa1..30f4f95 100644
--- a/modules/audio_coding/neteq/tools/rtc_event_log_source.cc
+++ b/modules/audio_coding/neteq/tools/rtc_event_log_source.cc
@@ -14,10 +14,10 @@
#include <iostream>
#include <limits>
+#include <memory>
#include <set>
#include <utility>
-#include "absl/memory/memory.h"
#include "logging/rtc_event_log/rtc_event_processor.h"
#include "modules/audio_coding/neteq/tools/packet.h"
#include "rtc_base/checks.h"
@@ -96,7 +96,7 @@
&packet_ssrcs](const webrtc::LoggedRtpPacketIncoming& incoming) {
if (!filter_.test(incoming.rtp.header.payloadType) &&
incoming.log_time_us() < first_log_end_time_us) {
- rtp_packets_.emplace_back(absl::make_unique<Packet>(
+ rtp_packets_.emplace_back(std::make_unique<Packet>(
incoming.rtp.header, incoming.rtp.total_length,
incoming.rtp.total_length - incoming.rtp.header_length,
static_cast<double>(incoming.log_time_ms())));
diff --git a/modules/audio_coding/neteq/tools/rtp_file_source.cc b/modules/audio_coding/neteq/tools/rtp_file_source.cc
index 410af27..f578065 100644
--- a/modules/audio_coding/neteq/tools/rtp_file_source.cc
+++ b/modules/audio_coding/neteq/tools/rtp_file_source.cc
@@ -18,7 +18,6 @@
#include <memory>
-#include "absl/memory/memory.h"
#include "modules/audio_coding/neteq/tools/packet.h"
#include "rtc_base/checks.h"
#include "test/rtp_file_reader.h"
@@ -66,7 +65,7 @@
std::unique_ptr<uint8_t[]> packet_memory(new uint8_t[temp_packet.length]);
memcpy(packet_memory.get(), temp_packet.data, temp_packet.length);
RtpUtility::RtpHeaderParser parser(packet_memory.get(), temp_packet.length);
- auto packet = absl::make_unique<Packet>(
+ auto packet = std::make_unique<Packet>(
packet_memory.release(), temp_packet.length,
temp_packet.original_length, temp_packet.time_ms, parser,
&rtp_header_extension_map_);
diff --git a/modules/audio_coding/test/TestRedFec.cc b/modules/audio_coding/test/TestRedFec.cc
index 5155958..d2c8d8a 100644
--- a/modules/audio_coding/test/TestRedFec.cc
+++ b/modules/audio_coding/test/TestRedFec.cc
@@ -10,9 +10,9 @@
#include "modules/audio_coding/test/TestRedFec.h"
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "absl/strings/match.h"
#include "api/audio_codecs/L16/audio_decoder_L16.h"
#include "api/audio_codecs/L16/audio_encoder_L16.h"
@@ -190,7 +190,7 @@
AudioEncoderCopyRed::Config config;
config.payload_type = red_payload_type;
config.speech_encoder = std::move(encoder);
- encoder = absl::make_unique<AudioEncoderCopyRed>(std::move(config));
+ encoder = std::make_unique<AudioEncoderCopyRed>(std::move(config));
receive_codecs.emplace(
std::make_pair(red_payload_type,
SdpAudioFormat("red", codec_format.clockrate_hz, 1)));
diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn
index 64a9ddc..b320148 100644
--- a/modules/audio_device/BUILD.gn
+++ b/modules/audio_device/BUILD.gn
@@ -148,7 +148,6 @@
"../../api/task_queue",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -181,7 +180,6 @@
"../../system_wrappers:field_trial",
"../../system_wrappers:metrics",
"../utility",
- "//third_party/abseil-cpp/absl/memory",
]
if (rtc_include_internal_audio_device && is_ios) {
deps += [ "../../sdk:audio_device" ]
@@ -393,7 +391,6 @@
]
if (is_linux || is_mac || is_win) {
sources += [ "audio_device_unittest.cc" ]
- deps += [ "//third_party/abseil-cpp/absl/memory" ]
}
if (is_win) {
sources += [ "win/core_audio_utility_win_unittest.cc" ]
diff --git a/modules/audio_device/android/aaudio_player.cc b/modules/audio_device/android/aaudio_player.cc
index 7e3721f..def0322 100644
--- a/modules/audio_device/android/aaudio_player.cc
+++ b/modules/audio_device/android/aaudio_player.cc
@@ -10,7 +10,8 @@
#include "modules/audio_device/android/aaudio_player.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "api/array_view.h"
#include "modules/audio_device/android/audio_manager.h"
#include "modules/audio_device/fine_audio_buffer.h"
@@ -123,7 +124,7 @@
// Create a modified audio buffer class which allows us to ask for any number
// of samples (and not only multiple of 10ms) to match the optimal buffer
// size per callback used by AAudio.
- fine_audio_buffer_ = absl::make_unique<FineAudioBuffer>(audio_device_buffer_);
+ fine_audio_buffer_ = std::make_unique<FineAudioBuffer>(audio_device_buffer_);
}
int AAudioPlayer::SpeakerVolumeIsAvailable(bool& available) {
diff --git a/modules/audio_device/android/aaudio_recorder.cc b/modules/audio_device/android/aaudio_recorder.cc
index 2aca3fe..3c5dae9 100644
--- a/modules/audio_device/android/aaudio_recorder.cc
+++ b/modules/audio_device/android/aaudio_recorder.cc
@@ -10,7 +10,8 @@
#include "modules/audio_device/android/aaudio_recorder.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "api/array_view.h"
#include "modules/audio_device/android/audio_manager.h"
#include "modules/audio_device/fine_audio_buffer.h"
@@ -110,7 +111,7 @@
// Create a modified audio buffer class which allows us to deliver any number
// of samples (and not only multiples of 10ms which WebRTC uses) to match the
// native AAudio buffer size.
- fine_audio_buffer_ = absl::make_unique<FineAudioBuffer>(audio_device_buffer_);
+ fine_audio_buffer_ = std::make_unique<FineAudioBuffer>(audio_device_buffer_);
}
int AAudioRecorder::EnableBuiltInAEC(bool enable) {
diff --git a/modules/audio_device/android/opensles_player.cc b/modules/audio_device/android/opensles_player.cc
index 6136570..b5851f7 100644
--- a/modules/audio_device/android/opensles_player.cc
+++ b/modules/audio_device/android/opensles_player.cc
@@ -12,7 +12,8 @@
#include <android/log.h>
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "api/array_view.h"
#include "modules/audio_device/android/audio_common.h"
#include "modules/audio_device/android/audio_manager.h"
@@ -216,7 +217,7 @@
ALOGD("native buffer size: %" RTC_PRIuS, buffer_size_in_samples);
ALOGD("native buffer size in ms: %.2f",
audio_parameters_.GetBufferSizeInMilliseconds());
- fine_audio_buffer_ = absl::make_unique<FineAudioBuffer>(audio_device_buffer_);
+ fine_audio_buffer_ = std::make_unique<FineAudioBuffer>(audio_device_buffer_);
// Allocated memory for audio buffers.
for (int i = 0; i < kNumOfOpenSLESBuffers; ++i) {
audio_buffers_[i].reset(new SLint16[buffer_size_in_samples]);
diff --git a/modules/audio_device/android/opensles_recorder.cc b/modules/audio_device/android/opensles_recorder.cc
index 05b5581..8becd20 100644
--- a/modules/audio_device/android/opensles_recorder.cc
+++ b/modules/audio_device/android/opensles_recorder.cc
@@ -12,7 +12,8 @@
#include <android/log.h>
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "api/array_view.h"
#include "modules/audio_device/android/audio_common.h"
#include "modules/audio_device/android/audio_manager.h"
@@ -341,7 +342,7 @@
audio_parameters_.GetBytesPerBuffer());
ALOGD("native sample rate: %d", audio_parameters_.sample_rate());
RTC_DCHECK(audio_device_buffer_);
- fine_audio_buffer_ = absl::make_unique<FineAudioBuffer>(audio_device_buffer_);
+ fine_audio_buffer_ = std::make_unique<FineAudioBuffer>(audio_device_buffer_);
// Allocate queue of audio buffers that stores recorded audio samples.
const int buffer_size_samples =
audio_parameters_.frames_per_buffer() * audio_parameters_.channels();
diff --git a/modules/audio_device/audio_device_unittest.cc b/modules/audio_device/audio_device_unittest.cc
index cd6be0a..3e75d76 100644
--- a/modules/audio_device/audio_device_unittest.cc
+++ b/modules/audio_device/audio_device_unittest.cc
@@ -15,7 +15,6 @@
#include <memory>
#include <numeric>
-#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "api/array_view.h"
#include "api/scoped_refptr.h"
@@ -595,7 +594,7 @@
// We must initialize the COM library on a thread before we calling any of
// the library functions. All COM functions in the ADM will return
// CO_E_NOTINITIALIZED otherwise.
- com_initializer_ = absl::make_unique<webrtc_win::ScopedCOMInitializer>(
+ com_initializer_ = std::make_unique<webrtc_win::ScopedCOMInitializer>(
webrtc_win::ScopedCOMInitializer::kMTA);
EXPECT_TRUE(com_initializer_->Succeeded());
EXPECT_TRUE(webrtc_win::core_audio_utility::IsSupported());
diff --git a/modules/audio_device/include/audio_device_factory.cc b/modules/audio_device/include/audio_device_factory.cc
index df5129f..909506b 100644
--- a/modules/audio_device/include/audio_device_factory.cc
+++ b/modules/audio_device/include/audio_device_factory.cc
@@ -10,6 +10,8 @@
#include "modules/audio_device/include/audio_device_factory.h"
+#include <memory>
+
#if defined(WEBRTC_WIN)
#include "modules/audio_device/win/audio_device_module_win.h"
#include "modules/audio_device/win/core_audio_input_win.h"
@@ -17,7 +19,6 @@
#include "modules/audio_device/win/core_audio_utility_win.h"
#endif
-#include "absl/memory/memory.h"
#include "api/task_queue/task_queue_factory.h"
#include "rtc_base/logging.h"
@@ -44,8 +45,8 @@
return nullptr;
}
return CreateWindowsCoreAudioAudioDeviceModuleFromInputAndOutput(
- absl::make_unique<webrtc_win::CoreAudioInput>(automatic_restart),
- absl::make_unique<webrtc_win::CoreAudioOutput>(automatic_restart),
+ std::make_unique<webrtc_win::CoreAudioInput>(automatic_restart),
+ std::make_unique<webrtc_win::CoreAudioOutput>(automatic_restart),
task_queue_factory);
}
diff --git a/modules/audio_device/include/audio_device_factory.h b/modules/audio_device/include/audio_device_factory.h
index 4d4cb5e..fb1ac41 100644
--- a/modules/audio_device/include/audio_device_factory.h
+++ b/modules/audio_device/include/audio_device_factory.h
@@ -11,7 +11,8 @@
#ifndef MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_FACTORY_H_
#define MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_FACTORY_H_
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "api/task_queue/task_queue_factory.h"
#include "modules/audio_device/include/audio_device.h"
@@ -29,7 +30,7 @@
// rtc::scoped_refptr<AudioDeviceModule> CreateAudioDevice() {
// task_queue_factory_ = CreateDefaultTaskQueueFactory();
// // Tell COM that this thread shall live in the MTA.
-// com_initializer_ = absl::make_unique<webrtc_win::ScopedCOMInitializer>(
+// com_initializer_ = std::make_unique<webrtc_win::ScopedCOMInitializer>(
// webrtc_win::ScopedCOMInitializer::kMTA);
// if (!com_initializer_->Succeeded()) {
// return nullptr;
diff --git a/modules/audio_device/include/test_audio_device.cc b/modules/audio_device/include/test_audio_device.cc
index fd9bf64..4c7e49b 100644
--- a/modules/audio_device/include/test_audio_device.cc
+++ b/modules/audio_device/include/test_audio_device.cc
@@ -18,7 +18,6 @@
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/array_view.h"
#include "common_audio/wav_file.h"
#include "modules/audio_device/include/audio_device_default.h"
@@ -89,7 +88,7 @@
int32_t Init() override {
task_queue_ =
- absl::make_unique<rtc::TaskQueue>(task_queue_factory_->CreateTaskQueue(
+ std::make_unique<rtc::TaskQueue>(task_queue_factory_->CreateTaskQueue(
"TestAudioDeviceModuleImpl", TaskQueueFactory::Priority::NORMAL));
RepeatingTaskHandle::Start(task_queue_->Get(), [this]() {
@@ -271,7 +270,7 @@
int sampling_frequency_in_hz,
int num_channels,
bool repeat)
- : WavFileReader(absl::make_unique<WavReader>(filename),
+ : WavFileReader(std::make_unique<WavReader>(filename),
sampling_frequency_in_hz,
num_channels,
repeat) {}
@@ -324,9 +323,9 @@
WavFileWriter(std::string filename,
int sampling_frequency_in_hz,
int num_channels)
- : WavFileWriter(absl::make_unique<WavWriter>(filename,
- sampling_frequency_in_hz,
- num_channels),
+ : WavFileWriter(std::make_unique<WavWriter>(filename,
+ sampling_frequency_in_hz,
+ num_channels),
sampling_frequency_in_hz,
num_channels) {}
@@ -456,23 +455,23 @@
TestAudioDeviceModule::CreatePulsedNoiseCapturer(int16_t max_amplitude,
int sampling_frequency_in_hz,
int num_channels) {
- return absl::make_unique<PulsedNoiseCapturerImpl>(
+ return std::make_unique<PulsedNoiseCapturerImpl>(
max_amplitude, sampling_frequency_in_hz, num_channels);
}
std::unique_ptr<TestAudioDeviceModule::Renderer>
TestAudioDeviceModule::CreateDiscardRenderer(int sampling_frequency_in_hz,
int num_channels) {
- return absl::make_unique<DiscardRenderer>(sampling_frequency_in_hz,
- num_channels);
+ return std::make_unique<DiscardRenderer>(sampling_frequency_in_hz,
+ num_channels);
}
std::unique_ptr<TestAudioDeviceModule::Capturer>
TestAudioDeviceModule::CreateWavFileReader(std::string filename,
int sampling_frequency_in_hz,
int num_channels) {
- return absl::make_unique<WavFileReader>(filename, sampling_frequency_in_hz,
- num_channels, false);
+ return std::make_unique<WavFileReader>(filename, sampling_frequency_in_hz,
+ num_channels, false);
}
std::unique_ptr<TestAudioDeviceModule::Capturer>
@@ -480,23 +479,23 @@
WavReader reader(filename);
int sampling_frequency_in_hz = reader.sample_rate();
int num_channels = rtc::checked_cast<int>(reader.num_channels());
- return absl::make_unique<WavFileReader>(filename, sampling_frequency_in_hz,
- num_channels, repeat);
+ return std::make_unique<WavFileReader>(filename, sampling_frequency_in_hz,
+ num_channels, repeat);
}
std::unique_ptr<TestAudioDeviceModule::Renderer>
TestAudioDeviceModule::CreateWavFileWriter(std::string filename,
int sampling_frequency_in_hz,
int num_channels) {
- return absl::make_unique<WavFileWriter>(filename, sampling_frequency_in_hz,
- num_channels);
+ return std::make_unique<WavFileWriter>(filename, sampling_frequency_in_hz,
+ num_channels);
}
std::unique_ptr<TestAudioDeviceModule::Renderer>
TestAudioDeviceModule::CreateBoundedWavFileWriter(std::string filename,
int sampling_frequency_in_hz,
int num_channels) {
- return absl::make_unique<BoundedWavFileWriter>(
+ return std::make_unique<BoundedWavFileWriter>(
filename, sampling_frequency_in_hz, num_channels);
}
diff --git a/modules/audio_device/mac/audio_device_mac.cc b/modules/audio_device/mac/audio_device_mac.cc
index 6b4ba92..345935f 100644
--- a/modules/audio_device/mac/audio_device_mac.cc
+++ b/modules/audio_device/mac/audio_device_mac.cc
@@ -15,7 +15,8 @@
#include <mach/mach.h> // mach_task_self()
#include <sys/sysctl.h> // sysctlbyname()
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "modules/audio_device/audio_device_config.h"
#include "modules/third_party/portaudio/pa_ringbuffer.h"
#include "rtc_base/arraysize.h"
@@ -1557,7 +1558,7 @@
}
UInt32 numberDevices = size / sizeof(AudioDeviceID);
- const auto deviceIds = absl::make_unique<AudioDeviceID[]>(numberDevices);
+ const auto deviceIds = std::make_unique<AudioDeviceID[]>(numberDevices);
AudioBufferList* bufferList = NULL;
UInt32 numberScopedDevices = 0;
diff --git a/modules/audio_device/win/audio_device_module_win.cc b/modules/audio_device/win/audio_device_module_win.cc
index cc23ae6..b77a24a 100644
--- a/modules/audio_device/win/audio_device_module_win.cc
+++ b/modules/audio_device/win/audio_device_module_win.cc
@@ -10,9 +10,9 @@
#include "modules/audio_device/win/audio_device_module_win.h"
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "modules/audio_device/audio_device_buffer.h"
#include "modules/audio_device/include/audio_device.h"
#include "rtc_base/checks.h"
@@ -133,7 +133,7 @@
return 0;
}
audio_device_buffer_ =
- absl::make_unique<AudioDeviceBuffer>(task_queue_factory_);
+ std::make_unique<AudioDeviceBuffer>(task_queue_factory_);
AttachAudioBuffer();
InitStatus status;
if (output_->Init() != 0) {
diff --git a/modules/audio_device/win/core_audio_base_win.cc b/modules/audio_device/win/core_audio_base_win.cc
index b18d97d..56abe85 100644
--- a/modules/audio_device/win/core_audio_base_win.cc
+++ b/modules/audio_device/win/core_audio_base_win.cc
@@ -11,9 +11,9 @@
#include "modules/audio_device/win/core_audio_base_win.h"
#include "modules/audio_device/audio_device_buffer.h"
+#include <memory>
#include <string>
-#include "absl/memory/memory.h"
#include "rtc_base/arraysize.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
@@ -516,7 +516,7 @@
// Start an audio thread but only if one does not already exist (which is the
// case during restart).
if (!audio_thread_) {
- audio_thread_ = absl::make_unique<rtc::PlatformThread>(
+ audio_thread_ = std::make_unique<rtc::PlatformThread>(
Run, this, IsInput() ? "wasapi_capture_thread" : "wasapi_render_thread",
rtc::kRealtimePriority);
RTC_DCHECK(audio_thread_);
diff --git a/modules/audio_device/win/core_audio_input_win.cc b/modules/audio_device/win/core_audio_input_win.cc
index 91a1d16..5350076 100644
--- a/modules/audio_device/win/core_audio_input_win.cc
+++ b/modules/audio_device/win/core_audio_input_win.cc
@@ -10,7 +10,8 @@
#include "modules/audio_device/win/core_audio_input_win.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "modules/audio_device/audio_device_buffer.h"
#include "modules/audio_device/fine_audio_buffer.h"
#include "rtc_base/checks.h"
@@ -121,7 +122,7 @@
// of samples (and not only multiple of 10ms) to match the optimal buffer
// size per callback used by Core Audio.
// TODO(henrika): can we share one FineAudioBuffer with the output side?
- fine_audio_buffer_ = absl::make_unique<FineAudioBuffer>(audio_device_buffer_);
+ fine_audio_buffer_ = std::make_unique<FineAudioBuffer>(audio_device_buffer_);
// Create an IAudioCaptureClient for an initialized IAudioClient.
// The IAudioCaptureClient interface enables a client to read input data from
diff --git a/modules/audio_device/win/core_audio_output_win.cc b/modules/audio_device/win/core_audio_output_win.cc
index f3b0151..aeada67 100644
--- a/modules/audio_device/win/core_audio_output_win.cc
+++ b/modules/audio_device/win/core_audio_output_win.cc
@@ -10,7 +10,8 @@
#include "modules/audio_device/win/core_audio_output_win.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "modules/audio_device/audio_device_buffer.h"
#include "modules/audio_device/fine_audio_buffer.h"
#include "rtc_base/bind.h"
@@ -120,7 +121,7 @@
// of samples (and not only multiple of 10ms) to match the optimal
// buffer size per callback used by Core Audio.
// TODO(henrika): can we share one FineAudioBuffer with the input side?
- fine_audio_buffer_ = absl::make_unique<FineAudioBuffer>(audio_device_buffer_);
+ fine_audio_buffer_ = std::make_unique<FineAudioBuffer>(audio_device_buffer_);
// Create an IAudioRenderClient for an initialized IAudioClient.
// The IAudioRenderClient interface enables us to write output data to
diff --git a/modules/audio_mixer/BUILD.gn b/modules/audio_mixer/BUILD.gn
index 9e8fab4..99bc2d1 100644
--- a/modules/audio_mixer/BUILD.gn
+++ b/modules/audio_mixer/BUILD.gn
@@ -52,7 +52,6 @@
"../audio_processing:apm_logging",
"../audio_processing:audio_frame_view",
"../audio_processing/agc2:fixed_digital",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -116,7 +115,6 @@
"../../rtc_base:rtc_base_approved",
"../../rtc_base:task_queue_for_test",
"../../test:test_support",
- "//third_party/abseil-cpp/absl/memory",
]
}
diff --git a/modules/audio_mixer/audio_mixer_impl_unittest.cc b/modules/audio_mixer/audio_mixer_impl_unittest.cc
index 16ff338..cfb3319 100644
--- a/modules/audio_mixer/audio_mixer_impl_unittest.cc
+++ b/modules/audio_mixer/audio_mixer_impl_unittest.cc
@@ -17,7 +17,6 @@
#include <string>
#include <utility>
-#include "absl/memory/memory.h"
#include "api/audio/audio_mixer.h"
#include "modules/audio_mixer/default_output_rate_calculator.h"
#include "rtc_base/bind.h"
@@ -611,7 +610,7 @@
AudioFrame::kMaxDataSizeSamples / kSamplesPerChannel;
MockMixerAudioSource source;
const auto mixer = AudioMixerImpl::Create(
- absl::make_unique<HighOutputRateCalculator>(), true);
+ std::make_unique<HighOutputRateCalculator>(), true);
mixer->AddSource(&source);
ResetFrame(source.fake_frame());
mixer->Mix(1, &frame_for_mixing);
diff --git a/modules/audio_mixer/frame_combiner.cc b/modules/audio_mixer/frame_combiner.cc
index f7ce952..e52904f 100644
--- a/modules/audio_mixer/frame_combiner.cc
+++ b/modules/audio_mixer/frame_combiner.cc
@@ -14,9 +14,9 @@
#include <array>
#include <cstdint>
#include <iterator>
+#include <memory>
#include <string>
-#include "absl/memory/memory.h"
#include "api/array_view.h"
#include "common_audio/include/audio_util.h"
#include "modules/audio_mixer/audio_frame_manipulator.h"
@@ -129,8 +129,8 @@
FrameCombiner::FrameCombiner(bool use_limiter)
: data_dumper_(new ApmDataDumper(0)),
mixing_buffer_(
- absl::make_unique<std::array<std::array<float, kMaximumChannelSize>,
- kMaximumNumberOfChannels>>()),
+ std::make_unique<std::array<std::array<float, kMaximumChannelSize>,
+ kMaximumNumberOfChannels>>()),
limiter_(static_cast<size_t>(48000), data_dumper_.get(), "AudioMixer"),
use_limiter_(use_limiter) {
static_assert(kMaximumChannelSize * kMaximumNumberOfChannels <=
diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index 1341f76..d2be4f8 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -58,7 +58,6 @@
"../../rtc_base:rtc_base_approved",
"../../rtc_base/system:arch",
"../../rtc_base/system:rtc_export",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -202,7 +201,6 @@
"agc2:fixed_digital",
"agc2:gain_applier",
"vad",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -301,7 +299,6 @@
"../../common_audio",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -503,7 +500,6 @@
"utility:pffft_wrapper_unittest",
"vad:vad_unittests",
"//testing/gtest",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -609,7 +605,6 @@
"../../rtc_base:rtc_base_approved",
"../../rtc_base:safe_minmax",
"agc:gain_map",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -655,7 +650,6 @@
"//testing/gtest",
"//third_party/abseil-cpp/absl/flags:flag",
"//third_party/abseil-cpp/absl/flags:parse",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -670,7 +664,6 @@
":audio_processing",
"../../api:audioproc_f_api",
"../../rtc_base:rtc_base_approved",
- "//third_party/abseil-cpp/absl/memory",
]
} # audioproc_f
}
@@ -766,7 +759,6 @@
"../../rtc_base:protobuf_utils",
"../../rtc_base:rtc_base_approved",
"../../rtc_base/system:arch",
- "//third_party/abseil-cpp/absl/memory:memory",
]
}
diff --git a/modules/audio_processing/aec_dump/BUILD.gn b/modules/audio_processing/aec_dump/BUILD.gn
index 554fee5..419a5ec 100644
--- a/modules/audio_processing/aec_dump/BUILD.gn
+++ b/modules/audio_processing/aec_dump/BUILD.gn
@@ -48,7 +48,6 @@
"../",
"../../../rtc_base:rtc_base_approved",
"//testing/gtest",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -74,7 +73,6 @@
"../../../rtc_base:rtc_task_queue",
"../../../rtc_base/system:file_wrapper",
"../../../system_wrappers",
- "//third_party/abseil-cpp/absl/memory",
]
deps += [ "../:audioproc_debug_proto" ]
diff --git a/modules/audio_processing/aec_dump/aec_dump_impl.cc b/modules/audio_processing/aec_dump/aec_dump_impl.cc
index 904033a..a7ac552 100644
--- a/modules/audio_processing/aec_dump/aec_dump_impl.cc
+++ b/modules/audio_processing/aec_dump/aec_dump_impl.cc
@@ -10,9 +10,9 @@
#include "modules/audio_processing/aec_dump/aec_dump_impl.h"
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "modules/audio_processing/aec_dump/aec_dump_factory.h"
#include "rtc_base/checks.h"
#include "rtc_base/event.h"
@@ -212,8 +212,8 @@
}
std::unique_ptr<WriteToFileTask> AecDumpImpl::CreateWriteToFileTask() {
- return absl::make_unique<WriteToFileTask>(&debug_file_,
- &num_bytes_left_for_log_);
+ return std::make_unique<WriteToFileTask>(&debug_file_,
+ &num_bytes_left_for_log_);
}
std::unique_ptr<AecDump> AecDumpFactory::Create(webrtc::FileWrapper file,
@@ -223,8 +223,8 @@
if (!file.is_open())
return nullptr;
- return absl::make_unique<AecDumpImpl>(std::move(file), max_log_size_bytes,
- worker_queue);
+ return std::make_unique<AecDumpImpl>(std::move(file), max_log_size_bytes,
+ worker_queue);
}
std::unique_ptr<AecDump> AecDumpFactory::Create(std::string file_name,
diff --git a/modules/audio_processing/aec_dump/aec_dump_integration_test.cc b/modules/audio_processing/aec_dump/aec_dump_integration_test.cc
index a32867f..f3544b5 100644
--- a/modules/audio_processing/aec_dump/aec_dump_integration_test.cc
+++ b/modules/audio_processing/aec_dump/aec_dump_integration_test.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "modules/audio_processing/aec_dump/mock_aec_dump.h"
#include "modules/audio_processing/include/audio_processing.h"
@@ -31,14 +31,14 @@
std::unique_ptr<webrtc::test::MockAecDump> CreateMockAecDump() {
auto mock_aec_dump =
- absl::make_unique<testing::StrictMock<webrtc::test::MockAecDump>>();
+ std::make_unique<testing::StrictMock<webrtc::test::MockAecDump>>();
EXPECT_CALL(*mock_aec_dump.get(), WriteConfig(_)).Times(AtLeast(1));
EXPECT_CALL(*mock_aec_dump.get(), WriteInitMessage(_, _)).Times(AtLeast(1));
return std::unique_ptr<webrtc::test::MockAecDump>(std::move(mock_aec_dump));
}
std::unique_ptr<webrtc::AudioFrame> CreateFakeFrame() {
- auto fake_frame = absl::make_unique<webrtc::AudioFrame>();
+ auto fake_frame = std::make_unique<webrtc::AudioFrame>();
fake_frame->num_channels_ = 1;
fake_frame->sample_rate_hz_ = 48000;
fake_frame->samples_per_channel_ = 480;
diff --git a/modules/audio_processing/agc2/BUILD.gn b/modules/audio_processing/agc2/BUILD.gn
index 5431a15..5a8e81a 100644
--- a/modules/audio_processing/agc2/BUILD.gn
+++ b/modules/audio_processing/agc2/BUILD.gn
@@ -235,7 +235,6 @@
"../../../rtc_base:gunit_helpers",
"../../../rtc_base:rtc_base_approved",
"../../../system_wrappers:metrics",
- "//third_party/abseil-cpp/absl/memory",
]
}
diff --git a/modules/audio_processing/agc2/rnn_vad/BUILD.gn b/modules/audio_processing/agc2/rnn_vad/BUILD.gn
index 670bbb6..63ce0c1 100644
--- a/modules/audio_processing/agc2/rnn_vad/BUILD.gn
+++ b/modules/audio_processing/agc2/rnn_vad/BUILD.gn
@@ -57,7 +57,6 @@
"../../../../rtc_base:checks",
"../../../../test:fileutils",
"../../../../test:test_support",
- "//third_party/abseil-cpp/absl/memory",
]
}
diff --git a/modules/audio_processing/agc2/rnn_vad/test_utils.cc b/modules/audio_processing/agc2/rnn_vad/test_utils.cc
index 8236d5f..6e0eb5b 100644
--- a/modules/audio_processing/agc2/rnn_vad/test_utils.cc
+++ b/modules/audio_processing/agc2/rnn_vad/test_utils.cc
@@ -10,7 +10,8 @@
#include "modules/audio_processing/agc2/rnn_vad/test_utils.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "rtc_base/checks.h"
#include "test/gtest.h"
#include "test/testsupport/file_utils.h"
@@ -48,7 +49,7 @@
std::pair<std::unique_ptr<BinaryFileReader<int16_t, float>>, const size_t>
CreatePcmSamplesReader(const size_t frame_length) {
- auto ptr = absl::make_unique<BinaryFileReader<int16_t, float>>(
+ auto ptr = std::make_unique<BinaryFileReader<int16_t, float>>(
test::ResourcePath("audio_processing/agc2/rnn_vad/samples", "pcm"),
frame_length);
// The last incomplete frame is ignored.
@@ -57,14 +58,14 @@
ReaderPairType CreatePitchBuffer24kHzReader() {
constexpr size_t cols = 864;
- auto ptr = absl::make_unique<BinaryFileReader<float>>(
+ auto ptr = std::make_unique<BinaryFileReader<float>>(
ResourcePath("audio_processing/agc2/rnn_vad/pitch_buf_24k", "dat"), cols);
return {std::move(ptr), rtc::CheckedDivExact(ptr->data_length(), cols)};
}
ReaderPairType CreateLpResidualAndPitchPeriodGainReader() {
constexpr size_t num_lp_residual_coeffs = 864;
- auto ptr = absl::make_unique<BinaryFileReader<float>>(
+ auto ptr = std::make_unique<BinaryFileReader<float>>(
ResourcePath("audio_processing/agc2/rnn_vad/pitch_lp_res", "dat"),
num_lp_residual_coeffs);
return {std::move(ptr),
@@ -72,7 +73,7 @@
}
ReaderPairType CreateVadProbsReader() {
- auto ptr = absl::make_unique<BinaryFileReader<float>>(
+ auto ptr = std::make_unique<BinaryFileReader<float>>(
test::ResourcePath("audio_processing/agc2/rnn_vad/vad_prob", "dat"));
return {std::move(ptr), ptr->data_length()};
}
diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc
index 55bdaae..cdc37c6 100644
--- a/modules/audio_processing/audio_processing_impl.cc
+++ b/modules/audio_processing/audio_processing_impl.cc
@@ -12,11 +12,11 @@
#include <algorithm>
#include <cstdint>
+#include <memory>
#include <string>
#include <type_traits>
#include <utility>
-#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "api/array_view.h"
#include "common_audio/audio_converter.h"
@@ -1845,7 +1845,7 @@
private_submodules_->echo_controller =
echo_control_factory_->Create(proc_sample_rate_hz());
} else {
- private_submodules_->echo_controller = absl::make_unique<EchoCanceller3>(
+ private_submodules_->echo_controller = std::make_unique<EchoCanceller3>(
EchoCanceller3Config(), proc_sample_rate_hz(),
/*num_render_channels=*/1, /*num_capture_channels=*/1);
}
diff --git a/modules/audio_processing/audio_processing_impl_unittest.cc b/modules/audio_processing/audio_processing_impl_unittest.cc
index 72bd673..292b632 100644
--- a/modules/audio_processing/audio_processing_impl_unittest.cc
+++ b/modules/audio_processing/audio_processing_impl_unittest.cc
@@ -12,7 +12,6 @@
#include <memory>
-#include "absl/memory/memory.h"
#include "api/scoped_refptr.h"
#include "modules/audio_processing/include/audio_processing.h"
#include "modules/audio_processing/test/echo_control_mock.h"
@@ -51,12 +50,12 @@
// to the creation of a new EchoControl object.
class MockEchoControlFactory : public EchoControlFactory {
public:
- MockEchoControlFactory() : next_mock_(absl::make_unique<MockEchoControl>()) {}
+ MockEchoControlFactory() : next_mock_(std::make_unique<MockEchoControl>()) {}
// Returns a pointer to the next MockEchoControl that this factory creates.
MockEchoControl* GetNext() const { return next_mock_.get(); }
std::unique_ptr<EchoControl> Create(int sample_rate_hz) override {
std::unique_ptr<EchoControl> mock = std::move(next_mock_);
- next_mock_ = absl::make_unique<MockEchoControl>();
+ next_mock_ = std::make_unique<MockEchoControl>();
return mock;
}
@@ -215,7 +214,7 @@
EchoControllerObservesPreAmplifierEchoPathGainChange) {
// Tests that the echo controller observes an echo path gain change when the
// pre-amplifier submodule changes the gain.
- auto echo_control_factory = absl::make_unique<MockEchoControlFactory>();
+ auto echo_control_factory = std::make_unique<MockEchoControlFactory>();
const auto* echo_control_factory_ptr = echo_control_factory.get();
std::unique_ptr<AudioProcessing> apm(
@@ -258,7 +257,7 @@
EchoControllerObservesAnalogAgc1EchoPathGainChange) {
// Tests that the echo controller observes an echo path gain change when the
// AGC1 analog adaptive submodule changes the analog gain.
- auto echo_control_factory = absl::make_unique<MockEchoControlFactory>();
+ auto echo_control_factory = std::make_unique<MockEchoControlFactory>();
const auto* echo_control_factory_ptr = echo_control_factory.get();
std::unique_ptr<AudioProcessing> apm(
@@ -299,7 +298,7 @@
TEST(AudioProcessingImplTest, EchoControllerObservesPlayoutVolumeChange) {
// Tests that the echo controller observes an echo path gain change when a
// playout volume change is reported.
- auto echo_control_factory = absl::make_unique<MockEchoControlFactory>();
+ auto echo_control_factory = std::make_unique<MockEchoControlFactory>();
const auto* echo_control_factory_ptr = echo_control_factory.get();
std::unique_ptr<AudioProcessing> apm(
diff --git a/modules/audio_processing/gain_controller2_unittest.cc b/modules/audio_processing/gain_controller2_unittest.cc
index 3295328..9369a8a 100644
--- a/modules/audio_processing/gain_controller2_unittest.cc
+++ b/modules/audio_processing/gain_controller2_unittest.cc
@@ -11,8 +11,8 @@
#include "modules/audio_processing/gain_controller2.h"
#include <algorithm>
+#include <memory>
-#include "absl/memory/memory.h"
#include "api/array_view.h"
#include "modules/audio_processing/agc2/agc2_testing_common.h"
#include "modules/audio_processing/audio_buffer.h"
@@ -62,7 +62,7 @@
std::unique_ptr<GainController2> CreateAgc2FixedDigitalMode(
float fixed_gain_db,
size_t sample_rate_hz) {
- auto agc2 = absl::make_unique<GainController2>();
+ auto agc2 = std::make_unique<GainController2>();
agc2->ApplyConfig(CreateAgc2FixedDigitalModeConfig(fixed_gain_db));
agc2->Initialize(sample_rate_hz);
return agc2;
diff --git a/modules/audio_processing/include/audio_generator_factory.cc b/modules/audio_processing/include/audio_generator_factory.cc
index 69a5401..d132f89 100644
--- a/modules/audio_processing/include/audio_generator_factory.cc
+++ b/modules/audio_processing/include/audio_generator_factory.cc
@@ -10,7 +10,8 @@
#include "modules/audio_processing/include/audio_generator_factory.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "common_audio/wav_file.h"
#include "modules/audio_processing/audio_generator/file_audio_generator.h"
@@ -19,7 +20,7 @@
std::unique_ptr<AudioGenerator> AudioGeneratorFactory::Create(
const std::string& file_name) {
std::unique_ptr<WavReader> input_audio_file(new WavReader(file_name));
- return absl::make_unique<FileAudioGenerator>(std::move(input_audio_file));
+ return std::make_unique<FileAudioGenerator>(std::move(input_audio_file));
}
} // namespace webrtc
diff --git a/modules/audio_processing/test/aec_dump_based_simulator.cc b/modules/audio_processing/test/aec_dump_based_simulator.cc
index 0d6bdd1..ba39274 100644
--- a/modules/audio_processing/test/aec_dump_based_simulator.cc
+++ b/modules/audio_processing/test/aec_dump_based_simulator.cc
@@ -11,8 +11,8 @@
#include "modules/audio_processing/test/aec_dump_based_simulator.h"
#include <iostream>
+#include <memory>
-#include "absl/memory/memory.h"
#include "modules/audio_processing/echo_cancellation_impl.h"
#include "modules/audio_processing/echo_control_mobile_impl.h"
#include "modules/audio_processing/test/protobuf_utils.h"
@@ -609,7 +609,7 @@
"_" +
std::to_string(output_reset_counter_)
: *settings_.call_order_output_filename;
- call_order_output_file_ = absl::make_unique<std::ofstream>(filename);
+ call_order_output_file_ = std::make_unique<std::ofstream>(filename);
}
}
diff --git a/modules/audio_processing/test/api_call_statistics.cc b/modules/audio_processing/test/api_call_statistics.cc
index 5e95668..736b77b 100644
--- a/modules/audio_processing/test/api_call_statistics.cc
+++ b/modules/audio_processing/test/api_call_statistics.cc
@@ -16,7 +16,6 @@
#include <limits>
#include <memory>
-#include "absl/memory/memory.h"
#include "rtc_base/time_utils.h"
namespace webrtc {
@@ -75,7 +74,7 @@
void ApiCallStatistics::WriteReportToFile(const std::string& filename) const {
std::unique_ptr<std::ofstream> out =
- absl::make_unique<std::ofstream>(filename);
+ std::make_unique<std::ofstream>(filename);
for (auto v : calls_) {
if (v.call_type == CallType::kRender) {
*out << "render, ";
diff --git a/modules/audio_processing/test/audio_processing_simulator.cc b/modules/audio_processing/test/audio_processing_simulator.cc
index 1565e71..e3534cc 100644
--- a/modules/audio_processing/test/audio_processing_simulator.cc
+++ b/modules/audio_processing/test/audio_processing_simulator.cc
@@ -13,11 +13,11 @@
#include <algorithm>
#include <fstream>
#include <iostream>
+#include <memory>
#include <string>
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/audio/echo_canceller3_config_json.h"
#include "api/audio/echo_canceller3_factory.h"
#include "common_audio/include/audio_util.h"
@@ -139,7 +139,7 @@
std::unique_ptr<AudioProcessingBuilder> ap_builder)
: settings_(settings),
ap_builder_(ap_builder ? std::move(ap_builder)
- : absl::make_unique<AudioProcessingBuilder>()),
+ : std::make_unique<AudioProcessingBuilder>()),
analog_mic_level_(settings.initial_mic_level),
fake_recording_device_(
settings.initial_mic_level,
@@ -341,7 +341,7 @@
static_cast<size_t>(out_config_.num_channels())));
buffer_file_writer_.reset(new ChannelBufferWavWriter(std::move(out_file)));
} else if (settings_.aec_dump_input_string.has_value()) {
- buffer_memory_writer_ = absl::make_unique<ChannelBufferVectorWriter>(
+ buffer_memory_writer_ = std::make_unique<ChannelBufferVectorWriter>(
settings_.processed_capture_samples);
}
diff --git a/modules/audio_processing/test/audioproc_float_main.cc b/modules/audio_processing/test/audioproc_float_main.cc
index 900b927..3cc6d43 100644
--- a/modules/audio_processing/test/audioproc_float_main.cc
+++ b/modules/audio_processing/test/audioproc_float_main.cc
@@ -8,11 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "api/test/audioproc_float.h"
#include "modules/audio_processing/include/audio_processing.h"
int main(int argc, char* argv[]) {
return webrtc::test::AudioprocFloat(
- absl::make_unique<webrtc::AudioProcessingBuilder>(), argc, argv);
+ std::make_unique<webrtc::AudioProcessingBuilder>(), argc, argv);
}
diff --git a/modules/audio_processing/test/conversational_speech/BUILD.gn b/modules/audio_processing/test/conversational_speech/BUILD.gn
index 7a278a3..298e684 100644
--- a/modules/audio_processing/test/conversational_speech/BUILD.gn
+++ b/modules/audio_processing/test/conversational_speech/BUILD.gn
@@ -26,7 +26,6 @@
"../../../../test:test_support",
"//third_party/abseil-cpp/absl/flags:flag",
"//third_party/abseil-cpp/absl/flags:parse",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -52,7 +51,6 @@
"../../../../rtc_base:checks",
"../../../../rtc_base:rtc_base_approved",
"../../../../test:fileutils",
- "//third_party/abseil-cpp/absl/memory",
]
visibility = [ ":*" ] # Only targets in this file can depend on this.
}
diff --git a/modules/audio_processing/test/conversational_speech/generator.cc b/modules/audio_processing/test/conversational_speech/generator.cc
index abbea8c..d0bc2f2 100644
--- a/modules/audio_processing/test/conversational_speech/generator.cc
+++ b/modules/audio_processing/test/conversational_speech/generator.cc
@@ -11,9 +11,10 @@
#include <iostream>
#include <vector>
+#include <memory>
+
#include "absl/flags/flag.h"
#include "absl/flags/parse.h"
-#include "absl/memory/memory.h"
#include "modules/audio_processing/test/conversational_speech/config.h"
#include "modules/audio_processing/test/conversational_speech/multiend_call.h"
#include "modules/audio_processing/test/conversational_speech/simulator.h"
@@ -59,7 +60,7 @@
// Parse timing and audio tracks.
auto wavreader_factory =
- absl::make_unique<conversational_speech::WavReaderFactory>();
+ std::make_unique<conversational_speech::WavReaderFactory>();
conversational_speech::MultiEndCall multiend_call(
timing, config.audiotracks_path(), std::move(wavreader_factory));
diff --git a/modules/audio_processing/test/conversational_speech/simulator.cc b/modules/audio_processing/test/conversational_speech/simulator.cc
index 81b73fb..0591252 100644
--- a/modules/audio_processing/test/conversational_speech/simulator.cc
+++ b/modules/audio_processing/test/conversational_speech/simulator.cc
@@ -13,11 +13,11 @@
#include <math.h>
#include <algorithm>
+#include <memory>
#include <set>
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/array_view.h"
#include "common_audio/include/audio_util.h"
#include "common_audio/wav_file.h"
@@ -42,7 +42,7 @@
const std::string& output_path) {
// Create map.
auto speaker_output_file_paths_map =
- absl::make_unique<std::map<std::string, SpeakerOutputFilePaths>>();
+ std::make_unique<std::map<std::string, SpeakerOutputFilePaths>>();
// Add near-end and far-end output paths into the map.
for (const auto& speaker_name : speaker_names) {
@@ -89,7 +89,7 @@
int sample_rate) {
// Create map.
auto speaker_wav_writers_map =
- absl::make_unique<std::map<std::string, SpeakerWavWriters>>();
+ std::make_unique<std::map<std::string, SpeakerWavWriters>>();
// Add SpeakerWavWriters instance into the map.
for (auto it = speaker_output_file_paths.begin();
@@ -108,7 +108,7 @@
audiotrack_readers) {
// Create map.
auto audiotracks_map =
- absl::make_unique<std::map<std::string, std::vector<int16_t>>>();
+ std::make_unique<std::map<std::string, std::vector<int16_t>>>();
// Add audio track vectors.
for (auto it = audiotrack_readers.begin(); it != audiotrack_readers.end();
diff --git a/modules/audio_processing/test/fake_recording_device.cc b/modules/audio_processing/test/fake_recording_device.cc
index ee134ea..b82cb1d 100644
--- a/modules/audio_processing/test/fake_recording_device.cc
+++ b/modules/audio_processing/test/fake_recording_device.cc
@@ -11,8 +11,8 @@
#include "modules/audio_processing/test/fake_recording_device.h"
#include <algorithm>
+#include <memory>
-#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "modules/audio_processing/agc/gain_map_internal.h"
#include "rtc_base/logging.h"
@@ -141,13 +141,13 @@
switch (device_kind) {
case 0:
worker_ =
- absl::make_unique<FakeRecordingDeviceIdentity>(initial_mic_level);
+ std::make_unique<FakeRecordingDeviceIdentity>(initial_mic_level);
break;
case 1:
- worker_ = absl::make_unique<FakeRecordingDeviceLinear>(initial_mic_level);
+ worker_ = std::make_unique<FakeRecordingDeviceLinear>(initial_mic_level);
break;
case 2:
- worker_ = absl::make_unique<FakeRecordingDeviceAgc1>(initial_mic_level);
+ worker_ = std::make_unique<FakeRecordingDeviceAgc1>(initial_mic_level);
break;
default:
RTC_NOTREACHED();
diff --git a/modules/audio_processing/test/fake_recording_device_unittest.cc b/modules/audio_processing/test/fake_recording_device_unittest.cc
index da62beb..74bb47f 100644
--- a/modules/audio_processing/test/fake_recording_device_unittest.cc
+++ b/modules/audio_processing/test/fake_recording_device_unittest.cc
@@ -15,7 +15,6 @@
#include <string>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/array_view.h"
#include "rtc_base/strings/string_builder.h"
#include "test/gtest.h"
@@ -48,7 +47,7 @@
std::unique_ptr<ChannelBuffer<float>> CreateChannelBufferWithData(
const std::vector<std::vector<float>>& data) {
auto buff =
- absl::make_unique<ChannelBuffer<float>>(data[0].size(), data.size());
+ std::make_unique<ChannelBuffer<float>>(data[0].size(), data.size());
WritesDataIntoChannelBuffer(data, buff.get());
return buff;
}
diff --git a/modules/audio_processing/test/protobuf_utils.cc b/modules/audio_processing/test/protobuf_utils.cc
index 3042bce..7557496 100644
--- a/modules/audio_processing/test/protobuf_utils.cc
+++ b/modules/audio_processing/test/protobuf_utils.cc
@@ -10,7 +10,8 @@
#include "modules/audio_processing/test/protobuf_utils.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "rtc_base/system/arch.h"
namespace {
@@ -27,7 +28,7 @@
if (size <= 0)
return 0;
- *bytes = absl::make_unique<uint8_t[]>(size);
+ *bytes = std::make_unique<uint8_t[]>(size);
input->read(reinterpret_cast<char*>(bytes->get()),
size * sizeof((*bytes)[0]));
size_read = input->gcount();
@@ -49,7 +50,7 @@
if (size <= 0)
return 0;
- *bytes = absl::make_unique<uint8_t[]>(size);
+ *bytes = std::make_unique<uint8_t[]>(size);
return fread(bytes->get(), sizeof((*bytes)[0]), size, file);
}
diff --git a/modules/bitrate_controller/BUILD.gn b/modules/bitrate_controller/BUILD.gn
index ce1dcf0..52dee8a 100644
--- a/modules/bitrate_controller/BUILD.gn
+++ b/modules/bitrate_controller/BUILD.gn
@@ -36,7 +36,6 @@
"../../system_wrappers:field_trial",
"../../system_wrappers:metrics",
"../remote_bitrate_estimator",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
diff --git a/modules/bitrate_controller/send_side_bandwidth_estimation.cc b/modules/bitrate_controller/send_side_bandwidth_estimation.cc
index 0d072ad..b3c6a75 100644
--- a/modules/bitrate_controller/send_side_bandwidth_estimation.cc
+++ b/modules/bitrate_controller/send_side_bandwidth_estimation.cc
@@ -13,9 +13,9 @@
#include <algorithm>
#include <cstdio>
#include <limits>
+#include <memory>
#include <string>
-#include "absl/memory/memory.h"
#include "api/rtc_event_log/rtc_event.h"
#include "api/rtc_event_log/rtc_event_log.h"
#include "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h"
@@ -653,7 +653,7 @@
if (bitrate != current_bitrate_ ||
last_fraction_loss_ != last_logged_fraction_loss_ ||
at_time - last_rtc_event_log_ > kRtcEventLogPeriod) {
- event_log_->Log(absl::make_unique<RtcEventBweUpdateLossBased>(
+ event_log_->Log(std::make_unique<RtcEventBweUpdateLossBased>(
bitrate.bps(), last_fraction_loss_,
expected_packets_since_last_loss_update_));
last_logged_fraction_loss_ = last_fraction_loss_;
diff --git a/modules/congestion_controller/bbr/BUILD.gn b/modules/congestion_controller/bbr/BUILD.gn
index c3c9e10..f44f2bf 100644
--- a/modules/congestion_controller/bbr/BUILD.gn
+++ b/modules/congestion_controller/bbr/BUILD.gn
@@ -18,7 +18,6 @@
"../../../api/transport:network_control",
"../../../api/units:time_delta",
"../../../rtc_base:rtc_base_approved",
- "//third_party/abseil-cpp/absl/memory",
]
}
diff --git a/modules/congestion_controller/bbr/bbr_factory.cc b/modules/congestion_controller/bbr/bbr_factory.cc
index 43fc86d..c201237 100644
--- a/modules/congestion_controller/bbr/bbr_factory.cc
+++ b/modules/congestion_controller/bbr/bbr_factory.cc
@@ -12,7 +12,6 @@
#include <memory>
-#include "absl/memory/memory.h"
#include "modules/congestion_controller/bbr/bbr_network_controller.h"
namespace webrtc {
@@ -21,7 +20,7 @@
std::unique_ptr<NetworkControllerInterface> BbrNetworkControllerFactory::Create(
NetworkControllerConfig config) {
- return absl::make_unique<bbr::BbrNetworkController>(config);
+ return std::make_unique<bbr::BbrNetworkController>(config);
}
TimeDelta BbrNetworkControllerFactory::GetProcessInterval() const {
diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn
index d932e64..c3f7d8c 100644
--- a/modules/congestion_controller/goog_cc/BUILD.gn
+++ b/modules/congestion_controller/goog_cc/BUILD.gn
@@ -50,7 +50,6 @@
"../../../system_wrappers",
"../../bitrate_controller",
"../../remote_bitrate_estimator",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -98,7 +97,6 @@
"../../../rtc_base/experiments:alr_experiment",
"../../../rtc_base/experiments:field_trial_parser",
"../../pacing:interval_budget",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -134,7 +132,6 @@
"../../../rtc_base:safe_minmax",
"../../../rtc_base/experiments:field_trial_parser",
"../../remote_bitrate_estimator",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -160,7 +157,6 @@
"../../../system_wrappers:metrics",
"../../pacing",
"../../remote_bitrate_estimator",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -187,7 +183,6 @@
"../../../rtc_base/experiments:field_trial_parser",
"../../../rtc_base/system:unused",
"../../../system_wrappers:metrics",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -254,7 +249,6 @@
"../../../test/scenario",
"../../pacing",
"//testing/gmock",
- "//third_party/abseil-cpp/absl/memory",
]
}
diff --git a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc
index dcfb3d7..f3c992f 100644
--- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc
+++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc
@@ -13,9 +13,9 @@
#include <stddef.h>
#include <algorithm>
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "rtc_base/checks.h"
#include "rtc_base/numerics/safe_conversions.h"
@@ -25,7 +25,7 @@
const WebRtcKeyValueConfig* key_value_config)
: AcknowledgedBitrateEstimator(
key_value_config,
- absl::make_unique<BitrateEstimator>(key_value_config)) {}
+ std::make_unique<BitrateEstimator>(key_value_config)) {}
AcknowledgedBitrateEstimator::~AcknowledgedBitrateEstimator() {}
diff --git a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc
index e16849d..83ead59 100644
--- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc
+++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc
@@ -10,9 +10,9 @@
#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h"
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "api/transport/field_trial_based_config.h"
#include "rtc_base/fake_clock.h"
#include "test/gmock.h"
@@ -50,10 +50,10 @@
AcknowledgedBitrateEstimatorTestStates CreateTestStates() {
AcknowledgedBitrateEstimatorTestStates states;
auto mock_bitrate_estimator =
- absl::make_unique<MockBitrateEstimator>(&states.field_trial_config);
+ std::make_unique<MockBitrateEstimator>(&states.field_trial_config);
states.mock_bitrate_estimator = mock_bitrate_estimator.get();
states.acknowledged_bitrate_estimator =
- absl::make_unique<AcknowledgedBitrateEstimator>(
+ std::make_unique<AcknowledgedBitrateEstimator>(
&states.field_trial_config, std::move(mock_bitrate_estimator));
return states;
}
diff --git a/modules/congestion_controller/goog_cc/alr_detector.cc b/modules/congestion_controller/goog_cc/alr_detector.cc
index ff50429..6a62954 100644
--- a/modules/congestion_controller/goog_cc/alr_detector.cc
+++ b/modules/congestion_controller/goog_cc/alr_detector.cc
@@ -12,8 +12,8 @@
#include <cstdint>
#include <cstdio>
+#include <memory>
-#include "absl/memory/memory.h"
#include "api/rtc_event_log/rtc_event.h"
#include "api/rtc_event_log/rtc_event_log.h"
#include "logging/rtc_event_log/events/rtc_event_alr_state.h"
@@ -93,7 +93,7 @@
}
if (event_log_ && state_changed) {
event_log_->Log(
- absl::make_unique<RtcEventAlrState>(alr_started_time_ms_.has_value()));
+ std::make_unique<RtcEventAlrState>(alr_started_time_ms_.has_value()));
}
}
diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe.cc b/modules/congestion_controller/goog_cc/delay_based_bwe.cc
index 706e2db..2b62891 100644
--- a/modules/congestion_controller/goog_cc/delay_based_bwe.cc
+++ b/modules/congestion_controller/goog_cc/delay_based_bwe.cc
@@ -13,10 +13,10 @@
#include <algorithm>
#include <cstdint>
#include <cstdio>
+#include <memory>
#include <string>
#include <utility>
-#include "absl/memory/memory.h"
#include "api/rtc_event_log/rtc_event.h"
#include "api/rtc_event_log/rtc_event_log.h"
#include "logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h"
@@ -224,7 +224,7 @@
BWE_TEST_LOGGING_PLOT(1, "target_bitrate_bps", at_time.ms(), bitrate.bps());
if (event_log_) {
- event_log_->Log(absl::make_unique<RtcEventBweUpdateDelayBased>(
+ event_log_->Log(std::make_unique<RtcEventBweUpdateDelayBased>(
bitrate.bps(), detector_state));
}
diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.cc b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.cc
index 3ad6db1..e8e2ffd 100644
--- a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.cc
+++ b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.cc
@@ -11,8 +11,8 @@
#include <algorithm>
#include <cstdint>
+#include <memory>
-#include "absl/memory/memory.h"
#include "modules/congestion_controller/goog_cc/delay_based_bwe.h"
#include "rtc_base/checks.h"
@@ -149,8 +149,7 @@
: field_trial(),
clock_(100000000),
acknowledged_bitrate_estimator_(
- absl::make_unique<AcknowledgedBitrateEstimator>(
- &field_trial_config_)),
+ std::make_unique<AcknowledgedBitrateEstimator>(&field_trial_config_)),
probe_bitrate_estimator_(new ProbeBitrateEstimator(nullptr)),
bitrate_estimator_(
new DelayBasedBwe(&field_trial_config_, nullptr, nullptr)),
@@ -161,11 +160,10 @@
DelayBasedBweTest::DelayBasedBweTest(const std::string& field_trial_string)
: field_trial(
- absl::make_unique<test::ScopedFieldTrials>(field_trial_string)),
+ std::make_unique<test::ScopedFieldTrials>(field_trial_string)),
clock_(100000000),
acknowledged_bitrate_estimator_(
- absl::make_unique<AcknowledgedBitrateEstimator>(
- &field_trial_config_)),
+ std::make_unique<AcknowledgedBitrateEstimator>(&field_trial_config_)),
probe_bitrate_estimator_(new ProbeBitrateEstimator(nullptr)),
bitrate_estimator_(
new DelayBasedBwe(&field_trial_config_, nullptr, nullptr)),
diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc
index 6fb340f..fea7fc3 100644
--- a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc
+++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc
@@ -21,7 +21,6 @@
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/units/time_delta.h"
#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h"
#include "modules/congestion_controller/goog_cc/alr_detector.h"
@@ -80,13 +79,13 @@
new ProbeController(key_value_config_, config.event_log)),
congestion_window_pushback_controller_(
rate_control_settings_.UseCongestionWindowPushback()
- ? absl::make_unique<CongestionWindowPushbackController>(
+ ? std::make_unique<CongestionWindowPushbackController>(
key_value_config_)
: nullptr),
bandwidth_estimation_(
- absl::make_unique<SendSideBandwidthEstimation>(event_log_)),
+ std::make_unique<SendSideBandwidthEstimation>(event_log_)),
alr_detector_(
- absl::make_unique<AlrDetector>(key_value_config_, config.event_log)),
+ std::make_unique<AlrDetector>(key_value_config_, config.event_log)),
probe_bitrate_estimator_(new ProbeBitrateEstimator(config.event_log)),
network_estimator_(std::move(goog_cc_config.network_state_estimator)),
network_state_predictor_(
@@ -95,7 +94,7 @@
event_log_,
network_state_predictor_.get())),
acknowledged_bitrate_estimator_(
- absl::make_unique<AcknowledgedBitrateEstimator>(key_value_config_)),
+ std::make_unique<AcknowledgedBitrateEstimator>(key_value_config_)),
initial_config_(config),
last_raw_target_rate_(*config.constraints.starting_rate),
last_pushback_target_rate_(last_raw_target_rate_),
diff --git a/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc b/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc
index 23aec87..7a15780 100644
--- a/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc
+++ b/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc
@@ -11,8 +11,8 @@
#include "modules/congestion_controller/goog_cc/probe_bitrate_estimator.h"
#include <algorithm>
+#include <memory>
-#include "absl/memory/memory.h"
#include "api/rtc_event_log/rtc_event_log.h"
#include "logging/rtc_event_log/events/rtc_event_probe_result_failure.h"
#include "logging/rtc_event_log/events/rtc_event_probe_result_success.h"
@@ -112,7 +112,7 @@
<< " [receive interval: " << ToString(receive_interval)
<< "]";
if (event_log_) {
- event_log_->Log(absl::make_unique<RtcEventProbeResultFailure>(
+ event_log_->Log(std::make_unique<RtcEventProbeResultFailure>(
cluster_id, ProbeFailureReason::kInvalidSendReceiveInterval));
}
return absl::nullopt;
@@ -145,7 +145,7 @@
<< ToString(send_rate) << " = " << ratio
<< " > kMaxValidRatio (" << kMaxValidRatio << ")]";
if (event_log_) {
- event_log_->Log(absl::make_unique<RtcEventProbeResultFailure>(
+ event_log_->Log(std::make_unique<RtcEventProbeResultFailure>(
cluster_id, ProbeFailureReason::kInvalidSendReceiveRatio));
}
return absl::nullopt;
@@ -169,7 +169,7 @@
}
if (event_log_) {
event_log_->Log(
- absl::make_unique<RtcEventProbeResultSuccess>(cluster_id, res.bps()));
+ std::make_unique<RtcEventProbeResultSuccess>(cluster_id, res.bps()));
}
last_estimate_ = res;
estimated_data_rate_ = res;
diff --git a/modules/congestion_controller/goog_cc/probe_controller.cc b/modules/congestion_controller/goog_cc/probe_controller.cc
index 65150db..02b5833 100644
--- a/modules/congestion_controller/goog_cc/probe_controller.cc
+++ b/modules/congestion_controller/goog_cc/probe_controller.cc
@@ -12,9 +12,9 @@
#include <algorithm>
#include <initializer_list>
+#include <memory>
#include <string>
-#include "absl/memory/memory.h"
#include "api/units/data_rate.h"
#include "api/units/time_delta.h"
#include "api/units/timestamp.h"
@@ -82,7 +82,7 @@
size_t min_bytes = static_cast<int32_t>(probe.target_data_rate.bps() *
probe.target_duration.ms() / 8000);
- event_log->Log(absl::make_unique<RtcEventProbeClusterCreated>(
+ event_log->Log(std::make_unique<RtcEventProbeClusterCreated>(
probe.id, probe.target_data_rate.bps(), probe.target_probe_count,
min_bytes));
}
diff --git a/modules/congestion_controller/pcc/BUILD.gn b/modules/congestion_controller/pcc/BUILD.gn
index 2a30a22..6a2f764 100644
--- a/modules/congestion_controller/pcc/BUILD.gn
+++ b/modules/congestion_controller/pcc/BUILD.gn
@@ -18,7 +18,6 @@
"../../../api/transport:network_control",
"../../../api/units:time_delta",
"../../../rtc_base:rtc_base_approved",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -38,7 +37,6 @@
"../../../api/units:timestamp",
"../../../rtc_base:checks",
"../../../rtc_base:rtc_base_approved",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -96,7 +94,6 @@
"../../../api/transport:network_control",
"../../../api/units:data_rate",
"../../../rtc_base:rtc_base_approved",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -126,7 +123,6 @@
"../../../rtc_base:rtc_base_approved",
"../../../test:test_support",
"../../../test/scenario",
- "//third_party/abseil-cpp/absl/memory",
]
}
}
diff --git a/modules/congestion_controller/pcc/bitrate_controller.cc b/modules/congestion_controller/pcc/bitrate_controller.cc
index 2d2269f..44f306d 100644
--- a/modules/congestion_controller/pcc/bitrate_controller.cc
+++ b/modules/congestion_controller/pcc/bitrate_controller.cc
@@ -13,10 +13,10 @@
#include <algorithm>
#include <cmath>
#include <cstdlib>
+#include <memory>
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
namespace webrtc {
namespace pcc {
@@ -33,7 +33,7 @@
: PccBitrateController(initial_conversion_factor,
initial_dynamic_boundary,
dynamic_boundary_increment,
- absl::make_unique<ModifiedVivaceUtilityFunction>(
+ std::make_unique<ModifiedVivaceUtilityFunction>(
rtt_gradient_coefficient,
loss_coefficient,
throughput_coefficient,
diff --git a/modules/congestion_controller/pcc/bitrate_controller_unittest.cc b/modules/congestion_controller/pcc/bitrate_controller_unittest.cc
index 73d0f75..7188ea3 100644
--- a/modules/congestion_controller/pcc/bitrate_controller_unittest.cc
+++ b/modules/congestion_controller/pcc/bitrate_controller_unittest.cc
@@ -10,9 +10,9 @@
#include "modules/congestion_controller/pcc/bitrate_controller.h"
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "modules/congestion_controller/pcc/monitor_interval.h"
#include "test/gmock.h"
#include "test/gtest.h"
@@ -109,7 +109,7 @@
TEST(PccBitrateControllerTest, NoChangesWhenUtilityFunctionDoesntChange) {
std::unique_ptr<MockUtilityFunction> mock_utility_function =
- absl::make_unique<MockUtilityFunction>();
+ std::make_unique<MockUtilityFunction>();
EXPECT_CALL(*mock_utility_function, Compute(::testing::_))
.Times(2)
.WillOnce(::testing::Return(100))
@@ -140,7 +140,7 @@
TEST(PccBitrateControllerTest, NoBoundaryWhenSmallGradient) {
std::unique_ptr<MockUtilityFunction> mock_utility_function =
- absl::make_unique<MockUtilityFunction>();
+ std::make_unique<MockUtilityFunction>();
constexpr double kFirstMonitorIntervalUtility = 0;
const double kSecondMonitorIntervalUtility =
2 * kTargetSendingRate.bps() * kEpsilon;
@@ -177,7 +177,7 @@
TEST(PccBitrateControllerTest, FaceBoundaryWhenLargeGradient) {
std::unique_ptr<MockUtilityFunction> mock_utility_function =
- absl::make_unique<MockUtilityFunction>();
+ std::make_unique<MockUtilityFunction>();
constexpr double kFirstMonitorIntervalUtility = 0;
const double kSecondMonitorIntervalUtility =
10 * kInitialDynamicBoundary * kTargetSendingRate.bps() * 2 *
@@ -219,7 +219,7 @@
TEST(PccBitrateControllerTest, SlowStartMode) {
std::unique_ptr<MockUtilityFunction> mock_utility_function =
- absl::make_unique<MockUtilityFunction>();
+ std::make_unique<MockUtilityFunction>();
constexpr double kFirstUtilityFunction = 1000;
EXPECT_CALL(*mock_utility_function, Compute(::testing::_))
.Times(4)
@@ -256,7 +256,7 @@
TEST(PccBitrateControllerTest, StepSizeIncrease) {
std::unique_ptr<MockUtilityFunction> mock_utility_function =
- absl::make_unique<MockUtilityFunction>();
+ std::make_unique<MockUtilityFunction>();
constexpr double kFirstMiUtilityFunction = 0;
const double kSecondMiUtilityFunction =
2 * kTargetSendingRate.bps() * kEpsilon;
diff --git a/modules/congestion_controller/pcc/pcc_factory.cc b/modules/congestion_controller/pcc/pcc_factory.cc
index fb92859..c35c6e8 100644
--- a/modules/congestion_controller/pcc/pcc_factory.cc
+++ b/modules/congestion_controller/pcc/pcc_factory.cc
@@ -12,7 +12,6 @@
#include <memory>
-#include "absl/memory/memory.h"
#include "modules/congestion_controller/pcc/pcc_network_controller.h"
namespace webrtc {
@@ -21,7 +20,7 @@
std::unique_ptr<NetworkControllerInterface> PccNetworkControllerFactory::Create(
NetworkControllerConfig config) {
- return absl::make_unique<pcc::PccNetworkController>(config);
+ return std::make_unique<pcc::PccNetworkController>(config);
}
TimeDelta PccNetworkControllerFactory::GetProcessInterval() const {
diff --git a/modules/congestion_controller/rtp/BUILD.gn b/modules/congestion_controller/rtp/BUILD.gn
index 04c4234..4caef7e 100644
--- a/modules/congestion_controller/rtp/BUILD.gn
+++ b/modules/congestion_controller/rtp/BUILD.gn
@@ -33,7 +33,6 @@
"../../../rtc_base/synchronization:sequence_checker",
"../../../system_wrappers:field_trial",
"../../pacing",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn
index 19b2827..bf2da63 100644
--- a/modules/desktop_capture/BUILD.gn
+++ b/modules/desktop_capture/BUILD.gn
@@ -33,7 +33,6 @@
"../../api:scoped_refptr",
"../../rtc_base:checks",
"../../rtc_base/system:rtc_export",
- "//third_party/abseil-cpp/absl/memory",
]
if (!build_with_mozilla) {
@@ -50,7 +49,6 @@
"../../api:function_view",
"../../api:scoped_refptr",
"../../rtc_base:checks",
- "//third_party/abseil-cpp/absl/memory",
]
if (rtc_desktop_capture_supported) {
deps += [
@@ -105,7 +103,6 @@
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:cpu_features_api",
"../../test:test_support",
- "//third_party/abseil-cpp/absl/memory",
]
if (rtc_desktop_capture_supported) {
sources += [
@@ -139,7 +136,6 @@
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
- "//third_party/abseil-cpp/absl/memory",
]
if (is_posix || is_fuchsia) {
@@ -247,7 +243,6 @@
"../../rtc_base:rtc_base_approved",
"../../rtc_base/synchronization:rw_lock_wrapper",
"../../sdk:helpers_objc",
- "//third_party/abseil-cpp/absl/memory",
]
libs = [
"AppKit.framework",
diff --git a/modules/desktop_capture/cropped_desktop_frame_unittest.cc b/modules/desktop_capture/cropped_desktop_frame_unittest.cc
index e50f1d7..c4ccb87 100644
--- a/modules/desktop_capture/cropped_desktop_frame_unittest.cc
+++ b/modules/desktop_capture/cropped_desktop_frame_unittest.cc
@@ -13,7 +13,6 @@
#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "modules/desktop_capture/desktop_frame.h"
#include "modules/desktop_capture/shared_desktop_frame.h"
#include "test/gtest.h"
@@ -21,7 +20,7 @@
namespace webrtc {
std::unique_ptr<DesktopFrame> CreateTestFrame() {
- return absl::make_unique<BasicDesktopFrame>(DesktopSize(10, 20));
+ return std::make_unique<BasicDesktopFrame>(DesktopSize(10, 20));
}
TEST(CroppedDesktopFrameTest, DoNotCreateWrapperIfSizeIsNotChanged) {
diff --git a/modules/desktop_capture/desktop_and_cursor_composer.cc b/modules/desktop_capture/desktop_and_cursor_composer.cc
index 369d2ac..b668490 100644
--- a/modules/desktop_capture/desktop_and_cursor_composer.cc
+++ b/modules/desktop_capture/desktop_and_cursor_composer.cc
@@ -13,9 +13,9 @@
#include <stdint.h>
#include <string.h>
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "modules/desktop_capture/desktop_capturer.h"
#include "modules/desktop_capture/desktop_frame.h"
#include "modules/desktop_capture/mouse_cursor.h"
@@ -185,7 +185,7 @@
relative_position.set(relative_position.x() * scale,
relative_position.y() * scale);
#endif
- frame = absl::make_unique<DesktopFrameWithCursor>(
+ frame = std::make_unique<DesktopFrameWithCursor>(
std::move(frame), *cursor_, relative_position);
}
}
diff --git a/modules/desktop_capture/desktop_frame.cc b/modules/desktop_capture/desktop_frame.cc
index a69cbcc..fd10dd5 100644
--- a/modules/desktop_capture/desktop_frame.cc
+++ b/modules/desktop_capture/desktop_frame.cc
@@ -13,9 +13,9 @@
#include <string.h>
#include <cmath>
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "modules/desktop_capture/desktop_capture_types.h"
#include "modules/desktop_capture/desktop_geometry.h"
#include "rtc_base/checks.h"
@@ -179,7 +179,7 @@
if (!shared_memory)
return nullptr;
- return absl::make_unique<SharedMemoryDesktopFrame>(
+ return std::make_unique<SharedMemoryDesktopFrame>(
size, size.width() * kBytesPerPixel, std::move(shared_memory));
}
diff --git a/modules/desktop_capture/desktop_frame_unittest.cc b/modules/desktop_capture/desktop_frame_unittest.cc
index d3417f7..ce0cbb4 100644
--- a/modules/desktop_capture/desktop_frame_unittest.cc
+++ b/modules/desktop_capture/desktop_frame_unittest.cc
@@ -10,7 +10,8 @@
#include "modules/desktop_capture/desktop_frame.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "modules/desktop_capture/desktop_region.h"
#include "modules/desktop_capture/test_utils.h"
#include "rtc_base/arraysize.h"
@@ -23,7 +24,7 @@
std::unique_ptr<DesktopFrame> CreateTestFrame(DesktopRect rect,
int pixels_value) {
DesktopSize size = rect.size();
- auto frame = absl::make_unique<BasicDesktopFrame>(size);
+ auto frame = std::make_unique<BasicDesktopFrame>(size);
frame->set_top_left(rect.top_left());
memset(frame->data(), pixels_value, frame->stride() * size.height());
return frame;
diff --git a/modules/desktop_capture/linux/screen_capturer_pipewire.cc b/modules/desktop_capture/linux/screen_capturer_pipewire.cc
index 724d853..fe67214 100644
--- a/modules/desktop_capture/linux/screen_capturer_pipewire.cc
+++ b/modules/desktop_capture/linux/screen_capturer_pipewire.cc
@@ -12,7 +12,6 @@
#include <memory>
-#include "absl/memory/memory.h"
namespace webrtc {
@@ -24,7 +23,7 @@
std::unique_ptr<DesktopCapturer>
ScreenCapturerPipeWire::CreateRawScreenCapturer(
const DesktopCaptureOptions& options) {
- return absl::make_unique<ScreenCapturerPipeWire>();
+ return std::make_unique<ScreenCapturerPipeWire>();
}
} // namespace webrtc
diff --git a/modules/desktop_capture/linux/screen_capturer_x11.cc b/modules/desktop_capture/linux/screen_capturer_x11.cc
index 128f81f..4bb49fb 100644
--- a/modules/desktop_capture/linux/screen_capturer_x11.cc
+++ b/modules/desktop_capture/linux/screen_capturer_x11.cc
@@ -20,7 +20,6 @@
#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "modules/desktop_capture/desktop_capture_options.h"
#include "modules/desktop_capture/desktop_capturer.h"
#include "modules/desktop_capture/desktop_frame.h"
@@ -53,7 +52,7 @@
TRACE_EVENT0("webrtc", "ScreenCapturerX11::Init");
options_ = options;
- atom_cache_ = absl::make_unique<XAtomCache>(display());
+ atom_cache_ = std::make_unique<XAtomCache>(display());
root_window_ = RootWindow(display(), DefaultScreen(display()));
if (root_window_ == BadValue) {
diff --git a/modules/desktop_capture/linux/window_capturer_pipewire.cc b/modules/desktop_capture/linux/window_capturer_pipewire.cc
index 1c195aa..b455915 100644
--- a/modules/desktop_capture/linux/window_capturer_pipewire.cc
+++ b/modules/desktop_capture/linux/window_capturer_pipewire.cc
@@ -12,7 +12,6 @@
#include <memory>
-#include "absl/memory/memory.h"
namespace webrtc {
@@ -24,7 +23,7 @@
std::unique_ptr<DesktopCapturer>
WindowCapturerPipeWire::CreateRawWindowCapturer(
const DesktopCaptureOptions& options) {
- return absl::make_unique<WindowCapturerPipeWire>();
+ return std::make_unique<WindowCapturerPipeWire>();
}
} // namespace webrtc
diff --git a/modules/desktop_capture/linux/window_finder_x11.cc b/modules/desktop_capture/linux/window_finder_x11.cc
index 6f0517c..16fb325 100644
--- a/modules/desktop_capture/linux/window_finder_x11.cc
+++ b/modules/desktop_capture/linux/window_finder_x11.cc
@@ -14,7 +14,6 @@
#include <memory>
-#include "absl/memory/memory.h"
#include "modules/desktop_capture/linux/window_list_utils.h"
#include "rtc_base/checks.h"
@@ -47,7 +46,7 @@
return nullptr;
}
- return absl::make_unique<WindowFinderX11>(options.cache);
+ return std::make_unique<WindowFinderX11>(options.cache);
}
} // namespace webrtc
diff --git a/modules/desktop_capture/screen_drawer_linux.cc b/modules/desktop_capture/screen_drawer_linux.cc
index 47a50dc..afd29ce 100644
--- a/modules/desktop_capture/screen_drawer_linux.cc
+++ b/modules/desktop_capture/screen_drawer_linux.cc
@@ -14,7 +14,6 @@
#include <memory>
-#include "absl/memory/memory.h"
#include "api/scoped_refptr.h"
#include "modules/desktop_capture/desktop_capture_types.h"
#include "modules/desktop_capture/desktop_geometry.h"
@@ -172,13 +171,13 @@
// static
std::unique_ptr<ScreenDrawerLock> ScreenDrawerLock::Create() {
- return absl::make_unique<ScreenDrawerLockPosix>();
+ return std::make_unique<ScreenDrawerLockPosix>();
}
// static
std::unique_ptr<ScreenDrawer> ScreenDrawer::Create() {
if (SharedXDisplay::CreateDefault().get()) {
- return absl::make_unique<ScreenDrawerLinux>();
+ return std::make_unique<ScreenDrawerLinux>();
}
return nullptr;
}
diff --git a/modules/desktop_capture/screen_drawer_mac.cc b/modules/desktop_capture/screen_drawer_mac.cc
index 156a2e9..17719e4 100644
--- a/modules/desktop_capture/screen_drawer_mac.cc
+++ b/modules/desktop_capture/screen_drawer_mac.cc
@@ -10,7 +10,8 @@
// TODO(zijiehe): Implement ScreenDrawerMac
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "modules/desktop_capture/screen_drawer.h"
#include "modules/desktop_capture/screen_drawer_lock_posix.h"
@@ -18,7 +19,7 @@
// static
std::unique_ptr<ScreenDrawerLock> ScreenDrawerLock::Create() {
- return absl::make_unique<ScreenDrawerLockPosix>();
+ return std::make_unique<ScreenDrawerLockPosix>();
}
// static
diff --git a/modules/desktop_capture/screen_drawer_unittest.cc b/modules/desktop_capture/screen_drawer_unittest.cc
index e51b0aa..42e3587 100644
--- a/modules/desktop_capture/screen_drawer_unittest.cc
+++ b/modules/desktop_capture/screen_drawer_unittest.cc
@@ -13,8 +13,8 @@
#include <stdint.h>
#include <atomic>
+#include <memory>
-#include "absl/memory/memory.h"
#include "api/function_view.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
@@ -154,7 +154,7 @@
ScreenDrawerLockPosix::Unlink(semaphore_name);
TestScreenDrawerLock([semaphore_name]() {
- return absl::make_unique<ScreenDrawerLockPosix>(semaphore_name);
+ return std::make_unique<ScreenDrawerLockPosix>(semaphore_name);
});
#elif defined(WEBRTC_WIN)
TestScreenDrawerLock([]() { return ScreenDrawerLock::Create(); });
diff --git a/modules/desktop_capture/win/screen_capturer_win_directx.cc b/modules/desktop_capture/win/screen_capturer_win_directx.cc
index ad62fb8..df3bee8 100644
--- a/modules/desktop_capture/win/screen_capturer_win_directx.cc
+++ b/modules/desktop_capture/win/screen_capturer_win_directx.cc
@@ -11,11 +11,11 @@
#include "modules/desktop_capture/win/screen_capturer_win_directx.h"
#include <algorithm>
+#include <memory>
#include <string>
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "modules/desktop_capture/desktop_frame.h"
#include "modules/desktop_capture/win/screen_capture_utils.h"
#include "rtc_base/checks.h"
@@ -124,7 +124,7 @@
frames_.MoveToNextFrame();
if (!frames_.current_frame()) {
frames_.ReplaceCurrentFrame(
- absl::make_unique<DxgiFrame>(shared_memory_factory_.get()));
+ std::make_unique<DxgiFrame>(shared_memory_factory_.get()));
}
DxgiDuplicatorController::Result result;
diff --git a/modules/desktop_capture/window_capturer_win.cc b/modules/desktop_capture/window_capturer_win.cc
index de3a7b3..7258e89 100644
--- a/modules/desktop_capture/window_capturer_win.cc
+++ b/modules/desktop_capture/window_capturer_win.cc
@@ -12,7 +12,6 @@
#include <memory>
-#include "absl/memory/memory.h"
#include "modules/desktop_capture/cropped_desktop_frame.h"
#include "modules/desktop_capture/desktop_capturer.h"
#include "modules/desktop_capture/desktop_frame_win.h"
@@ -442,7 +441,7 @@
if (!owned_windows_.empty()) {
if (!owned_window_capturer_) {
- owned_window_capturer_ = absl::make_unique<WindowCapturerWin>();
+ owned_window_capturer_ = std::make_unique<WindowCapturerWin>();
}
// Owned windows are stored in top-down z-order, so this iterates in
diff --git a/modules/desktop_capture/window_finder_mac.mm b/modules/desktop_capture/window_finder_mac.mm
index f75822a..64979c6 100644
--- a/modules/desktop_capture/window_finder_mac.mm
+++ b/modules/desktop_capture/window_finder_mac.mm
@@ -12,9 +12,9 @@
#include <CoreFoundation/CoreFoundation.h>
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "modules/desktop_capture/mac/desktop_configuration.h"
#include "modules/desktop_capture/mac/desktop_configuration_monitor.h"
#include "modules/desktop_capture/mac/window_list_utils.h"
@@ -45,7 +45,7 @@
// static
std::unique_ptr<WindowFinder> WindowFinder::Create(
const WindowFinder::Options& options) {
- return absl::make_unique<WindowFinderMac>(options.configuration_monitor);
+ return std::make_unique<WindowFinderMac>(options.configuration_monitor);
}
} // namespace webrtc
diff --git a/modules/desktop_capture/window_finder_unittest.cc b/modules/desktop_capture/window_finder_unittest.cc
index 6fda6b7..df4d65c 100644
--- a/modules/desktop_capture/window_finder_unittest.cc
+++ b/modules/desktop_capture/window_finder_unittest.cc
@@ -21,7 +21,6 @@
#include "test/gtest.h"
#if defined(USE_X11)
-#include "absl/memory/memory.h"
#include "modules/desktop_capture/linux/shared_x_display.h"
#include "modules/desktop_capture/linux/x_atom_cache.h"
#endif
@@ -97,7 +96,7 @@
std::unique_ptr<XAtomCache> cache;
const auto shared_x_display = SharedXDisplay::CreateDefault();
if (shared_x_display) {
- cache = absl::make_unique<XAtomCache>(shared_x_display->display());
+ cache = std::make_unique<XAtomCache>(shared_x_display->display());
options.cache = cache.get();
}
#endif
@@ -153,7 +152,7 @@
std::unique_ptr<XAtomCache> cache;
const auto shared_x_display = SharedXDisplay::CreateDefault();
if (shared_x_display) {
- cache = absl::make_unique<XAtomCache>(shared_x_display->display());
+ cache = std::make_unique<XAtomCache>(shared_x_display->display());
options.cache = cache.get();
}
#endif
diff --git a/modules/desktop_capture/window_finder_win.cc b/modules/desktop_capture/window_finder_win.cc
index 10ffe0d..a8c3d39 100644
--- a/modules/desktop_capture/window_finder_win.cc
+++ b/modules/desktop_capture/window_finder_win.cc
@@ -12,7 +12,7 @@
#include <windows.h>
-#include "absl/memory/memory.h"
+#include <memory>
namespace webrtc {
@@ -40,7 +40,7 @@
// static
std::unique_ptr<WindowFinder> WindowFinder::Create(
const WindowFinder::Options& options) {
- return absl::make_unique<WindowFinderWin>();
+ return std::make_unique<WindowFinderWin>();
}
} // namespace webrtc
diff --git a/modules/pacing/BUILD.gn b/modules/pacing/BUILD.gn
index 258e511..edd5c70 100644
--- a/modules/pacing/BUILD.gn
+++ b/modules/pacing/BUILD.gn
@@ -96,7 +96,6 @@
"../rtp_rtcp",
"../rtp_rtcp:mock_rtp_rtcp",
"../rtp_rtcp:rtp_rtcp_format",
- "//third_party/abseil-cpp/absl/memory",
]
}
diff --git a/modules/pacing/paced_sender_unittest.cc b/modules/pacing/paced_sender_unittest.cc
index 581ff20..7eb5350 100644
--- a/modules/pacing/paced_sender_unittest.cc
+++ b/modules/pacing/paced_sender_unittest.cc
@@ -16,7 +16,6 @@
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "modules/pacing/packet_router.h"
#include "modules/utility/include/mock/mock_process_thread.h"
#include "system_wrappers/include/clock.h"
@@ -53,7 +52,7 @@
};
std::unique_ptr<RtpPacketToSend> BuildRtpPacket(RtpPacketToSend::Type type) {
- auto packet = absl::make_unique<RtpPacketToSend>(nullptr);
+ auto packet = std::make_unique<RtpPacketToSend>(nullptr);
packet->set_packet_type(type);
switch (type) {
case RtpPacketToSend::Type::kAudio:
diff --git a/modules/pacing/pacing_controller.cc b/modules/pacing/pacing_controller.cc
index 3ee7410..1633de9 100644
--- a/modules/pacing/pacing_controller.cc
+++ b/modules/pacing/pacing_controller.cc
@@ -11,10 +11,10 @@
#include "modules/pacing/pacing_controller.h"
#include <algorithm>
+#include <memory>
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "modules/pacing/bitrate_prober.h"
#include "modules/pacing/interval_budget.h"
#include "modules/utility/include/process_thread.h"
@@ -81,7 +81,7 @@
: clock_(clock),
packet_sender_(packet_sender),
fallback_field_trials_(
- !field_trials ? absl::make_unique<FieldTrialBasedConfig>() : nullptr),
+ !field_trials ? std::make_unique<FieldTrialBasedConfig>() : nullptr),
field_trials_(field_trials ? field_trials : fallback_field_trials_.get()),
drain_large_queues_(
!IsDisabled(*field_trials_, "WebRTC-Pacer-DrainQueue")),
diff --git a/modules/pacing/pacing_controller_unittest.cc b/modules/pacing/pacing_controller_unittest.cc
index e07e8c8..bcd4384 100644
--- a/modules/pacing/pacing_controller_unittest.cc
+++ b/modules/pacing/pacing_controller_unittest.cc
@@ -17,7 +17,6 @@
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/units/data_rate.h"
#include "modules/pacing/packet_router.h"
#include "system_wrappers/include/clock.h"
@@ -56,7 +55,7 @@
uint16_t sequence_number,
int64_t capture_time_ms,
size_t size) {
- auto packet = absl::make_unique<RtpPacketToSend>(nullptr);
+ auto packet = std::make_unique<RtpPacketToSend>(nullptr);
packet->set_packet_type(type);
packet->SetSsrc(ssrc);
packet->SetSequenceNumber(sequence_number);
@@ -83,7 +82,7 @@
std::vector<std::unique_ptr<RtpPacketToSend>> ret;
size_t padding_size = SendPadding(target_size.bytes());
if (padding_size > 0) {
- auto packet = absl::make_unique<RtpPacketToSend>(nullptr);
+ auto packet = std::make_unique<RtpPacketToSend>(nullptr);
packet->SetPayloadSize(padding_size);
packet->set_packet_type(RtpPacketToSend::Type::kPadding);
ret.emplace_back(std::move(packet));
@@ -126,7 +125,7 @@
(target_size.bytes() + kPaddingPacketSize - 1) / kPaddingPacketSize;
std::vector<std::unique_ptr<RtpPacketToSend>> packets;
for (size_t i = 0; i < num_packets; ++i) {
- packets.emplace_back(absl::make_unique<RtpPacketToSend>(nullptr));
+ packets.emplace_back(std::make_unique<RtpPacketToSend>(nullptr));
packets.back()->SetPadding(kPaddingPacketSize);
packets.back()->set_packet_type(RtpPacketToSend::Type::kPadding);
padding_sent_ += kPaddingPacketSize;
@@ -154,7 +153,7 @@
std::vector<std::unique_ptr<RtpPacketToSend>> GeneratePadding(
DataSize target_size) override {
std::vector<std::unique_ptr<RtpPacketToSend>> packets;
- packets.emplace_back(absl::make_unique<RtpPacketToSend>(nullptr));
+ packets.emplace_back(std::make_unique<RtpPacketToSend>(nullptr));
packets.back()->SetPadding(target_size.bytes());
packets.back()->set_packet_type(RtpPacketToSend::Type::kPadding);
padding_sent_ += target_size.bytes();
@@ -175,8 +174,8 @@
PacingControllerTest() : clock_(123456) {
srand(0);
// Need to initialize PacingController after we initialize clock.
- pacer_ = absl::make_unique<PacingController>(&clock_, &callback_, nullptr,
- nullptr);
+ pacer_ = std::make_unique<PacingController>(&clock_, &callback_, nullptr,
+ nullptr);
Init();
}
@@ -215,7 +214,7 @@
}
std::unique_ptr<RtpPacketToSend> BuildRtpPacket(RtpPacketToSend::Type type) {
- auto packet = absl::make_unique<RtpPacketToSend>(nullptr);
+ auto packet = std::make_unique<RtpPacketToSend>(nullptr);
packet->set_packet_type(type);
switch (type) {
case RtpPacketToSend::Type::kAudio:
@@ -614,7 +613,7 @@
const int64_t kBitrateWindow = 10000;
PacingControllerPadding callback;
pacer_ =
- absl::make_unique<PacingController>(&clock_, &callback, nullptr, nullptr);
+ std::make_unique<PacingController>(&clock_, &callback, nullptr, nullptr);
pacer_->SetProbingEnabled(false);
pacer_->SetPacingRates(kTargetRate * kPaceMultiplier, kTargetRate);
@@ -1066,8 +1065,8 @@
uint16_t sequence_number = 1234;
PacingControllerProbing packet_sender;
- pacer_ = absl::make_unique<PacingController>(&clock_, &packet_sender, nullptr,
- nullptr);
+ pacer_ = std::make_unique<PacingController>(&clock_, &packet_sender, nullptr,
+ nullptr);
pacer_->CreateProbeCluster(kFirstClusterRate,
/*cluster_id=*/0);
pacer_->CreateProbeCluster(kSecondClusterRate,
@@ -1113,8 +1112,8 @@
uint16_t sequence_number = 1234;
PacingControllerProbing packet_sender;
- pacer_ = absl::make_unique<PacingController>(&clock_, &packet_sender, nullptr,
- nullptr);
+ pacer_ = std::make_unique<PacingController>(&clock_, &packet_sender, nullptr,
+ nullptr);
pacer_->CreateProbeCluster(kFirstClusterRate,
/*cluster_id=*/0);
pacer_->SetPacingRates(DataRate::bps(kInitialBitrateBps * kPaceMultiplier),
@@ -1174,7 +1173,7 @@
MockPacketSender callback;
pacer_ =
- absl::make_unique<PacingController>(&clock_, &callback, nullptr, nullptr);
+ std::make_unique<PacingController>(&clock_, &callback, nullptr, nullptr);
Init();
uint32_t ssrc = 12346;
@@ -1228,7 +1227,7 @@
TEST_F(PacingControllerTest, OwnedPacketPrioritizedOnType) {
MockPacketSender callback;
pacer_ =
- absl::make_unique<PacingController>(&clock_, &callback, nullptr, nullptr);
+ std::make_unique<PacingController>(&clock_, &callback, nullptr, nullptr);
Init();
// Insert a packet of each type, from low to high priority. Since priority
diff --git a/modules/pacing/packet_router_unittest.cc b/modules/pacing/packet_router_unittest.cc
index ec82a66..22de617 100644
--- a/modules/pacing/packet_router_unittest.cc
+++ b/modules/pacing/packet_router_unittest.cc
@@ -12,9 +12,9 @@
#include <cstddef>
#include <cstdint>
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "api/units/time_delta.h"
#include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
#include "modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
@@ -58,7 +58,7 @@
protected:
std::unique_ptr<RtpPacketToSend> BuildRtpPacket(uint32_t ssrc) {
std::unique_ptr<RtpPacketToSend> packet =
- absl::make_unique<RtpPacketToSend>(&extension_manager);
+ std::make_unique<RtpPacketToSend>(&extension_manager);
packet->SetSsrc(ssrc);
return packet;
}
@@ -265,7 +265,7 @@
// Send a packet without TransportSequenceNumber extension registered,
// packets sent should not have the extension set.
RtpHeaderExtensionMap extension_manager;
- auto packet = absl::make_unique<RtpPacketToSend>(&extension_manager);
+ auto packet = std::make_unique<RtpPacketToSend>(&extension_manager);
packet->SetSsrc(kSsrc1);
EXPECT_CALL(
rtp_1,
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 2f3c079..ddb8eb2 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -117,7 +117,6 @@
"../../system_wrappers",
"../video_coding:codec_globals_headers",
"//third_party/abseil-cpp/absl/algorithm:container",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
"//third_party/abseil-cpp/absl/types:variant",
@@ -260,7 +259,6 @@
"../video_coding:codec_globals_headers",
"//third_party/abseil-cpp/absl/algorithm:container",
"//third_party/abseil-cpp/absl/container:inlined_vector",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
"//third_party/abseil-cpp/absl/types:variant",
diff --git a/modules/rtp_rtcp/source/nack_rtx_unittest.cc b/modules/rtp_rtcp/source/nack_rtx_unittest.cc
index bd13280..d9717a6 100644
--- a/modules/rtp_rtcp/source/nack_rtx_unittest.cc
+++ b/modules/rtp_rtcp/source/nack_rtx_unittest.cc
@@ -14,7 +14,6 @@
#include <set>
#include "absl/algorithm/container.h"
-#include "absl/memory/memory.h"
#include "api/call/transport.h"
#include "api/transport/field_trial_based_config.h"
#include "call/rtp_stream_receiver_controller.h"
@@ -137,7 +136,7 @@
configuration.retransmission_rate_limiter = &retransmission_rate_limiter_;
configuration.local_media_ssrc = kTestSsrc;
rtp_rtcp_module_ = RtpRtcp::Create(configuration);
- rtp_sender_video_ = absl::make_unique<RTPSenderVideo>(
+ rtp_sender_video_ = std::make_unique<RTPSenderVideo>(
&fake_clock, rtp_rtcp_module_->RtpSender(), nullptr,
&playout_delay_oracle_, nullptr, false, false, false,
FieldTrialBasedConfig());
diff --git a/modules/rtp_rtcp/source/receive_statistics_impl.cc b/modules/rtp_rtcp/source/receive_statistics_impl.cc
index 4720776..0c47e08 100644
--- a/modules/rtp_rtcp/source/receive_statistics_impl.cc
+++ b/modules/rtp_rtcp/source/receive_statistics_impl.cc
@@ -15,7 +15,6 @@
#include <memory>
#include <vector>
-#include "absl/memory/memory.h"
#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h"
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
#include "modules/rtp_rtcp/source/rtp_rtcp_config.h"
@@ -296,7 +295,7 @@
}
std::unique_ptr<ReceiveStatistics> ReceiveStatistics::Create(Clock* clock) {
- return absl::make_unique<ReceiveStatisticsImpl>(clock);
+ return std::make_unique<ReceiveStatisticsImpl>(clock);
}
ReceiveStatisticsImpl::ReceiveStatisticsImpl(Clock* clock)
diff --git a/modules/rtp_rtcp/source/rtcp_receiver.cc b/modules/rtp_rtcp/source/rtcp_receiver.cc
index 71005da..f06fd1c 100644
--- a/modules/rtp_rtcp/source/rtcp_receiver.cc
+++ b/modules/rtp_rtcp/source/rtcp_receiver.cc
@@ -18,7 +18,6 @@
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/video/video_bitrate_allocation.h"
#include "api/video/video_bitrate_allocator.h"
#include "modules/rtp_rtcp/source/rtcp_packet/bye.h"
@@ -911,7 +910,7 @@
}
{
- auto loss_notification = absl::make_unique<rtcp::LossNotification>();
+ auto loss_notification = std::make_unique<rtcp::LossNotification>();
if (loss_notification->Parse(rtcp_block)) {
packet_information->packet_type_flags |= kRtcpLossNotification;
packet_information->loss_notification = std::move(loss_notification);
diff --git a/modules/rtp_rtcp/source/rtcp_sender.cc b/modules/rtp_rtcp/source/rtcp_sender.cc
index 4c1a241..ba46ece 100644
--- a/modules/rtp_rtcp/source/rtcp_sender.cc
+++ b/modules/rtp_rtcp/source/rtcp_sender.cc
@@ -13,9 +13,9 @@
#include <string.h> // memcpy
#include <algorithm> // std::min
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "api/rtc_event_log/rtc_event_log.h"
#include "logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h"
#include "modules/rtp_rtcp/source/rtcp_packet/app.h"
@@ -82,8 +82,7 @@
if (transport_->SendRtcp(packet.data(), packet.size())) {
bytes_sent += packet.size();
if (event_log_) {
- event_log_->Log(
- absl::make_unique<RtcEventRtcpPacketOutgoing>(packet));
+ event_log_->Log(std::make_unique<RtcEventRtcpPacketOutgoing>(packet));
}
}
});
@@ -606,7 +605,7 @@
std::unique_ptr<rtcp::RtcpPacket> RTCPSender::BuildLossNotification(
const RtcpContext& ctx) {
- auto loss_notification = absl::make_unique<rtcp::LossNotification>(
+ auto loss_notification = std::make_unique<rtcp::LossNotification>(
loss_notification_state_.last_decoded_seq_num,
loss_notification_state_.last_received_seq_num,
loss_notification_state_.decodability_flag);
@@ -989,7 +988,7 @@
auto callback = [&](rtc::ArrayView<const uint8_t> packet) {
if (transport_->SendRtcp(packet.data(), packet.size())) {
if (event_log_)
- event_log_->Log(absl::make_unique<RtcEventRtcpPacketOutgoing>(packet));
+ event_log_->Log(std::make_unique<RtcEventRtcpPacketOutgoing>(packet));
} else {
send_failure = true;
}
diff --git a/modules/rtp_rtcp/source/rtcp_transceiver.cc b/modules/rtp_rtcp/source/rtcp_transceiver.cc
index 91ef4cd..4538301 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver.cc
+++ b/modules/rtp_rtcp/source/rtcp_transceiver.cc
@@ -10,9 +10,9 @@
#include "modules/rtp_rtcp/source/rtcp_transceiver.h"
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
#include "rtc_base/checks.h"
#include "rtc_base/event.h"
@@ -23,7 +23,7 @@
RtcpTransceiver::RtcpTransceiver(const RtcpTransceiverConfig& config)
: task_queue_(config.task_queue),
- rtcp_transceiver_(absl::make_unique<RtcpTransceiverImpl>(config)) {
+ rtcp_transceiver_(std::make_unique<RtcpTransceiverImpl>(config)) {
RTC_DCHECK(task_queue_);
}
diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_unittest.cc b/modules/rtp_rtcp/source/rtcp_transceiver_unittest.cc
index 12bf49c..8be17ca 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_transceiver_unittest.cc
@@ -12,7 +12,6 @@
#include <memory>
-#include "absl/memory/memory.h"
#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
#include "rtc_base/event.h"
@@ -79,7 +78,7 @@
std::unique_ptr<RtcpTransceiver> rtcp_transceiver;
queue.PostTask([&] {
- rtcp_transceiver = absl::make_unique<RtcpTransceiver>(config);
+ rtcp_transceiver = std::make_unique<RtcpTransceiver>(config);
rtcp_transceiver->SendCompoundPacket();
});
WaitPostedTasks(&queue);
@@ -91,7 +90,7 @@
RtcpTransceiverConfig config;
config.outgoing_transport = &outgoing_transport;
config.task_queue = &queue;
- auto rtcp_transceiver = absl::make_unique<RtcpTransceiver>(config);
+ auto rtcp_transceiver = std::make_unique<RtcpTransceiver>(config);
queue.PostTask([&] {
// Insert a packet just before destruction to test for races.
@@ -162,7 +161,7 @@
RtcpTransceiver rtcp_transceiver(config);
rtc::Event observer_deleted;
- auto observer = absl::make_unique<MockMediaReceiverRtcpObserver>();
+ auto observer = std::make_unique<MockMediaReceiverRtcpObserver>();
EXPECT_CALL(*observer, OnSenderReport(kRemoteSsrc, _, 1));
EXPECT_CALL(*observer, OnSenderReport(kRemoteSsrc, _, 2)).Times(0);
@@ -187,7 +186,7 @@
config.outgoing_transport = &null_transport;
config.task_queue = &queue;
RtcpTransceiver rtcp_transceiver(config);
- auto observer = absl::make_unique<MockMediaReceiverRtcpObserver>();
+ auto observer = std::make_unique<MockMediaReceiverRtcpObserver>();
rtcp_transceiver.AddMediaReceiverRtcpObserver(kRemoteSsrc, observer.get());
rtc::Event queue_blocker;
@@ -241,7 +240,7 @@
config.task_queue = &queue;
config.schedule_periodic_compound_packets = true;
- auto rtcp_transceiver = absl::make_unique<RtcpTransceiver>(config);
+ auto rtcp_transceiver = std::make_unique<RtcpTransceiver>(config);
rtc::Event done;
rtcp_transceiver->SendCompoundPacket();
rtcp_transceiver->Stop([&] {
diff --git a/modules/rtp_rtcp/source/rtp_dependency_descriptor_reader.cc b/modules/rtp_rtcp/source/rtp_dependency_descriptor_reader.cc
index 1ed0e20..8f0dced 100644
--- a/modules/rtp_rtcp/source/rtp_dependency_descriptor_reader.cc
+++ b/modules/rtp_rtcp/source/rtp_dependency_descriptor_reader.cc
@@ -13,7 +13,6 @@
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "rtc_base/bit_buffer.h"
#include "rtc_base/checks.h"
@@ -65,7 +64,7 @@
void RtpDependencyDescriptorReader::ReadTemplateDependencyStructure() {
descriptor_->attached_structure =
- absl::make_unique<FrameDependencyStructure>();
+ std::make_unique<FrameDependencyStructure>();
descriptor_->attached_structure->structure_id = ReadBits(6);
descriptor_->attached_structure->num_decode_targets = ReadBits(5) + 1;
diff --git a/modules/rtp_rtcp/source/rtp_format.cc b/modules/rtp_rtcp/source/rtp_format.cc
index e870232..df9cb02 100644
--- a/modules/rtp_rtcp/source/rtp_format.cc
+++ b/modules/rtp_rtcp/source/rtp_format.cc
@@ -10,7 +10,8 @@
#include "modules/rtp_rtcp/source/rtp_format.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "absl/types/variant.h"
#include "modules/rtp_rtcp/source/rtp_format_h264.h"
#include "modules/rtp_rtcp/source/rtp_format_video_generic.h"
@@ -33,7 +34,7 @@
const RTPFragmentationHeader* fragmentation) {
if (!type) {
// Use raw packetizer.
- return absl::make_unique<RtpPacketizerGeneric>(payload, limits);
+ return std::make_unique<RtpPacketizerGeneric>(payload, limits);
}
switch (*type) {
@@ -41,21 +42,21 @@
RTC_CHECK(fragmentation);
const auto& h264 =
absl::get<RTPVideoHeaderH264>(rtp_video_header.video_type_header);
- return absl::make_unique<RtpPacketizerH264>(
+ return std::make_unique<RtpPacketizerH264>(
payload, limits, h264.packetization_mode, *fragmentation);
}
case kVideoCodecVP8: {
const auto& vp8 =
absl::get<RTPVideoHeaderVP8>(rtp_video_header.video_type_header);
- return absl::make_unique<RtpPacketizerVp8>(payload, limits, vp8);
+ return std::make_unique<RtpPacketizerVp8>(payload, limits, vp8);
}
case kVideoCodecVP9: {
const auto& vp9 =
absl::get<RTPVideoHeaderVP9>(rtp_video_header.video_type_header);
- return absl::make_unique<RtpPacketizerVp9>(payload, limits, vp9);
+ return std::make_unique<RtpPacketizerVp9>(payload, limits, vp9);
}
default: {
- return absl::make_unique<RtpPacketizerGeneric>(
+ return std::make_unique<RtpPacketizerGeneric>(
payload, limits, rtp_video_header, frame_type);
}
}
diff --git a/modules/rtp_rtcp/source/rtp_packet_history.cc b/modules/rtp_rtcp/source/rtp_packet_history.cc
index e23e0bf..fd8e5dd 100644
--- a/modules/rtp_rtcp/source/rtp_packet_history.cc
+++ b/modules/rtp_rtcp/source/rtp_packet_history.cc
@@ -12,9 +12,9 @@
#include <algorithm>
#include <limits>
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
@@ -190,14 +190,14 @@
packet->pending_transmission_ = false;
// Return copy of packet instance since it may need to be retransmitted.
- return absl::make_unique<RtpPacketToSend>(*packet->packet_);
+ return std::make_unique<RtpPacketToSend>(*packet->packet_);
}
std::unique_ptr<RtpPacketToSend> RtpPacketHistory::GetPacketAndMarkAsPending(
uint16_t sequence_number) {
return GetPacketAndMarkAsPending(
sequence_number, [](const RtpPacketToSend& packet) {
- return absl::make_unique<RtpPacketToSend>(packet);
+ return std::make_unique<RtpPacketToSend>(packet);
});
}
@@ -298,7 +298,7 @@
std::unique_ptr<RtpPacketToSend> RtpPacketHistory::GetPayloadPaddingPacket() {
// Default implementation always just returns a copy of the packet.
return GetPayloadPaddingPacket([](const RtpPacketToSend& packet) {
- return absl::make_unique<RtpPacketToSend>(packet);
+ return std::make_unique<RtpPacketToSend>(packet);
});
}
diff --git a/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc b/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc
index c26c2cc..9e9d621 100644
--- a/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc
@@ -13,7 +13,6 @@
#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
#include "system_wrappers/include/clock.h"
@@ -600,7 +599,7 @@
hist_.GetPacketAndMarkAsPending(
kStartSeqNum, [](const RtpPacketToSend& packet) {
auto encapsulated_packet =
- absl::make_unique<RtpPacketToSend>(packet);
+ std::make_unique<RtpPacketToSend>(packet);
encapsulated_packet->SetSsrc(packet.Ssrc() + 1);
return encapsulated_packet;
});
@@ -728,7 +727,7 @@
// Get copy of packet, but with sequence number modified.
auto padding_packet =
hist_.GetPayloadPaddingPacket([&](const RtpPacketToSend& packet) {
- auto encapsulated_packet = absl::make_unique<RtpPacketToSend>(packet);
+ auto encapsulated_packet = std::make_unique<RtpPacketToSend>(packet);
encapsulated_packet->SetSequenceNumber(kStartSeqNum + 1);
return encapsulated_packet;
});
diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
index eaba788..cb826f6 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
@@ -14,11 +14,11 @@
#include <algorithm>
#include <cstdint>
+#include <memory>
#include <set>
#include <string>
#include <utility>
-#include "absl/memory/memory.h"
#include "api/transport/field_trial_based_config.h"
#include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h"
#include "modules/rtp_rtcp/source/rtp_rtcp_config.h"
@@ -43,7 +43,7 @@
std::unique_ptr<RtpRtcp> RtpRtcp::Create(const Configuration& configuration) {
RTC_DCHECK(configuration.clock);
- return absl::make_unique<ModuleRtpRtcpImpl>(configuration);
+ return std::make_unique<ModuleRtpRtcpImpl>(configuration);
}
ModuleRtpRtcpImpl::ModuleRtpRtcpImpl(const Configuration& configuration)
diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
index 97dbe01..3a9775e 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
@@ -14,7 +14,6 @@
#include <memory>
#include <set>
-#include "absl/memory/memory.h"
#include "api/transport/field_trial_based_config.h"
#include "api/video_codecs/video_codec.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
@@ -179,7 +178,7 @@
sender_.impl_->SetSequenceNumber(kSequenceNumber);
sender_.impl_->SetStorePacketsStatus(true, 100);
- sender_video_ = absl::make_unique<RTPSenderVideo>(
+ sender_video_ = std::make_unique<RTPSenderVideo>(
&clock_, sender_.impl_->RtpSender(), nullptr, &playout_delay_oracle_,
nullptr, false, false, false, FieldTrialBasedConfig());
diff --git a/modules/rtp_rtcp/source/rtp_sender.cc b/modules/rtp_rtcp/source/rtp_sender.cc
index 135564d..b95041a 100644
--- a/modules/rtp_rtcp/source/rtp_sender.cc
+++ b/modules/rtp_rtcp/source/rtp_sender.cc
@@ -12,10 +12,10 @@
#include <algorithm>
#include <limits>
+#include <memory>
#include <string>
#include <utility>
-#include "absl/memory/memory.h"
#include "absl/strings/match.h"
#include "api/array_view.h"
#include "api/rtc_event_log/rtc_event_log.h"
@@ -329,7 +329,7 @@
retransmit_packet = BuildRtxPacket(stored_packet);
} else {
retransmit_packet =
- absl::make_unique<RtpPacketToSend>(stored_packet);
+ std::make_unique<RtpPacketToSend>(stored_packet);
}
if (retransmit_packet) {
retransmit_packet->set_retransmitted_sequence_number(
@@ -367,7 +367,7 @@
? static_cast<int>(packet.size())
: -1;
if (event_log_ && bytes_sent > 0) {
- event_log_->Log(absl::make_unique<RtcEventRtpPacketOutgoing>(
+ event_log_->Log(std::make_unique<RtcEventRtpPacketOutgoing>(
packet, pacing_info.probe_cluster_id));
}
}
@@ -492,7 +492,7 @@
// Put packet in retransmission history or update pending status even if
// actual sending fails.
if (is_media && packet->allow_retransmission()) {
- packet_history_.PutRtpPacket(absl::make_unique<RtpPacketToSend>(*packet),
+ packet_history_.PutRtpPacket(std::make_unique<RtpPacketToSend>(*packet),
now_ms);
} else if (packet->retransmitted_sequence_number()) {
packet_history_.MarkPacketAsSent(*packet->retransmitted_sequence_number());
@@ -599,7 +599,7 @@
while (bytes_left > 0) {
auto padding_packet =
- absl::make_unique<RtpPacketToSend>(&rtp_header_extension_map_);
+ std::make_unique<RtpPacketToSend>(&rtp_header_extension_map_);
padding_packet->set_packet_type(RtpPacketToSend::Type::kPadding);
padding_packet->SetMarker(false);
padding_packet->SetTimestamp(last_rtp_timestamp_);
@@ -825,7 +825,7 @@
// While sending slightly oversized packet increase chance of dropped packet,
// it is better than crash on drop packet without trying to send it.
static constexpr int kExtraCapacity = 16;
- auto packet = absl::make_unique<RtpPacketToSend>(
+ auto packet = std::make_unique<RtpPacketToSend>(
&rtp_header_extension_map_, max_packet_size_ + kExtraCapacity);
RTC_DCHECK(ssrc_);
packet->SetSsrc(*ssrc_);
@@ -1037,8 +1037,8 @@
if (kv == rtx_payload_type_map_.end())
return nullptr;
- rtx_packet = absl::make_unique<RtpPacketToSend>(&rtp_header_extension_map_,
- max_packet_size_);
+ rtx_packet = std::make_unique<RtpPacketToSend>(&rtp_header_extension_map_,
+ max_packet_size_);
rtx_packet->SetPayloadType(kv->second);
diff --git a/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_unittest.cc
index eb594c1..0d5c941 100644
--- a/modules/rtp_rtcp/source/rtp_sender_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_unittest.cc
@@ -13,7 +13,6 @@
#include <memory>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/rtc_event_log/rtc_event.h"
#include "api/transport/field_trial_based_config.h"
#include "api/video/video_codec_constants.h"
@@ -262,8 +261,8 @@
packet->set_allow_retransmission(true);
// Packet should be stored in a send bucket.
- EXPECT_TRUE(rtp_sender_->SendToNetwork(
- absl::make_unique<RtpPacketToSend>(*packet)));
+ EXPECT_TRUE(
+ rtp_sender_->SendToNetwork(std::make_unique<RtpPacketToSend>(*packet)));
return packet;
}
@@ -406,7 +405,7 @@
config.local_media_ssrc = kSsrc;
config.event_log = &mock_rtc_event_log_;
config.retransmission_rate_limiter = &retransmission_rate_limiter_;
- rtp_sender_ = absl::make_unique<RTPSender>(config);
+ rtp_sender_ = std::make_unique<RTPSender>(config);
rtp_sender_->SetTimestampOffset(0);
@@ -456,7 +455,7 @@
config.event_log = &mock_rtc_event_log_;
config.retransmission_rate_limiter = &retransmission_rate_limiter_;
config.overhead_observer = &mock_overhead_observer;
- rtp_sender_ = absl::make_unique<RTPSender>(config);
+ rtp_sender_ = std::make_unique<RTPSender>(config);
EXPECT_EQ(0, rtp_sender_->RegisterRtpHeaderExtension(
kRtpExtensionTransportSequenceNumber,
@@ -492,7 +491,7 @@
config.event_log = &mock_rtc_event_log_;
config.send_packet_observer = &send_packet_observer_;
config.retransmission_rate_limiter = &retransmission_rate_limiter_;
- rtp_sender_ = absl::make_unique<RTPSender>(config);
+ rtp_sender_ = std::make_unique<RTPSender>(config);
EXPECT_EQ(0, rtp_sender_->RegisterRtpHeaderExtension(
kRtpExtensionTransportSequenceNumber,
@@ -531,7 +530,7 @@
config.event_log = &mock_rtc_event_log_;
config.send_packet_observer = &send_packet_observer_;
config.retransmission_rate_limiter = &retransmission_rate_limiter_;
- rtp_sender_ = absl::make_unique<RTPSender>(config);
+ rtp_sender_ = std::make_unique<RTPSender>(config);
SendGenericPacket();
@@ -584,7 +583,7 @@
config.local_media_ssrc = kSsrc;
config.send_side_delay_observer = &send_side_delay_observer_;
config.event_log = &mock_rtc_event_log_;
- rtp_sender_ = absl::make_unique<RTPSender>(config);
+ rtp_sender_ = std::make_unique<RTPSender>(config);
PlayoutDelayOracle playout_delay_oracle;
RTPSenderVideo rtp_sender_video(&fake_clock_, rtp_sender_.get(), nullptr,
@@ -674,7 +673,7 @@
config.event_log = &mock_rtc_event_log_;
config.send_packet_observer = &send_packet_observer_;
config.retransmission_rate_limiter = &retransmission_rate_limiter_;
- rtp_sender_ = absl::make_unique<RTPSender>(config);
+ rtp_sender_ = std::make_unique<RTPSender>(config);
rtp_sender_->SetSequenceNumber(kSeqNum);
rtp_sender_->SetStorePacketsStatus(true, 10);
@@ -735,7 +734,7 @@
EXPECT_CALL(mock_paced_sender_,
EnqueuePacket(Pointee(Property(&RtpPacketToSend::Ssrc, kSsrc))));
EXPECT_TRUE(
- rtp_sender_->SendToNetwork(absl::make_unique<RtpPacketToSend>(*packet)));
+ rtp_sender_->SendToNetwork(std::make_unique<RtpPacketToSend>(*packet)));
fake_clock_.AdvanceTimeMilliseconds(kStoredTimeInMs);
rtp_sender_->TrySendPacket(packet.get(), PacedPacketInfo());
EXPECT_EQ(1, transport_.packets_sent());
@@ -771,8 +770,8 @@
EXPECT_CALL(
mock_paced_sender_,
EnqueuePacket(Pointee(Property(&RtpPacketToSend::Ssrc, kSsrc))));
- EXPECT_TRUE(rtp_sender_->SendToNetwork(
- absl::make_unique<RtpPacketToSend>(*packet)));
+ EXPECT_TRUE(
+ rtp_sender_->SendToNetwork(std::make_unique<RtpPacketToSend>(*packet)));
fake_clock_.AdvanceTimeMilliseconds(kStoredTimeInMs);
rtp_sender_->TrySendPacket(packet.get(), PacedPacketInfo());
@@ -835,8 +834,8 @@
Pointee(Property(&RtpPacketToSend::SequenceNumber, kSeqNum)))));
packet->set_packet_type(RtpPacketToSend::Type::kVideo);
packet->set_allow_retransmission(true);
- EXPECT_TRUE(rtp_sender_->SendToNetwork(
- absl::make_unique<RtpPacketToSend>(*packet)));
+ EXPECT_TRUE(
+ rtp_sender_->SendToNetwork(std::make_unique<RtpPacketToSend>(*packet)));
EXPECT_EQ(0, transport_.packets_sent());
fake_clock_.AdvanceTimeMilliseconds(kStoredTimeInMs);
rtp_sender_->TrySendPacket(packet.get(), PacedPacketInfo());
@@ -879,8 +878,8 @@
Pointee(Property(&RtpPacketToSend::SequenceNumber, kSeqNum)))));
packet->set_packet_type(RtpPacketToSend::Type::kVideo);
packet->set_allow_retransmission(true);
- EXPECT_TRUE(rtp_sender_->SendToNetwork(
- absl::make_unique<RtpPacketToSend>(*packet)));
+ EXPECT_TRUE(
+ rtp_sender_->SendToNetwork(std::make_unique<RtpPacketToSend>(*packet)));
// Immediately process send bucket and send packet.
rtp_sender_->TrySendPacket(packet.get(), PacedPacketInfo());
@@ -958,8 +957,8 @@
Pointee(Property(&RtpPacketToSend::SequenceNumber, kSeqNum)))));
packet->set_packet_type(RtpPacketToSend::Type::kVideo);
packet->set_allow_retransmission(true);
- EXPECT_TRUE(rtp_sender_->SendToNetwork(
- absl::make_unique<RtpPacketToSend>(*packet)));
+ EXPECT_TRUE(
+ rtp_sender_->SendToNetwork(std::make_unique<RtpPacketToSend>(*packet)));
EXPECT_EQ(total_packets_sent, transport_.packets_sent());
fake_clock_.AdvanceTimeMilliseconds(kStoredTimeInMs);
rtp_sender_->TrySendPacket(packet.get(), PacedPacketInfo());
@@ -1012,8 +1011,8 @@
EnqueuePacket(AllOf(
Pointee(Property(&RtpPacketToSend::Ssrc, kSsrc)),
Pointee(Property(&RtpPacketToSend::SequenceNumber, seq_num)))));
- EXPECT_TRUE(rtp_sender_->SendToNetwork(
- absl::make_unique<RtpPacketToSend>(*packet)));
+ EXPECT_TRUE(
+ rtp_sender_->SendToNetwork(std::make_unique<RtpPacketToSend>(*packet)));
rtp_sender_->TrySendPacket(packet.get(), PacedPacketInfo());
// Process send bucket.
@@ -1160,7 +1159,7 @@
config.event_log = &mock_rtc_event_log_;
config.send_packet_observer = &send_packet_observer_;
config.retransmission_rate_limiter = &retransmission_rate_limiter_;
- rtp_sender_ = absl::make_unique<RTPSender>(config);
+ rtp_sender_ = std::make_unique<RTPSender>(config);
rtp_sender_->SetSequenceNumber(kSeqNum);
rtp_sender_->SetStorePacketsStatus(true, 10);
@@ -1246,7 +1245,7 @@
config.send_packet_observer = &send_packet_observer_;
config.retransmission_rate_limiter = &retransmission_rate_limiter_;
config.local_media_ssrc = kSsrc;
- rtp_sender_ = absl::make_unique<RTPSender>(config);
+ rtp_sender_ = std::make_unique<RTPSender>(config);
rtp_sender_->SetSequenceNumber(kSeqNum);
rtp_sender_->SetStorePacketsStatus(true, 10);
@@ -1370,7 +1369,7 @@
config.event_log = &mock_rtc_event_log_;
config.send_packet_observer = &send_packet_observer_;
config.retransmission_rate_limiter = &retransmission_rate_limiter_;
- rtp_sender_ = absl::make_unique<RTPSender>(config);
+ rtp_sender_ = std::make_unique<RTPSender>(config);
rtp_sender_->SetSequenceNumber(kSeqNum);
@@ -1638,7 +1637,7 @@
config.event_log = &mock_rtc_event_log_;
config.send_packet_observer = &send_packet_observer_;
config.retransmission_rate_limiter = &retransmission_rate_limiter_;
- rtp_sender_ = absl::make_unique<RTPSender>(config);
+ rtp_sender_ = std::make_unique<RTPSender>(config);
rtp_sender_->SetSequenceNumber(kSeqNum);
@@ -1713,7 +1712,7 @@
config.local_media_ssrc = kSsrc;
config.send_bitrate_observer = &callback;
config.retransmission_rate_limiter = &retransmission_rate_limiter_;
- rtp_sender_ = absl::make_unique<RTPSender>(config);
+ rtp_sender_ = std::make_unique<RTPSender>(config);
PlayoutDelayOracle playout_delay_oracle;
RTPSenderVideo rtp_sender_video(&fake_clock_, rtp_sender_.get(), nullptr,
@@ -1952,7 +1951,7 @@
config.local_media_ssrc = kSsrc;
config.retransmission_rate_limiter = &retransmission_rate_limiter_;
config.overhead_observer = &mock_overhead_observer;
- rtp_sender_ = absl::make_unique<RTPSender>(config);
+ rtp_sender_ = std::make_unique<RTPSender>(config);
// RTP overhead is 12B.
EXPECT_CALL(mock_overhead_observer, OnOverheadChanged(12)).Times(1);
@@ -1975,7 +1974,7 @@
config.local_media_ssrc = kSsrc;
config.retransmission_rate_limiter = &retransmission_rate_limiter_;
config.overhead_observer = &mock_overhead_observer;
- rtp_sender_ = absl::make_unique<RTPSender>(config);
+ rtp_sender_ = std::make_unique<RTPSender>(config);
EXPECT_CALL(mock_overhead_observer, OnOverheadChanged(_)).Times(1);
SendGenericPacket();
@@ -2201,7 +2200,7 @@
config.send_side_delay_observer = &send_side_delay_observer;
config.event_log = &mock_rtc_event_log_;
config.send_packet_observer = &send_packet_observer_;
- rtp_sender_ = absl::make_unique<RTPSender>(config);
+ rtp_sender_ = std::make_unique<RTPSender>(config);
ASSERT_EQ(0, rtp_sender_->RegisterRtpHeaderExtension(
kRtpExtensionTransportSequenceNumber,
kTransportSequenceNumberExtensionId));
diff --git a/modules/rtp_rtcp/source/rtp_sender_video.cc b/modules/rtp_rtcp/source/rtp_sender_video.cc
index cd475cd..a0fd668 100644
--- a/modules/rtp_rtcp/source/rtp_sender_video.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_video.cc
@@ -18,7 +18,6 @@
#include <string>
#include <utility>
-#include "absl/memory/memory.h"
#include "absl/strings/match.h"
#include "api/crypto/frame_encryptor_interface.h"
#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h"
@@ -216,7 +215,7 @@
transmit_color_space_next_frame_(false),
playout_delay_oracle_(playout_delay_oracle),
rtp_sequence_number_map_(need_rtp_packet_infos
- ? absl::make_unique<RtpSequenceNumberMap>(
+ ? std::make_unique<RtpSequenceNumberMap>(
kRtpSequenceNumberMapMaxEntries)
: nullptr),
red_payload_type_(-1),
@@ -552,9 +551,9 @@
single_packet->SetTimestamp(rtp_timestamp);
single_packet->set_capture_time_ms(capture_time_ms);
- auto first_packet = absl::make_unique<RtpPacketToSend>(*single_packet);
- auto middle_packet = absl::make_unique<RtpPacketToSend>(*single_packet);
- auto last_packet = absl::make_unique<RtpPacketToSend>(*single_packet);
+ auto first_packet = std::make_unique<RtpPacketToSend>(*single_packet);
+ auto middle_packet = std::make_unique<RtpPacketToSend>(*single_packet);
+ auto last_packet = std::make_unique<RtpPacketToSend>(*single_packet);
// Simplest way to estimate how much extensions would occupy is to set them.
AddRtpHeaderExtensions(*video_header, playout_delay, frame_type,
set_video_rotation, set_color_space, set_frame_marking,
@@ -706,7 +705,7 @@
expected_payload_capacity =
limits.max_payload_len - limits.last_packet_reduction_len;
} else {
- packet = absl::make_unique<RtpPacketToSend>(*middle_packet);
+ packet = std::make_unique<RtpPacketToSend>(*middle_packet);
expected_payload_capacity = limits.max_payload_len;
}
diff --git a/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc b/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc
index 1974923..80e0302 100644
--- a/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc
+++ b/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc
@@ -15,7 +15,6 @@
#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "api/scoped_refptr.h"
#include "modules/rtp_rtcp/source/byte_io.h"
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
@@ -28,7 +27,7 @@
uint32_t ssrc,
RecoveredPacketReceiver* callback,
rtc::ArrayView<const RtpExtension> extensions) {
- return absl::make_unique<UlpfecReceiverImpl>(ssrc, callback, extensions);
+ return std::make_unique<UlpfecReceiverImpl>(ssrc, callback, extensions);
}
UlpfecReceiverImpl::UlpfecReceiverImpl(
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index a385695..ae7e32a 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -337,7 +337,6 @@
"../../rtc_base/system:rtc_export",
"../../system_wrappers:field_trial",
"../../system_wrappers:metrics",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
"//third_party/libyuv",
@@ -423,7 +422,6 @@
"../../rtc_base/experiments:rate_control_settings",
"../../system_wrappers:field_trial",
"../../system_wrappers:metrics",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
"//third_party/libyuv",
]
@@ -457,7 +455,6 @@
"../../rtc_base:rtc_numerics",
"../../system_wrappers:field_trial",
"../../system_wrappers:metrics",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -593,7 +590,6 @@
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../test:test_support",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -636,7 +632,6 @@
"../../test:video_test_common",
"../../test:video_test_support",
"../rtp_rtcp:rtp_rtcp_format",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
"//third_party/libyuv",
]
@@ -712,7 +707,6 @@
"../../test:test_support",
"../../test:video_test_common",
"../../test:video_test_support",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -787,7 +781,6 @@
"../../test:test_support",
"../../test:video_test_common",
"../rtp_rtcp:rtp_rtcp_format",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
"//third_party/libyuv",
]
diff --git a/modules/video_coding/codecs/h264/h264.cc b/modules/video_coding/codecs/h264/h264.cc
index 3c46b43..147e964 100644
--- a/modules/video_coding/codecs/h264/h264.cc
+++ b/modules/video_coding/codecs/h264/h264.cc
@@ -11,9 +11,9 @@
#include "modules/video_coding/codecs/h264/include/h264.h"
+#include <memory>
#include <string>
-#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "api/video_codecs/sdp_video_format.h"
#include "media/base/h264_profile_level_id.h"
@@ -91,7 +91,7 @@
#if defined(WEBRTC_USE_H264)
RTC_CHECK(g_rtc_use_h264);
RTC_LOG(LS_INFO) << "Creating H264EncoderImpl.";
- return absl::make_unique<H264EncoderImpl>(codec);
+ return std::make_unique<H264EncoderImpl>(codec);
#else
RTC_NOTREACHED();
return nullptr;
@@ -107,7 +107,7 @@
#if defined(WEBRTC_USE_H264)
RTC_CHECK(g_rtc_use_h264);
RTC_LOG(LS_INFO) << "Creating H264DecoderImpl.";
- return absl::make_unique<H264DecoderImpl>();
+ return std::make_unique<H264DecoderImpl>();
#else
RTC_NOTREACHED();
return nullptr;
diff --git a/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/modules/video_coding/codecs/h264/h264_decoder_impl.cc
index 6205429..bfbdf75 100644
--- a/modules/video_coding/codecs/h264/h264_decoder_impl.cc
+++ b/modules/video_coding/codecs/h264/h264_decoder_impl.cc
@@ -18,6 +18,7 @@
#include <algorithm>
#include <limits>
+#include <memory>
extern "C" {
#include "third_party/ffmpeg/libavcodec/avcodec.h"
@@ -25,7 +26,6 @@
#include "third_party/ffmpeg/libavutil/imgutils.h"
} // extern "C"
-#include "absl/memory/memory.h"
#include "api/video/color_space.h"
#include "api/video/i010_buffer.h"
#include "api/video/i420_buffer.h"
@@ -130,13 +130,13 @@
// Refactor to do not use a VideoFrame object at all.
av_frame->buf[0] = av_buffer_create(
av_frame->data[kYPlaneIndex], total_size, AVFreeBuffer2,
- static_cast<void*>(absl::make_unique<VideoFrame>(
- VideoFrame::Builder()
- .set_video_frame_buffer(frame_buffer)
- .set_rotation(kVideoRotation_0)
- .set_timestamp_us(0)
- .build())
- .release()),
+ static_cast<void*>(
+ std::make_unique<VideoFrame>(VideoFrame::Builder()
+ .set_video_frame_buffer(frame_buffer)
+ .set_rotation(kVideoRotation_0)
+ .set_timestamp_us(0)
+ .build())
+ .release()),
0);
RTC_CHECK(av_frame->buf[0]);
return 0;
diff --git a/modules/video_coding/codecs/h264/h264_simulcast_unittest.cc b/modules/video_coding/codecs/h264/h264_simulcast_unittest.cc
index c7f3661..12b5da1 100644
--- a/modules/video_coding/codecs/h264/h264_simulcast_unittest.cc
+++ b/modules/video_coding/codecs/h264/h264_simulcast_unittest.cc
@@ -10,7 +10,6 @@
#include <memory>
-#include "absl/memory/memory.h"
#include "api/test/create_simulcast_test_fixture.h"
#include "api/test/simulcast_test_fixture.h"
#include "api/test/video/function_video_decoder_factory.h"
@@ -24,10 +23,10 @@
namespace {
std::unique_ptr<SimulcastTestFixture> CreateSpecificSimulcastTestFixture() {
std::unique_ptr<VideoEncoderFactory> encoder_factory =
- absl::make_unique<FunctionVideoEncoderFactory>(
+ std::make_unique<FunctionVideoEncoderFactory>(
[]() { return H264Encoder::Create(cricket::VideoCodec("H264")); });
std::unique_ptr<VideoDecoderFactory> decoder_factory =
- absl::make_unique<FunctionVideoDecoderFactory>(
+ std::make_unique<FunctionVideoDecoderFactory>(
[]() { return H264Decoder::Create(); });
return CreateSimulcastTestFixture(std::move(encoder_factory),
std::move(decoder_factory),
diff --git a/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc b/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc
index 554da92..53ae285 100644
--- a/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc
+++ b/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc
@@ -15,7 +15,6 @@
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "api/scoped_refptr.h"
#include "api/test/mock_video_decoder_factory.h"
@@ -65,13 +64,13 @@
protected:
std::unique_ptr<VideoDecoder> CreateDecoder() override {
- return absl::make_unique<MultiplexDecoderAdapter>(
+ return std::make_unique<MultiplexDecoderAdapter>(
decoder_factory_.get(), SdpVideoFormat(kMultiplexAssociatedCodecName),
supports_augmenting_data_);
}
std::unique_ptr<VideoEncoder> CreateEncoder() override {
- return absl::make_unique<MultiplexEncoderAdapter>(
+ return std::make_unique<MultiplexEncoderAdapter>(
encoder_factory_.get(), SdpVideoFormat(kMultiplexAssociatedCodecName),
supports_augmenting_data_);
}
@@ -95,7 +94,7 @@
rtc::scoped_refptr<AugmentedVideoFrameBuffer> augmented_video_frame_buffer =
new rtc::RefCountedObject<AugmentedVideoFrameBuffer>(
video_buffer, std::move(data), 16);
- return absl::make_unique<VideoFrame>(
+ return std::make_unique<VideoFrame>(
VideoFrame::Builder()
.set_video_frame_buffer(augmented_video_frame_buffer)
.set_timestamp_rtp(video_frame->timestamp())
@@ -114,13 +113,12 @@
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 absl::make_unique<VideoFrame>(
- VideoFrame::Builder()
- .set_video_frame_buffer(yuva_buffer)
- .set_timestamp_rtp(123)
- .set_timestamp_ms(345)
- .set_rotation(kVideoRotation_0)
- .build());
+ return std::make_unique<VideoFrame>(VideoFrame::Builder()
+ .set_video_frame_buffer(yuva_buffer)
+ .set_timestamp_rtp(123)
+ .set_timestamp_ms(345)
+ .set_rotation(kVideoRotation_0)
+ .build());
}
std::unique_ptr<VideoFrame> CreateInputFrame(bool contains_alpha) {
@@ -129,7 +127,7 @@
video_frame = CreateI420AInputFrame();
} else {
VideoFrame* next_frame = NextInputFrame();
- video_frame = absl::make_unique<VideoFrame>(
+ video_frame = std::make_unique<VideoFrame>(
VideoFrame::Builder()
.set_video_frame_buffer(next_frame->video_frame_buffer())
.set_timestamp_rtp(next_frame->timestamp())
@@ -172,12 +170,12 @@
yuva_buffer->StrideA(), yuva_buffer->DataU(), yuva_buffer->StrideU(),
yuva_buffer->DataV(), yuva_buffer->StrideV(),
rtc::KeepRefUntilDone(video_frame_buffer));
- return absl::make_unique<VideoFrame>(VideoFrame::Builder()
- .set_video_frame_buffer(axx_buffer)
- .set_timestamp_rtp(123)
- .set_timestamp_ms(345)
- .set_rotation(kVideoRotation_0)
- .build());
+ return std::make_unique<VideoFrame>(VideoFrame::Builder()
+ .set_video_frame_buffer(axx_buffer)
+ .set_timestamp_rtp(123)
+ .set_timestamp_ms(345)
+ .set_rotation(kVideoRotation_0)
+ .build());
}
private:
diff --git a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
index 071075d..63a6b6d 100644
--- a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
+++ b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
@@ -20,7 +20,6 @@
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "api/array_view.h"
#include "api/video/video_bitrate_allocation.h"
@@ -379,8 +378,8 @@
};
VideoCodecTestFixtureImpl::VideoCodecTestFixtureImpl(Config config)
- : encoder_factory_(absl::make_unique<InternalEncoderFactory>()),
- decoder_factory_(absl::make_unique<InternalDecoderFactory>()),
+ : encoder_factory_(std::make_unique<InternalEncoderFactory>()),
+ decoder_factory_(std::make_unique<InternalDecoderFactory>()),
config_(config) {}
VideoCodecTestFixtureImpl::VideoCodecTestFixtureImpl(
@@ -689,7 +688,7 @@
task_queue->SendTask([this]() {
CreateEncoderAndDecoder();
- processor_ = absl::make_unique<VideoProcessor>(
+ processor_ = std::make_unique<VideoProcessor>(
encoder_.get(), &decoders_, source_frame_reader_.get(), config_,
&stats_, &encoded_frame_writers_,
decoded_frame_writers_.empty() ? nullptr : &decoded_frame_writers_);
diff --git a/modules/video_coding/codecs/test/videocodec_test_libvpx.cc b/modules/video_coding/codecs/test/videocodec_test_libvpx.cc
index cb78f21..244dbc4 100644
--- a/modules/video_coding/codecs/test/videocodec_test_libvpx.cc
+++ b/modules/video_coding/codecs/test/videocodec_test_libvpx.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <memory>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/test/create_videocodec_test_fixture.h"
#include "api/test/video/function_video_encoder_factory.h"
#include "api/video_codecs/sdp_video_format.h"
@@ -94,7 +94,7 @@
config.SetCodecSettings(cricket::kVp9CodecName, 1, 1, 1, false, true, false,
kCifWidth, kCifHeight);
config.num_frames = kNumFramesShort;
- const auto frame_checker = absl::make_unique<QpFrameChecker>();
+ const auto frame_checker = std::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@@ -112,7 +112,7 @@
auto config = CreateConfig();
config.SetCodecSettings(cricket::kVp9CodecName, 1, 1, 1, false, true, false,
kCifWidth, kCifHeight);
- const auto frame_checker = absl::make_unique<QpFrameChecker>();
+ const auto frame_checker = std::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@@ -136,7 +136,7 @@
auto config = CreateConfig();
config.SetCodecSettings(cricket::kVp9CodecName, 1, 1, 1, false, true, false,
kCifWidth, kCifHeight);
- const auto frame_checker = absl::make_unique<QpFrameChecker>();
+ const auto frame_checker = std::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@@ -163,7 +163,7 @@
config.SetCodecSettings(cricket::kVp9CodecName, 1, 1, 1, true, true, false,
kCifWidth, kCifHeight);
config.num_frames = kNumFramesShort;
- const auto frame_checker = absl::make_unique<QpFrameChecker>();
+ const auto frame_checker = std::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@@ -181,7 +181,7 @@
auto config = CreateConfig();
config.SetCodecSettings(cricket::kVp9CodecName, 1, 1, 1, false, true, true,
kCifWidth, kCifHeight);
- const auto frame_checker = absl::make_unique<QpFrameChecker>();
+ const auto frame_checker = std::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@@ -205,7 +205,7 @@
config.SetCodecSettings(cricket::kVp8CodecName, 1, 1, 1, true, true, false,
kCifWidth, kCifHeight);
config.num_frames = kNumFramesShort;
- const auto frame_checker = absl::make_unique<QpFrameChecker>();
+ const auto frame_checker = std::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@@ -241,7 +241,7 @@
auto config = CreateConfig();
config.SetCodecSettings(cricket::kVp8CodecName, 1, 1, 1, true, true, false,
kCifWidth, kCifHeight);
- const auto frame_checker = absl::make_unique<QpFrameChecker>();
+ const auto frame_checker = std::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@@ -275,7 +275,7 @@
auto config = CreateConfig();
config.SetCodecSettings(cricket::kVp8CodecName, 1, 1, 1, true, true, false,
kCifWidth, kCifHeight);
- const auto frame_checker = absl::make_unique<QpFrameChecker>();
+ const auto frame_checker = std::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@@ -315,7 +315,7 @@
auto config = CreateConfig();
config.SetCodecSettings(cricket::kVp8CodecName, 1, 1, 3, true, true, false,
kCifWidth, kCifHeight);
- const auto frame_checker = absl::make_unique<QpFrameChecker>();
+ const auto frame_checker = std::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@@ -351,7 +351,7 @@
config.num_frames = 100;
config.SetCodecSettings(cricket::kVp8CodecName, 3, 1, 3, true, true, false,
1280, 720);
- const auto frame_checker = absl::make_unique<QpFrameChecker>();
+ const auto frame_checker = std::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@@ -380,13 +380,13 @@
config.num_frames = 100;
config.SetCodecSettings(cricket::kVp8CodecName, 3, 1, 3, true, true, false,
1280, 720);
- const auto frame_checker = absl::make_unique<QpFrameChecker>();
+ const auto frame_checker = std::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
InternalEncoderFactory internal_encoder_factory;
std::unique_ptr<VideoEncoderFactory> adapted_encoder_factory =
- absl::make_unique<FunctionVideoEncoderFactory>([&]() {
- return absl::make_unique<SimulcastEncoderAdapter>(
+ std::make_unique<FunctionVideoEncoderFactory>([&]() {
+ return std::make_unique<SimulcastEncoderAdapter>(
&internal_encoder_factory, SdpVideoFormat(cricket::kVp8CodecName));
});
std::unique_ptr<InternalDecoderFactory> internal_decoder_factory(
@@ -417,7 +417,7 @@
config.num_frames = 100;
config.SetCodecSettings(cricket::kVp9CodecName, 1, 3, 3, true, true, false,
1280, 720);
- const auto frame_checker = absl::make_unique<QpFrameChecker>();
+ const auto frame_checker = std::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@@ -438,7 +438,7 @@
config.print_frame_level_stats = true;
config.SetCodecSettings(cricket::kVp8CodecName, 3, 1, 3, true, true, false,
1280, 720);
- const auto frame_checker = absl::make_unique<QpFrameChecker>();
+ const auto frame_checker = std::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
@@ -464,7 +464,7 @@
config.print_frame_level_stats = true;
config.SetCodecSettings(cricket::kVp9CodecName, 1, 3, 3, true, true, false,
1280, 720);
- const auto frame_checker = absl::make_unique<QpFrameChecker>();
+ const auto frame_checker = std::make_unique<QpFrameChecker>();
config.encoded_frame_checker = frame_checker.get();
auto fixture = CreateVideoCodecTestFixture(config);
diff --git a/modules/video_coding/codecs/test/videocodec_test_mediacodec.cc b/modules/video_coding/codecs/test/videocodec_test_mediacodec.cc
index df6afa0..9f88716 100644
--- a/modules/video_coding/codecs/test/videocodec_test_mediacodec.cc
+++ b/modules/video_coding/codecs/test/videocodec_test_mediacodec.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <memory>
#include <string>
#include <tuple>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/test/create_videocodec_test_fixture.h"
#include "media/base/media_constants.h"
#include "modules/video_coding/codecs/test/android_codec_factory_helper.h"
@@ -69,7 +69,7 @@
TEST(VideoCodecTestMediaCodec, ForemanCif500kbpsH264CBP) {
auto config = CreateConfig();
const auto frame_checker =
- absl::make_unique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
+ std::make_unique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
config.encoded_frame_checker = frame_checker.get();
config.SetCodecSettings(cricket::kH264CodecName, 1, 1, 1, false, false, false,
352, 288);
@@ -93,7 +93,7 @@
TEST(VideoCodecTestMediaCodec, DISABLED_ForemanCif500kbpsH264CHP) {
auto config = CreateConfig();
const auto frame_checker =
- absl::make_unique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
+ std::make_unique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
config.h264_codec_settings.profile = H264::kProfileConstrainedHigh;
config.encoded_frame_checker = frame_checker.get();
diff --git a/modules/video_coding/codecs/test/videocodec_test_openh264.cc b/modules/video_coding/codecs/test/videocodec_test_openh264.cc
index 59d214c..6513074 100644
--- a/modules/video_coding/codecs/test/videocodec_test_openh264.cc
+++ b/modules/video_coding/codecs/test/videocodec_test_openh264.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <memory>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/test/create_videocodec_test_fixture.h"
#include "media/base/media_constants.h"
#include "modules/video_coding/codecs/test/videocodec_test_fixture_impl.h"
@@ -39,7 +39,7 @@
TEST(VideoCodecTestOpenH264, ConstantHighBitrate) {
auto frame_checker =
- absl::make_unique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
+ std::make_unique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
auto config = CreateConfig();
config.SetCodecSettings(cricket::kH264CodecName, 1, 1, 1, false, true, false,
kCifWidth, kCifHeight);
@@ -60,7 +60,7 @@
// large frames into multiple slices and limit length of NAL units.
TEST(VideoCodecTestOpenH264, SingleNalUnit) {
auto frame_checker =
- absl::make_unique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
+ std::make_unique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
auto config = CreateConfig();
config.h264_codec_settings.packetization_mode =
H264PacketizationMode::SingleNalUnit;
diff --git a/modules/video_coding/codecs/test/videocodec_test_videotoolbox.cc b/modules/video_coding/codecs/test/videocodec_test_videotoolbox.cc
index 10bcf65..0f02080 100644
--- a/modules/video_coding/codecs/test/videocodec_test_videotoolbox.cc
+++ b/modules/video_coding/codecs/test/videocodec_test_videotoolbox.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <memory>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/test/create_videocodec_test_fixture.h"
#include "media/base/media_constants.h"
#include "modules/video_coding/codecs/test/objc_codec_factory_helper.h"
@@ -53,7 +53,7 @@
// longer in use.
MAYBE_TEST(VideoCodecTestVideoToolbox, ForemanCif500kbpsH264CBP) {
const auto frame_checker =
- absl::make_unique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
+ std::make_unique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
auto config = CreateConfig();
config.SetCodecSettings(cricket::kH264CodecName, 1, 1, 1, false, false, false,
352, 288);
@@ -69,7 +69,7 @@
MAYBE_TEST(VideoCodecTestVideoToolbox, ForemanCif500kbpsH264CHP) {
const auto frame_checker =
- absl::make_unique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
+ std::make_unique<VideoCodecTestFixtureImpl::H264KeyframeChecker>();
auto config = CreateConfig();
config.h264_codec_settings.profile = H264::kProfileConstrainedHigh;
config.SetCodecSettings(cricket::kH264CodecName, 1, 1, 1, false, false, false,
diff --git a/modules/video_coding/codecs/test/videoprocessor.cc b/modules/video_coding/codecs/test/videoprocessor.cc
index 7952510..8fbbe4a 100644
--- a/modules/video_coding/codecs/test/videoprocessor.cc
+++ b/modules/video_coding/codecs/test/videoprocessor.cc
@@ -15,9 +15,9 @@
#include <algorithm>
#include <cstddef>
#include <limits>
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "api/scoped_refptr.h"
#include "api/video/builtin_video_bitrate_allocator_factory.h"
#include "api/video/i420_buffer.h"
@@ -220,7 +220,7 @@
for (size_t i = 0; i < num_simulcast_or_spatial_layers_; ++i) {
decode_callback_.push_back(
- absl::make_unique<VideoProcessorDecodeCompleteCallback>(this, i));
+ std::make_unique<VideoProcessorDecodeCompleteCallback>(this, i));
RTC_CHECK_EQ(
decoders_->at(i)->InitDecode(&config_.codec_settings,
static_cast<int>(config_.NumberOfCores())),
diff --git a/modules/video_coding/codecs/test/videoprocessor.h b/modules/video_coding/codecs/test/videoprocessor.h
index fe0211d..bed65bd 100644
--- a/modules/video_coding/codecs/test/videoprocessor.h
+++ b/modules/video_coding/codecs/test/videoprocessor.h
@@ -19,7 +19,6 @@
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "api/task_queue/queued_task.h"
#include "api/task_queue/task_queue_base.h"
@@ -98,7 +97,7 @@
// Post the callback to the right task queue, if needed.
if (!task_queue_->IsCurrent()) {
- task_queue_->PostTask(absl::make_unique<EncodeCallbackTask>(
+ task_queue_->PostTask(std::make_unique<EncodeCallbackTask>(
video_processor_, encoded_image, codec_specific_info));
return Result(Result::OK, 0);
}
diff --git a/modules/video_coding/codecs/test/videoprocessor_unittest.cc b/modules/video_coding/codecs/test/videoprocessor_unittest.cc
index 59a64a7..49f68f2 100644
--- a/modules/video_coding/codecs/test/videoprocessor_unittest.cc
+++ b/modules/video_coding/codecs/test/videoprocessor_unittest.cc
@@ -12,7 +12,6 @@
#include <memory>
-#include "absl/memory/memory.h"
#include "api/scoped_refptr.h"
#include "api/test/mock_video_decoder.h"
#include "api/test/mock_video_encoder.h"
@@ -56,7 +55,7 @@
EXPECT_CALL(frame_reader_mock_, FrameLength())
.WillRepeatedly(Return(kFrameSize));
q_.SendTask([this] {
- video_processor_ = absl::make_unique<VideoProcessor>(
+ video_processor_ = std::make_unique<VideoProcessor>(
&encoder_mock_, &decoders_, &frame_reader_mock_, config_, &stats_,
&encoded_frame_writers_, /*decoded_frame_writers=*/nullptr);
});
diff --git a/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc b/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc
index 9085afd..54f091d 100644
--- a/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc
+++ b/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc
@@ -11,8 +11,8 @@
#include "modules/video_coding/codecs/vp8/default_temporal_layers.h"
#include <cstdint>
+#include <memory>
-#include "absl/memory/memory.h"
#include "api/video/video_bitrate_allocation.h"
#include "api/video_codecs/video_codec.h"
#include "api/video_codecs/vp8_frame_config.h"
@@ -114,7 +114,7 @@
~TemporalLayersTest() override = default;
CodecSpecificInfo* IgnoredCodecSpecificInfo() {
- codec_specific_info_ = absl::make_unique<CodecSpecificInfo>();
+ codec_specific_info_ = std::make_unique<CodecSpecificInfo>();
return codec_specific_info_.get();
}
diff --git a/modules/video_coding/codecs/vp8/libvpx_interface.cc b/modules/video_coding/codecs/vp8/libvpx_interface.cc
index fd2e80a..1a3df40 100644
--- a/modules/video_coding/codecs/vp8/libvpx_interface.cc
+++ b/modules/video_coding/codecs/vp8/libvpx_interface.cc
@@ -10,7 +10,8 @@
#include "modules/video_coding/codecs/vp8/libvpx_interface.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "rtc_base/checks.h"
namespace webrtc {
@@ -199,7 +200,7 @@
} // namespace
std::unique_ptr<LibvpxInterface> LibvpxInterface::CreateEncoder() {
- return absl::make_unique<LibvpxVp8Facade>();
+ return std::make_unique<LibvpxVp8Facade>();
}
} // namespace webrtc
diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc b/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
index 6983c55..bc4ddf6 100644
--- a/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
+++ b/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
@@ -14,9 +14,9 @@
#include <string.h>
#include <algorithm>
+#include <memory>
#include <string>
-#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "api/scoped_refptr.h"
#include "api/video/i420_buffer.h"
@@ -69,7 +69,7 @@
} // namespace
std::unique_ptr<VideoDecoder> VP8Decoder::Create() {
- return absl::make_unique<LibvpxVp8Decoder>();
+ return std::make_unique<LibvpxVp8Decoder>();
}
class LibvpxVp8Decoder::QpSmoother {
diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
index dcda30d..c8e47d4 100644
--- a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
+++ b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
@@ -21,7 +21,6 @@
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/scoped_refptr.h"
#include "api/video/video_content_type.h"
#include "api/video/video_frame_buffer.h"
@@ -229,7 +228,7 @@
std::unique_ptr<VideoEncoder> VP8Encoder::Create(
std::unique_ptr<Vp8FrameBufferControllerFactory>
frame_buffer_controller_factory) {
- return absl::make_unique<LibvpxVp8Encoder>(
+ return std::make_unique<LibvpxVp8Encoder>(
std::move(frame_buffer_controller_factory));
}
diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_simulcast_test.cc b/modules/video_coding/codecs/vp8/libvpx_vp8_simulcast_test.cc
index d493e2a..67c9110 100644
--- a/modules/video_coding/codecs/vp8/libvpx_vp8_simulcast_test.cc
+++ b/modules/video_coding/codecs/vp8/libvpx_vp8_simulcast_test.cc
@@ -10,7 +10,6 @@
#include <memory>
-#include "absl/memory/memory.h"
#include "api/test/create_simulcast_test_fixture.h"
#include "api/test/simulcast_test_fixture.h"
#include "api/test/video/function_video_decoder_factory.h"
@@ -24,10 +23,10 @@
namespace {
std::unique_ptr<SimulcastTestFixture> CreateSpecificSimulcastTestFixture() {
std::unique_ptr<VideoEncoderFactory> encoder_factory =
- absl::make_unique<FunctionVideoEncoderFactory>(
+ std::make_unique<FunctionVideoEncoderFactory>(
[]() { return VP8Encoder::Create(); });
std::unique_ptr<VideoDecoderFactory> decoder_factory =
- absl::make_unique<FunctionVideoDecoderFactory>(
+ std::make_unique<FunctionVideoDecoderFactory>(
[]() { return VP8Decoder::Create(); });
return CreateSimulcastTestFixture(std::move(encoder_factory),
std::move(decoder_factory),
diff --git a/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc b/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
index a2384b5..edbe4ad 100644
--- a/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
+++ b/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
@@ -17,7 +17,6 @@
#include <memory>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/video_codecs/vp8_frame_config.h"
#include "modules/video_coding/codecs/interface/common_constants.h"
#include "modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h"
@@ -204,7 +203,7 @@
bool config_updated_;
CodecSpecificInfo* IgnoredCodecSpecificInfo() {
- ignored_codec_specific_info_ = absl::make_unique<CodecSpecificInfo>();
+ ignored_codec_specific_info_ = std::make_unique<CodecSpecificInfo>();
return ignored_codec_specific_info_.get();
}
@@ -218,14 +217,14 @@
// One layer screenshare should not use the frame dropper as all frames will
// belong to the base layer.
const int kSingleLayerFlags = 0;
- auto info = absl::make_unique<CodecSpecificInfo>();
+ auto info = std::make_unique<CodecSpecificInfo>();
int flags = EncodeFrame(false, info.get());
timestamp_ += kTimestampDelta5Fps;
EXPECT_EQ(static_cast<uint8_t>(kNoTemporalIdx),
info->codecSpecific.VP8.temporalIdx);
EXPECT_FALSE(info->codecSpecific.VP8.layerSync);
- info = absl::make_unique<CodecSpecificInfo>();
+ info = std::make_unique<CodecSpecificInfo>();
flags = EncodeFrame(false, info.get());
EXPECT_EQ(kSingleLayerFlags, flags);
EXPECT_EQ(static_cast<uint8_t>(kNoTemporalIdx),
diff --git a/modules/video_coding/codecs/vp8/temporal_layers_checker.cc b/modules/video_coding/codecs/vp8/temporal_layers_checker.cc
index f798c5b..53a68bd 100644
--- a/modules/video_coding/codecs/vp8/temporal_layers_checker.cc
+++ b/modules/video_coding/codecs/vp8/temporal_layers_checker.cc
@@ -10,7 +10,8 @@
#include "modules/video_coding/codecs/vp8/include/temporal_layers_checker.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "modules/video_coding/codecs/interface/common_constants.h"
#include "modules/video_coding/codecs/vp8/default_temporal_layers.h"
#include "rtc_base/logging.h"
@@ -22,11 +23,11 @@
int num_temporal_layers) {
switch (type) {
case Vp8TemporalLayersType::kFixedPattern:
- return absl::make_unique<DefaultTemporalLayersChecker>(
+ return std::make_unique<DefaultTemporalLayersChecker>(
num_temporal_layers);
case Vp8TemporalLayersType::kBitrateDynamic:
// Conference mode temporal layering for screen content in base stream.
- return absl::make_unique<TemporalLayersChecker>(num_temporal_layers);
+ return std::make_unique<TemporalLayersChecker>(num_temporal_layers);
}
}
diff --git a/modules/video_coding/codecs/vp9/vp9.cc b/modules/video_coding/codecs/vp9/vp9.cc
index 22a0888..527bce7 100644
--- a/modules/video_coding/codecs/vp9/vp9.cc
+++ b/modules/video_coding/codecs/vp9/vp9.cc
@@ -10,7 +10,8 @@
#include "modules/video_coding/codecs/vp9/include/vp9.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "api/video_codecs/sdp_video_format.h"
#include "modules/video_coding/codecs/vp9/vp9_impl.h"
#include "rtc_base/checks.h"
@@ -46,7 +47,7 @@
std::unique_ptr<VP9Encoder> VP9Encoder::Create() {
#ifdef RTC_ENABLE_VP9
- return absl::make_unique<VP9EncoderImpl>(cricket::VideoCodec());
+ return std::make_unique<VP9EncoderImpl>(cricket::VideoCodec());
#else
RTC_NOTREACHED();
return nullptr;
@@ -56,7 +57,7 @@
std::unique_ptr<VP9Encoder> VP9Encoder::Create(
const cricket::VideoCodec& codec) {
#ifdef RTC_ENABLE_VP9
- return absl::make_unique<VP9EncoderImpl>(codec);
+ return std::make_unique<VP9EncoderImpl>(codec);
#else
RTC_NOTREACHED();
return nullptr;
@@ -65,7 +66,7 @@
std::unique_ptr<VP9Decoder> VP9Decoder::Create() {
#ifdef RTC_ENABLE_VP9
- return absl::make_unique<VP9DecoderImpl>();
+ return std::make_unique<VP9DecoderImpl>();
#else
RTC_NOTREACHED();
return nullptr;
diff --git a/modules/video_coding/frame_buffer2_unittest.cc b/modules/video_coding/frame_buffer2_unittest.cc
index bc2fd8b..d96960e 100644
--- a/modules/video_coding/frame_buffer2_unittest.cc
+++ b/modules/video_coding/frame_buffer2_unittest.cc
@@ -13,9 +13,9 @@
#include <algorithm>
#include <cstring>
#include <limits>
+#include <memory>
#include <vector>
-#include "absl/memory/memory.h"
#include "modules/video_coding/frame_object.h"
#include "modules/video_coding/jitter_estimator.h"
#include "modules/video_coding/timing.h"
@@ -162,7 +162,7 @@
std::array<uint16_t, sizeof...(refs)> references = {
{rtc::checked_cast<uint16_t>(refs)...}};
- auto frame = absl::make_unique<FrameObjectFake>();
+ auto frame = std::make_unique<FrameObjectFake>();
frame->id.picture_id = picture_id;
frame->id.spatial_layer = spatial_layer;
frame->SetSpatialIndex(spatial_layer);
diff --git a/modules/video_coding/jitter_estimator_tests.cc b/modules/video_coding/jitter_estimator_tests.cc
index de9d5d4..1ad9abb 100644
--- a/modules/video_coding/jitter_estimator_tests.cc
+++ b/modules/video_coding/jitter_estimator_tests.cc
@@ -12,7 +12,6 @@
#include <memory>
#include <vector>
-#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "api/array_view.h"
#include "modules/video_coding/jitter_estimator.h"
@@ -31,7 +30,7 @@
TestVCMJitterEstimator() : fake_clock_(0) {}
virtual void SetUp() {
- estimator_ = absl::make_unique<VCMJitterEstimator>(&fake_clock_);
+ estimator_ = std::make_unique<VCMJitterEstimator>(&fake_clock_);
}
void AdvanceClock(int64_t microseconds) {
diff --git a/modules/video_coding/utility/simulcast_test_fixture_impl.cc b/modules/video_coding/utility/simulcast_test_fixture_impl.cc
index 7d94182..f091636 100644
--- a/modules/video_coding/utility/simulcast_test_fixture_impl.cc
+++ b/modules/video_coding/utility/simulcast_test_fixture_impl.cc
@@ -15,7 +15,6 @@
#include <memory>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/video/encoded_image.h"
#include "api/video_codecs/sdp_video_format.h"
#include "api/video_codecs/video_encoder.h"
@@ -288,7 +287,7 @@
EXPECT_EQ(0, decoder_->InitDecode(&settings_, 1));
input_buffer_ = I420Buffer::Create(kDefaultWidth, kDefaultHeight);
input_buffer_->InitializeData();
- input_frame_ = absl::make_unique<webrtc::VideoFrame>(
+ input_frame_ = std::make_unique<webrtc::VideoFrame>(
webrtc::VideoFrame::Builder()
.set_video_frame_buffer(input_buffer_)
.set_rotation(webrtc::kVideoRotation_0)
@@ -615,7 +614,7 @@
input_buffer_ = I420Buffer::Create(settings_.width, settings_.height);
input_buffer_->InitializeData();
- input_frame_ = absl::make_unique<webrtc::VideoFrame>(
+ input_frame_ = std::make_unique<webrtc::VideoFrame>(
webrtc::VideoFrame::Builder()
.set_video_frame_buffer(input_buffer_)
.set_rotation(webrtc::kVideoRotation_0)
@@ -660,7 +659,7 @@
// Resize |input_frame_| to the new resolution.
input_buffer_ = I420Buffer::Create(settings_.width, settings_.height);
input_buffer_->InitializeData();
- input_frame_ = absl::make_unique<webrtc::VideoFrame>(
+ input_frame_ = std::make_unique<webrtc::VideoFrame>(
webrtc::VideoFrame::Builder()
.set_video_frame_buffer(input_buffer_)
.set_rotation(webrtc::kVideoRotation_0)
@@ -824,7 +823,7 @@
int stride_uv = ((kDefaultWidth + 1) / 2) + 5;
input_buffer_ = I420Buffer::Create(kDefaultWidth, kDefaultHeight, stride_y,
stride_uv, stride_uv);
- input_frame_ = absl::make_unique<webrtc::VideoFrame>(
+ input_frame_ = std::make_unique<webrtc::VideoFrame>(
webrtc::VideoFrame::Builder()
.set_video_frame_buffer(input_buffer_)
.set_rotation(webrtc::kVideoRotation_0)