Use absl::make_unique and absl::WrapUnique directly
Instead of going through our wrappers in ptr_util.h.
This CL was generated by the following script:
git grep -l ptr_util | xargs perl -pi -e 's,#include "rtc_base/ptr_util.h",#include "absl/memory/memory.h",'
git grep -l MakeUnique | xargs perl -pi -e 's,\b(rtc::)?MakeUnique\b,absl::make_unique,g'
git grep -l WrapUnique | xargs perl -pi -e 's,\b(rtc::)?WrapUnique\b,absl::WrapUnique,g'
git checkout -- rtc_base/ptr_util{.h,_unittest.cc}
git cl format
Followed by manually adding dependencies on
//third_party/abseil-cpp/absl/memory until `gn check` stopped
complaining.
Bug: webrtc:9473
Change-Id: I89ccd363f070479b8c431eb2c3d404a46eaacc1c
Reviewed-on: https://webrtc-review.googlesource.com/86600
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23850}diff --git a/api/BUILD.gn b/api/BUILD.gn
index 6ec5f23..f73c80d 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -165,6 +165,7 @@
":video_quality_test_fixture_api",
"../rtc_base:ptr_util",
"../video:video_quality_test",
+ "//third_party/abseil-cpp/absl/memory",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
@@ -357,6 +358,7 @@
"../modules/video_coding:simulcast_test_fixture_impl",
"../rtc_base:rtc_base_approved",
"video_codecs:video_codecs_api",
+ "//third_party/abseil-cpp/absl/memory",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
@@ -392,6 +394,7 @@
"../modules/video_coding:videocodec_test_impl",
"../rtc_base:rtc_base_approved",
"video_codecs:video_codecs_api",
+ "//third_party/abseil-cpp/absl/memory",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
diff --git a/api/audio/BUILD.gn b/api/audio/BUILD.gn
index 5558ab1..701be9c 100644
--- a/api/audio/BUILD.gn
+++ b/api/audio/BUILD.gn
@@ -55,6 +55,7 @@
":echo_control",
"../../modules/audio_processing/aec3",
"../../rtc_base:rtc_base_approved",
+ "//third_party/abseil-cpp/absl/memory",
]
}
diff --git a/api/audio/echo_canceller3_factory.cc b/api/audio/echo_canceller3_factory.cc
index 7e2c143..07f295f 100644
--- a/api/audio/echo_canceller3_factory.cc
+++ b/api/audio/echo_canceller3_factory.cc
@@ -11,8 +11,8 @@
#include <memory>
+#include "absl/memory/memory.h"
#include "modules/audio_processing/aec3/echo_canceller3.h"
-#include "rtc_base/ptr_util.h"
namespace webrtc {
@@ -22,6 +22,6 @@
: config_(config) {}
std::unique_ptr<EchoControl> EchoCanceller3Factory::Create(int sample_rate_hz) {
- return rtc::MakeUnique<EchoCanceller3>(config_, sample_rate_hz, true);
+ return absl::make_unique<EchoCanceller3>(config_, sample_rate_hz, true);
}
} // namespace webrtc
diff --git a/api/audio_codecs/L16/BUILD.gn b/api/audio_codecs/L16/BUILD.gn
index 043d659..b1160d4 100644
--- a/api/audio_codecs/L16/BUILD.gn
+++ b/api/audio_codecs/L16/BUILD.gn
@@ -24,6 +24,7 @@
"../../..:webrtc_common",
"../../../modules/audio_coding:pcm16b",
"../../../rtc_base:rtc_base_approved",
+ "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -40,6 +41,7 @@
"../../..:webrtc_common",
"../../../modules/audio_coding:pcm16b",
"../../../rtc_base:rtc_base_approved",
+ "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
diff --git a/api/audio_codecs/L16/audio_decoder_L16.cc b/api/audio_codecs/L16/audio_decoder_L16.cc
index a17dc58..a71e308 100644
--- a/api/audio_codecs/L16/audio_decoder_L16.cc
+++ b/api/audio_codecs/L16/audio_decoder_L16.cc
@@ -10,11 +10,11 @@
#include "api/audio_codecs/L16/audio_decoder_L16.h"
+#include "absl/memory/memory.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h"
#include "modules/audio_coding/codecs/pcm16b/pcm16b_common.h"
#include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/ptr_util.h"
namespace webrtc {
@@ -36,7 +36,7 @@
std::unique_ptr<AudioDecoder> AudioDecoderL16::MakeAudioDecoder(
const Config& config,
absl::optional<AudioCodecPairId> /*codec_pair_id*/) {
- return config.IsOk() ? rtc::MakeUnique<AudioDecoderPcm16B>(
+ return config.IsOk() ? absl::make_unique<AudioDecoderPcm16B>(
config.sample_rate_hz, config.num_channels)
: nullptr;
}
diff --git a/api/audio_codecs/L16/audio_encoder_L16.cc b/api/audio_codecs/L16/audio_encoder_L16.cc
index d80e6bf..35a3b98 100644
--- a/api/audio_codecs/L16/audio_encoder_L16.cc
+++ b/api/audio_codecs/L16/audio_encoder_L16.cc
@@ -10,11 +10,11 @@
#include "api/audio_codecs/L16/audio_encoder_L16.h"
+#include "absl/memory/memory.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h"
#include "modules/audio_coding/codecs/pcm16b/pcm16b_common.h"
#include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/ptr_util.h"
namespace webrtc {
@@ -54,7 +54,7 @@
c.num_channels = config.num_channels;
c.frame_size_ms = config.frame_size_ms;
c.payload_type = payload_type;
- return rtc::MakeUnique<AudioEncoderPcm16B>(c);
+ return absl::make_unique<AudioEncoderPcm16B>(c);
}
} // namespace webrtc
diff --git a/api/audio_codecs/g711/BUILD.gn b/api/audio_codecs/g711/BUILD.gn
index 52e1ee9..169172a 100644
--- a/api/audio_codecs/g711/BUILD.gn
+++ b/api/audio_codecs/g711/BUILD.gn
@@ -25,6 +25,7 @@
"../../../modules/audio_coding:g711",
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base:safe_minmax",
+ "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -41,6 +42,7 @@
"../../..:webrtc_common",
"../../../modules/audio_coding:g711",
"../../../rtc_base:rtc_base_approved",
+ "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
diff --git a/api/audio_codecs/g711/audio_decoder_g711.cc b/api/audio_codecs/g711/audio_decoder_g711.cc
index e8afa60..cb16584 100644
--- a/api/audio_codecs/g711/audio_decoder_g711.cc
+++ b/api/audio_codecs/g711/audio_decoder_g711.cc
@@ -13,10 +13,10 @@
#include <memory>
#include <vector>
+#include "absl/memory/memory.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/g711/audio_decoder_pcm.h"
#include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/ptr_util.h"
namespace webrtc {
@@ -49,9 +49,9 @@
RTC_DCHECK(config.IsOk());
switch (config.type) {
case Config::Type::kPcmU:
- return rtc::MakeUnique<AudioDecoderPcmU>(config.num_channels);
+ return absl::make_unique<AudioDecoderPcmU>(config.num_channels);
case Config::Type::kPcmA:
- return rtc::MakeUnique<AudioDecoderPcmA>(config.num_channels);
+ return absl::make_unique<AudioDecoderPcmA>(config.num_channels);
default:
return nullptr;
}
diff --git a/api/audio_codecs/g711/audio_encoder_g711.cc b/api/audio_codecs/g711/audio_encoder_g711.cc
index 95595fa..1d5e541 100644
--- a/api/audio_codecs/g711/audio_encoder_g711.cc
+++ b/api/audio_codecs/g711/audio_encoder_g711.cc
@@ -13,11 +13,11 @@
#include <memory>
#include <vector>
+#include "absl/memory/memory.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/g711/audio_encoder_pcm.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/numerics/safe_minmax.h"
-#include "rtc_base/ptr_util.h"
#include "rtc_base/string_to_number.h"
namespace webrtc {
@@ -70,14 +70,14 @@
impl_config.num_channels = config.num_channels;
impl_config.frame_size_ms = config.frame_size_ms;
impl_config.payload_type = payload_type;
- return rtc::MakeUnique<AudioEncoderPcmU>(impl_config);
+ return absl::make_unique<AudioEncoderPcmU>(impl_config);
}
case Config::Type::kPcmA: {
AudioEncoderPcmA::Config impl_config;
impl_config.num_channels = config.num_channels;
impl_config.frame_size_ms = config.frame_size_ms;
impl_config.payload_type = payload_type;
- return rtc::MakeUnique<AudioEncoderPcmA>(impl_config);
+ return absl::make_unique<AudioEncoderPcmA>(impl_config);
}
default: { return nullptr; }
}
diff --git a/api/audio_codecs/g722/BUILD.gn b/api/audio_codecs/g722/BUILD.gn
index 85a8274..50b1396 100644
--- a/api/audio_codecs/g722/BUILD.gn
+++ b/api/audio_codecs/g722/BUILD.gn
@@ -33,6 +33,7 @@
"../../../modules/audio_coding:g722",
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base:safe_minmax",
+ "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -49,6 +50,7 @@
"../../..:webrtc_common",
"../../../modules/audio_coding:g722",
"../../../rtc_base:rtc_base_approved",
+ "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
diff --git a/api/audio_codecs/g722/audio_decoder_g722.cc b/api/audio_codecs/g722/audio_decoder_g722.cc
index 04a0a4c..f1e2afb 100644
--- a/api/audio_codecs/g722/audio_decoder_g722.cc
+++ b/api/audio_codecs/g722/audio_decoder_g722.cc
@@ -13,10 +13,10 @@
#include <memory>
#include <vector>
+#include "absl/memory/memory.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/g722/audio_decoder_g722.h"
#include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/ptr_util.h"
namespace webrtc {
@@ -40,9 +40,9 @@
absl::optional<AudioCodecPairId> /*codec_pair_id*/) {
switch (config.num_channels) {
case 1:
- return rtc::MakeUnique<AudioDecoderG722Impl>();
+ return absl::make_unique<AudioDecoderG722Impl>();
case 2:
- return rtc::MakeUnique<AudioDecoderG722StereoImpl>();
+ return absl::make_unique<AudioDecoderG722StereoImpl>();
default:
return nullptr;
}
diff --git a/api/audio_codecs/g722/audio_encoder_g722.cc b/api/audio_codecs/g722/audio_encoder_g722.cc
index d1f5258..0cf7163 100644
--- a/api/audio_codecs/g722/audio_encoder_g722.cc
+++ b/api/audio_codecs/g722/audio_encoder_g722.cc
@@ -13,11 +13,11 @@
#include <memory>
#include <vector>
+#include "absl/memory/memory.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/g722/audio_encoder_g722.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/numerics/safe_minmax.h"
-#include "rtc_base/ptr_util.h"
#include "rtc_base/string_to_number.h"
namespace webrtc {
@@ -62,7 +62,7 @@
int payload_type,
absl::optional<AudioCodecPairId> /*codec_pair_id*/) {
RTC_DCHECK(config.IsOk());
- return rtc::MakeUnique<AudioEncoderG722Impl>(config, payload_type);
+ return absl::make_unique<AudioEncoderG722Impl>(config, payload_type);
}
} // namespace webrtc
diff --git a/api/audio_codecs/ilbc/BUILD.gn b/api/audio_codecs/ilbc/BUILD.gn
index e1b2731..d4f504f 100644
--- a/api/audio_codecs/ilbc/BUILD.gn
+++ b/api/audio_codecs/ilbc/BUILD.gn
@@ -33,6 +33,7 @@
"../../../modules/audio_coding:ilbc",
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base:safe_minmax",
+ "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -49,6 +50,7 @@
"../../..:webrtc_common",
"../../../modules/audio_coding:ilbc",
"../../../rtc_base:rtc_base_approved",
+ "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
diff --git a/api/audio_codecs/ilbc/audio_decoder_ilbc.cc b/api/audio_codecs/ilbc/audio_decoder_ilbc.cc
index f1ecbdc..1f4c475 100644
--- a/api/audio_codecs/ilbc/audio_decoder_ilbc.cc
+++ b/api/audio_codecs/ilbc/audio_decoder_ilbc.cc
@@ -13,9 +13,9 @@
#include <memory>
#include <vector>
+#include "absl/memory/memory.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h"
-#include "rtc_base/ptr_util.h"
namespace webrtc {
@@ -35,7 +35,7 @@
std::unique_ptr<AudioDecoder> AudioDecoderIlbc::MakeAudioDecoder(
Config config,
absl::optional<AudioCodecPairId> /*codec_pair_id*/) {
- return rtc::MakeUnique<AudioDecoderIlbcImpl>();
+ return absl::make_unique<AudioDecoderIlbcImpl>();
}
} // namespace webrtc
diff --git a/api/audio_codecs/ilbc/audio_encoder_ilbc.cc b/api/audio_codecs/ilbc/audio_encoder_ilbc.cc
index 59a16b5..efcef38 100644
--- a/api/audio_codecs/ilbc/audio_encoder_ilbc.cc
+++ b/api/audio_codecs/ilbc/audio_encoder_ilbc.cc
@@ -13,11 +13,11 @@
#include <memory>
#include <vector>
+#include "absl/memory/memory.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/numerics/safe_minmax.h"
-#include "rtc_base/ptr_util.h"
#include "rtc_base/string_to_number.h"
namespace webrtc {
@@ -76,7 +76,7 @@
int payload_type,
absl::optional<AudioCodecPairId> /*codec_pair_id*/) {
RTC_DCHECK(config.IsOk());
- return rtc::MakeUnique<AudioEncoderIlbcImpl>(config, payload_type);
+ return absl::make_unique<AudioEncoderIlbcImpl>(config, payload_type);
}
} // namespace webrtc
diff --git a/api/audio_codecs/isac/BUILD.gn b/api/audio_codecs/isac/BUILD.gn
index e8e6d23..ed9d962 100644
--- a/api/audio_codecs/isac/BUILD.gn
+++ b/api/audio_codecs/isac/BUILD.gn
@@ -80,6 +80,7 @@
"../../..:webrtc_common",
"../../../modules/audio_coding:isac_fix",
"../../../rtc_base:rtc_base_approved",
+ "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -96,6 +97,7 @@
"../../..:webrtc_common",
"../../../modules/audio_coding:isac_fix",
"../../../rtc_base:rtc_base_approved",
+ "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -112,6 +114,7 @@
"../../..:webrtc_common",
"../../../modules/audio_coding:isac",
"../../../rtc_base:rtc_base_approved",
+ "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -128,6 +131,7 @@
"../../..:webrtc_common",
"../../../modules/audio_coding:isac",
"../../../rtc_base:rtc_base_approved",
+ "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
diff --git a/api/audio_codecs/isac/audio_decoder_isac_fix.cc b/api/audio_codecs/isac/audio_decoder_isac_fix.cc
index 8435d05..446640f 100644
--- a/api/audio_codecs/isac/audio_decoder_isac_fix.cc
+++ b/api/audio_codecs/isac/audio_decoder_isac_fix.cc
@@ -10,9 +10,9 @@
#include "api/audio_codecs/isac/audio_decoder_isac_fix.h"
+#include "absl/memory/memory.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h"
-#include "rtc_base/ptr_util.h"
namespace webrtc {
@@ -32,7 +32,7 @@
std::unique_ptr<AudioDecoder> AudioDecoderIsacFix::MakeAudioDecoder(
Config config,
absl::optional<AudioCodecPairId> /*codec_pair_id*/) {
- return rtc::MakeUnique<AudioDecoderIsacFixImpl>(16000);
+ return absl::make_unique<AudioDecoderIsacFixImpl>(16000);
}
} // namespace webrtc
diff --git a/api/audio_codecs/isac/audio_decoder_isac_float.cc b/api/audio_codecs/isac/audio_decoder_isac_float.cc
index 2e08e55..1c1926f 100644
--- a/api/audio_codecs/isac/audio_decoder_isac_float.cc
+++ b/api/audio_codecs/isac/audio_decoder_isac_float.cc
@@ -10,9 +10,9 @@
#include "api/audio_codecs/isac/audio_decoder_isac_float.h"
+#include "absl/memory/memory.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h"
-#include "rtc_base/ptr_util.h"
namespace webrtc {
@@ -39,7 +39,7 @@
Config config,
absl::optional<AudioCodecPairId> /*codec_pair_id*/) {
RTC_DCHECK(config.IsOk());
- return rtc::MakeUnique<AudioDecoderIsacFloatImpl>(config.sample_rate_hz);
+ return absl::make_unique<AudioDecoderIsacFloatImpl>(config.sample_rate_hz);
}
} // namespace webrtc
diff --git a/api/audio_codecs/isac/audio_encoder_isac_fix.cc b/api/audio_codecs/isac/audio_encoder_isac_fix.cc
index cb41214..cd89753 100644
--- a/api/audio_codecs/isac/audio_encoder_isac_fix.cc
+++ b/api/audio_codecs/isac/audio_encoder_isac_fix.cc
@@ -10,9 +10,9 @@
#include "api/audio_codecs/isac/audio_encoder_isac_fix.h"
+#include "absl/memory/memory.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h"
-#include "rtc_base/ptr_util.h"
#include "rtc_base/string_to_number.h"
namespace webrtc {
@@ -56,7 +56,7 @@
AudioEncoderIsacFixImpl::Config c;
c.frame_size_ms = config.frame_size_ms;
c.payload_type = payload_type;
- return rtc::MakeUnique<AudioEncoderIsacFixImpl>(c);
+ return absl::make_unique<AudioEncoderIsacFixImpl>(c);
}
} // namespace webrtc
diff --git a/api/audio_codecs/isac/audio_encoder_isac_float.cc b/api/audio_codecs/isac/audio_encoder_isac_float.cc
index 510244c..b70a82e 100644
--- a/api/audio_codecs/isac/audio_encoder_isac_float.cc
+++ b/api/audio_codecs/isac/audio_encoder_isac_float.cc
@@ -10,9 +10,9 @@
#include "api/audio_codecs/isac/audio_encoder_isac_float.h"
+#include "absl/memory/memory.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h"
-#include "rtc_base/ptr_util.h"
#include "rtc_base/string_to_number.h"
namespace webrtc {
@@ -68,7 +68,7 @@
c.sample_rate_hz = config.sample_rate_hz;
c.frame_size_ms = config.frame_size_ms;
c.payload_type = payload_type;
- return rtc::MakeUnique<AudioEncoderIsacFloatImpl>(c);
+ return absl::make_unique<AudioEncoderIsacFloatImpl>(c);
}
} // namespace webrtc
diff --git a/api/audio_codecs/opus/BUILD.gn b/api/audio_codecs/opus/BUILD.gn
index 953482e..800abbe 100644
--- a/api/audio_codecs/opus/BUILD.gn
+++ b/api/audio_codecs/opus/BUILD.gn
@@ -60,6 +60,7 @@
"../../..:webrtc_common",
"../../../modules/audio_coding:webrtc_opus",
"../../../rtc_base:rtc_base_approved",
+ "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
diff --git a/api/audio_codecs/opus/audio_decoder_opus.cc b/api/audio_codecs/opus/audio_decoder_opus.cc
index 81bee77..41397f0 100644
--- a/api/audio_codecs/opus/audio_decoder_opus.cc
+++ b/api/audio_codecs/opus/audio_decoder_opus.cc
@@ -14,9 +14,9 @@
#include <utility>
#include <vector>
+#include "absl/memory/memory.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/codecs/opus/audio_decoder_opus.h"
-#include "rtc_base/ptr_util.h"
namespace webrtc {
@@ -57,7 +57,7 @@
std::unique_ptr<AudioDecoder> AudioDecoderOpus::MakeAudioDecoder(
Config config,
absl::optional<AudioCodecPairId> /*codec_pair_id*/) {
- return rtc::MakeUnique<AudioDecoderOpusImpl>(config.num_channels);
+ return absl::make_unique<AudioDecoderOpusImpl>(config.num_channels);
}
} // namespace webrtc
diff --git a/api/audio_codecs/test/BUILD.gn b/api/audio_codecs/test/BUILD.gn
index 61234f5..cc7a4d9 100644
--- a/api/audio_codecs/test/BUILD.gn
+++ b/api/audio_codecs/test/BUILD.gn
@@ -38,6 +38,7 @@
"../isac:audio_encoder_isac_float",
"../opus:audio_decoder_opus",
"../opus:audio_encoder_opus",
+ "//third_party/abseil-cpp/absl/memory",
]
}
}
diff --git a/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc b/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc
index e4f09d4..d8fd9e0 100644
--- a/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc
+++ b/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc
@@ -9,6 +9,7 @@
*/
#include "api/audio_codecs/audio_decoder_factory_template.h"
+#include "absl/memory/memory.h"
#include "api/audio_codecs/L16/audio_decoder_L16.h"
#include "api/audio_codecs/g711/audio_decoder_g711.h"
#include "api/audio_codecs/g722/audio_decoder_g722.h"
@@ -16,7 +17,6 @@
#include "api/audio_codecs/isac/audio_decoder_isac_fix.h"
#include "api/audio_codecs/isac/audio_decoder_isac_float.h"
#include "api/audio_codecs/opus/audio_decoder_opus.h"
-#include "rtc_base/ptr_util.h"
#include "test/gmock.h"
#include "test/gtest.h"
#include "test/mock_audio_decoder.h"
@@ -64,7 +64,7 @@
static std::unique_ptr<AudioDecoder> MakeAudioDecoder(
const Config&,
absl::optional<AudioCodecPairId> /*codec_pair_id*/ = absl::nullopt) {
- auto dec = rtc::MakeUnique<testing::StrictMock<MockAudioDecoder>>();
+ auto dec = absl::make_unique<testing::StrictMock<MockAudioDecoder>>();
EXPECT_CALL(*dec, SampleRateHz())
.WillOnce(testing::Return(Params::CodecInfo().sample_rate_hz));
EXPECT_CALL(*dec, Die());
diff --git a/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc b/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc
index 46781ce..ca024b9 100644
--- a/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc
+++ b/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc
@@ -9,6 +9,7 @@
*/
#include "api/audio_codecs/audio_encoder_factory_template.h"
+#include "absl/memory/memory.h"
#include "api/audio_codecs/L16/audio_encoder_L16.h"
#include "api/audio_codecs/g711/audio_encoder_g711.h"
#include "api/audio_codecs/g722/audio_encoder_g722.h"
@@ -16,7 +17,6 @@
#include "api/audio_codecs/isac/audio_encoder_isac_fix.h"
#include "api/audio_codecs/isac/audio_encoder_isac_float.h"
#include "api/audio_codecs/opus/audio_encoder_opus.h"
-#include "rtc_base/ptr_util.h"
#include "test/gmock.h"
#include "test/gtest.h"
#include "test/mock_audio_encoder.h"
@@ -65,7 +65,7 @@
const Config&,
int payload_type,
absl::optional<AudioCodecPairId> /*codec_pair_id*/ = absl::nullopt) {
- auto enc = rtc::MakeUnique<testing::StrictMock<MockAudioEncoder>>();
+ auto enc = absl::make_unique<testing::StrictMock<MockAudioEncoder>>();
EXPECT_CALL(*enc, SampleRateHz())
.WillOnce(testing::Return(Params::CodecInfo().sample_rate_hz));
return std::move(enc);
diff --git a/api/test/create_simulcast_test_fixture.cc b/api/test/create_simulcast_test_fixture.cc
index 14bd5ab..897746d 100644
--- a/api/test/create_simulcast_test_fixture.cc
+++ b/api/test/create_simulcast_test_fixture.cc
@@ -13,9 +13,9 @@
#include <memory>
#include <utility>
+#include "absl/memory/memory.h"
#include "api/test/simulcast_test_fixture.h"
#include "modules/video_coding/utility/simulcast_test_fixture_impl.h"
-#include "rtc_base/ptr_util.h"
namespace webrtc {
namespace test {
@@ -24,9 +24,8 @@
std::unique_ptr<VideoEncoderFactory> encoder_factory,
std::unique_ptr<VideoDecoderFactory> decoder_factory,
SdpVideoFormat video_format) {
- return rtc::MakeUnique<SimulcastTestFixtureImpl>(std::move(encoder_factory),
- std::move(decoder_factory),
- video_format);
+ return absl::make_unique<SimulcastTestFixtureImpl>(
+ std::move(encoder_factory), std::move(decoder_factory), video_format);
}
} // namespace test
diff --git a/api/test/create_video_quality_test_fixture.cc b/api/test/create_video_quality_test_fixture.cc
index bc71861..994401b 100644
--- a/api/test/create_video_quality_test_fixture.cc
+++ b/api/test/create_video_quality_test_fixture.cc
@@ -11,22 +11,22 @@
#include <memory>
#include <utility>
+#include "absl/memory/memory.h"
#include "api/test/create_video_quality_test_fixture.h"
#include "video/video_quality_test.h"
-#include "rtc_base/ptr_util.h"
namespace webrtc {
std::unique_ptr<VideoQualityTestFixtureInterface>
CreateVideoQualityTestFixture() {
// By default, we don't override the FEC module, so pass an empty factory.
- return rtc::MakeUnique<VideoQualityTest>(nullptr);
+ return absl::make_unique<VideoQualityTest>(nullptr);
}
std::unique_ptr<VideoQualityTestFixtureInterface>
CreateVideoQualityTestFixture(
std::unique_ptr<FecControllerFactoryInterface> fec_controller_factory) {
- return rtc::MakeUnique<VideoQualityTest>(std::move(fec_controller_factory));
+ return absl::make_unique<VideoQualityTest>(std::move(fec_controller_factory));
}
} // namespace webrtc
diff --git a/api/test/create_videocodec_test_fixture.cc b/api/test/create_videocodec_test_fixture.cc
index 94b3dff..df8ad8b 100644
--- a/api/test/create_videocodec_test_fixture.cc
+++ b/api/test/create_videocodec_test_fixture.cc
@@ -13,9 +13,9 @@
#include <memory>
#include <utility>
+#include "absl/memory/memory.h"
#include "api/test/videocodec_test_fixture.h"
#include "modules/video_coding/codecs/test/videocodec_test_fixture_impl.h"
-#include "rtc_base/ptr_util.h"
namespace webrtc {
namespace test {
@@ -24,14 +24,14 @@
std::unique_ptr<VideoCodecTestFixture> CreateVideoCodecTestFixture(
const Config& config) {
- return rtc::MakeUnique<VideoCodecTestFixtureImpl>(config);
+ return absl::make_unique<VideoCodecTestFixtureImpl>(config);
}
std::unique_ptr<VideoCodecTestFixture> CreateVideoCodecTestFixture(
const Config& config,
std::unique_ptr<VideoDecoderFactory> decoder_factory,
std::unique_ptr<VideoEncoderFactory> encoder_factory) {
- return rtc::MakeUnique<VideoCodecTestFixtureImpl>(
+ return absl::make_unique<VideoCodecTestFixtureImpl>(
config, std::move(decoder_factory), std::move(encoder_factory));
}
diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn
index 6a5576c..454e480 100644
--- a/api/video/BUILD.gn
+++ b/api/video/BUILD.gn
@@ -115,6 +115,7 @@
":video_stream_decoder",
"../../rtc_base:rtc_base_approved",
"../../video:video_stream_decoder_impl",
+ "//third_party/abseil-cpp/absl/memory",
]
}
diff --git a/api/video/video_stream_decoder_create.cc b/api/video/video_stream_decoder_create.cc
index e756096..d579255 100644
--- a/api/video/video_stream_decoder_create.cc
+++ b/api/video/video_stream_decoder_create.cc
@@ -10,7 +10,7 @@
#include "api/video/video_stream_decoder_create.h"
-#include "rtc_base/ptr_util.h"
+#include "absl/memory/memory.h"
#include "video/video_stream_decoder_impl.h"
namespace webrtc {
@@ -18,7 +18,7 @@
VideoStreamDecoder::Callbacks* callbacks,
VideoDecoderFactory* decoder_factory,
std::map<int, std::pair<SdpVideoFormat, int>> decoder_settings) {
- return rtc::MakeUnique<VideoStreamDecoderImpl>(callbacks, decoder_factory,
- std::move(decoder_settings));
+ return absl::make_unique<VideoStreamDecoderImpl>(callbacks, decoder_factory,
+ std::move(decoder_settings));
}
} // namespace webrtc
diff --git a/api/video_codecs/BUILD.gn b/api/video_codecs/BUILD.gn
index fa62518..e523191 100644
--- a/api/video_codecs/BUILD.gn
+++ b/api/video_codecs/BUILD.gn
@@ -55,6 +55,7 @@
":video_codecs_api",
"../../media:rtc_internal_video_codecs",
"../../rtc_base:ptr_util",
+ "//third_party/abseil-cpp/absl/memory",
]
}
@@ -74,6 +75,7 @@
"../../media:rtc_internal_video_codecs",
"../../media:rtc_media_base",
"../../rtc_base:ptr_util",
+ "//third_party/abseil-cpp/absl/memory",
]
}
@@ -102,5 +104,6 @@
"../../rtc_base/system:fallthrough",
"../../system_wrappers:field_trial_api",
"../video:video_bitrate_allocation",
+ "//third_party/abseil-cpp/absl/memory",
]
}
diff --git a/api/video_codecs/builtin_video_decoder_factory.cc b/api/video_codecs/builtin_video_decoder_factory.cc
index 7395b96..883c1eb 100644
--- a/api/video_codecs/builtin_video_decoder_factory.cc
+++ b/api/video_codecs/builtin_video_decoder_factory.cc
@@ -10,13 +10,13 @@
#include "api/video_codecs/builtin_video_decoder_factory.h"
+#include "absl/memory/memory.h"
#include "media/engine/internaldecoderfactory.h"
-#include "rtc_base/ptr_util.h"
namespace webrtc {
std::unique_ptr<VideoDecoderFactory> CreateBuiltinVideoDecoderFactory() {
- return rtc::MakeUnique<InternalDecoderFactory>();
+ return absl::make_unique<InternalDecoderFactory>();
}
} // namespace webrtc
diff --git a/api/video_codecs/builtin_video_encoder_factory.cc b/api/video_codecs/builtin_video_encoder_factory.cc
index b8d747e..ca389b9 100644
--- a/api/video_codecs/builtin_video_encoder_factory.cc
+++ b/api/video_codecs/builtin_video_encoder_factory.cc
@@ -12,12 +12,12 @@
#include <vector>
+#include "absl/memory/memory.h"
#include "api/video_codecs/sdp_video_format.h"
#include "media/base/codec.h"
#include "media/base/mediaconstants.h"
#include "media/engine/internalencoderfactory.h"
#include "media/engine/vp8_encoder_simulcast_proxy.h"
-#include "rtc_base/ptr_util.h"
namespace webrtc {
@@ -60,7 +60,7 @@
format)) {
internal_encoder =
cricket::CodecNamesEq(format.name.c_str(), cricket::kVp8CodecName)
- ? rtc::MakeUnique<VP8EncoderSimulcastProxy>(
+ ? absl::make_unique<VP8EncoderSimulcastProxy>(
internal_encoder_factory_.get(), format)
: internal_encoder_factory_->CreateVideoEncoder(format);
}
@@ -79,7 +79,7 @@
} // namespace
std::unique_ptr<VideoEncoderFactory> CreateBuiltinVideoEncoderFactory() {
- return rtc::MakeUnique<BuiltinVideoEncoderFactory>();
+ return absl::make_unique<BuiltinVideoEncoderFactory>();
}
} // namespace webrtc
diff --git a/api/video_codecs/video_decoder_software_fallback_wrapper.cc b/api/video_codecs/video_decoder_software_fallback_wrapper.cc
index 01c7de8..1666bc3 100644
--- a/api/video_codecs/video_decoder_software_fallback_wrapper.cc
+++ b/api/video_codecs/video_decoder_software_fallback_wrapper.cc
@@ -13,10 +13,10 @@
#include <string>
#include <utility>
+#include "absl/memory/memory.h"
#include "modules/video_coding/include/video_error_codes.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/ptr_util.h"
#include "rtc_base/system/fallthrough.h"
#include "rtc_base/trace_event.h"
@@ -217,7 +217,7 @@
std::unique_ptr<VideoDecoder> CreateVideoDecoderSoftwareFallbackWrapper(
std::unique_ptr<VideoDecoder> sw_fallback_decoder,
std::unique_ptr<VideoDecoder> hw_decoder) {
- return rtc::MakeUnique<VideoDecoderSoftwareFallbackWrapper>(
+ return absl::make_unique<VideoDecoderSoftwareFallbackWrapper>(
std::move(sw_fallback_decoder), std::move(hw_decoder));
}
diff --git a/api/video_codecs/video_encoder_software_fallback_wrapper.cc b/api/video_codecs/video_encoder_software_fallback_wrapper.cc
index e345ea6..99f2970 100644
--- a/api/video_codecs/video_encoder_software_fallback_wrapper.cc
+++ b/api/video_codecs/video_encoder_software_fallback_wrapper.cc
@@ -15,12 +15,12 @@
#include <utility>
#include <vector>
+#include "absl/memory/memory.h"
#include "media/base/codec.h"
#include "media/base/h264_profile_level_id.h"
#include "modules/video_coding/include/video_error_codes.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/ptr_util.h"
#include "rtc_base/timeutils.h"
#include "system_wrappers/include/field_trial.h"
@@ -380,7 +380,7 @@
std::unique_ptr<VideoEncoder> CreateVideoEncoderSoftwareFallbackWrapper(
std::unique_ptr<VideoEncoder> sw_fallback_encoder,
std::unique_ptr<VideoEncoder> hw_encoder) {
- return rtc::MakeUnique<VideoEncoderSoftwareFallbackWrapper>(
+ return absl::make_unique<VideoEncoderSoftwareFallbackWrapper>(
std::move(sw_fallback_encoder), std::move(hw_encoder));
}