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

Use absl::make_unique and absl::WrapUnique directly

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

This CL was generated by the following script:

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

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

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

2
api/audio_codecs/L16/BUILD.gn
View File

@ -24,6 +24,7 @@ rtc_static_library("audio_encoder_L16") {
"../../..: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 @@ rtc_static_library("audio_decoder_L16") {
"../../..:webrtc_common",
"../../../modules/audio_coding:pcm16b",
"../../../rtc_base:rtc_base_approved",
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}

4
api/audio_codecs/L16/audio_decoder_L16.cc
View File

@ -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 @@ void AudioDecoderL16::AppendSupportedDecoders(
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;
}

4
api/audio_codecs/L16/audio_encoder_L16.cc
View File

@ -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 @@ std::unique_ptr<AudioEncoder> AudioEncoderL16::MakeAudioEncoder(
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

2
api/audio_codecs/g711/BUILD.gn
View File

@ -25,6 +25,7 @@ rtc_static_library("audio_encoder_g711") {
"../../../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 @@ rtc_static_library("audio_decoder_g711") {
"../../..:webrtc_common",
"../../../modules/audio_coding:g711",
"../../../rtc_base:rtc_base_approved",
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}

6
api/audio_codecs/g711/audio_decoder_g711.cc
View File

@ -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 @@ std::unique_ptr<AudioDecoder> AudioDecoderG711::MakeAudioDecoder(
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;
}

6
api/audio_codecs/g711/audio_encoder_g711.cc
View File

@ -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 @@ std::unique_ptr<AudioEncoder> AudioEncoderG711::MakeAudioEncoder(
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; }
}

2
api/audio_codecs/g722/BUILD.gn
View File

@ -33,6 +33,7 @@ rtc_static_library("audio_encoder_g722") {
"../../../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 @@ rtc_static_library("audio_decoder_g722") {
"../../..:webrtc_common",
"../../../modules/audio_coding:g722",
"../../../rtc_base:rtc_base_approved",
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}

6
api/audio_codecs/g722/audio_decoder_g722.cc
View File

@ -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 @@ std::unique_ptr<AudioDecoder> AudioDecoderG722::MakeAudioDecoder(
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;
}

4
api/audio_codecs/g722/audio_encoder_g722.cc
View File

@ -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 @@ std::unique_ptr<AudioEncoder> AudioEncoderG722::MakeAudioEncoder(
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

2
api/audio_codecs/ilbc/BUILD.gn
View File

@ -33,6 +33,7 @@ rtc_static_library("audio_encoder_ilbc") {
"../../../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 @@ rtc_static_library("audio_decoder_ilbc") {
"../../..:webrtc_common",
"../../../modules/audio_coding:ilbc",
"../../../rtc_base:rtc_base_approved",
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}

4
api/audio_codecs/ilbc/audio_decoder_ilbc.cc
View File

@ -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 @@ void AudioDecoderIlbc::AppendSupportedDecoders(
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

4
api/audio_codecs/ilbc/audio_encoder_ilbc.cc
View File

@ -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 @@ std::unique_ptr<AudioEncoder> AudioEncoderIlbc::MakeAudioEncoder(
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

4
api/audio_codecs/isac/BUILD.gn
View File

@ -80,6 +80,7 @@ rtc_static_library("audio_encoder_isac_fix") {
"../../..: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 @@ rtc_static_library("audio_decoder_isac_fix") {
"../../..: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 @@ rtc_static_library("audio_encoder_isac_float") {
"../../..: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 @@ rtc_static_library("audio_decoder_isac_float") {
"../../..:webrtc_common",
"../../../modules/audio_coding:isac",
"../../../rtc_base:rtc_base_approved",
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}

4
api/audio_codecs/isac/audio_decoder_isac_fix.cc
View File

@ -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 @@ void AudioDecoderIsacFix::AppendSupportedDecoders(
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

4
api/audio_codecs/isac/audio_decoder_isac_float.cc
View File

@ -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 @@ std::unique_ptr<AudioDecoder> AudioDecoderIsacFloat::MakeAudioDecoder(
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

4
api/audio_codecs/isac/audio_encoder_isac_fix.cc
View File

@ -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 @@ std::unique_ptr<AudioEncoder> AudioEncoderIsacFix::MakeAudioEncoder(
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

4
api/audio_codecs/isac/audio_encoder_isac_float.cc
View File

@ -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 @@ std::unique_ptr<AudioEncoder> AudioEncoderIsacFloat::MakeAudioEncoder(
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

1
api/audio_codecs/opus/BUILD.gn
View File

@ -60,6 +60,7 @@ rtc_static_library("audio_decoder_opus") {
"../../..: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",
]
}

4
api/audio_codecs/opus/audio_decoder_opus.cc
View File

@ -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 @@ void AudioDecoderOpus::AppendSupportedDecoders(
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

1
api/audio_codecs/test/BUILD.gn
View File

@ -38,6 +38,7 @@ if (rtc_include_tests) {
"../isac:audio_encoder_isac_float",
"../opus:audio_decoder_opus",
"../opus:audio_encoder_opus",
"//third_party/abseil-cpp/absl/memory",
]
}
}

4
api/audio_codecs/test/audio_decoder_factory_template_unittest.cc
View File

@ -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 @@ struct AudioDecoderFakeApi {
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());

4
api/audio_codecs/test/audio_encoder_factory_template_unittest.cc
View File

@ -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 @@ struct AudioEncoderFakeApi {
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);