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}
This commit is contained in:

committed by
Commit Bot

parent
809198edff
commit
317a1f09ed
@ -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 @@ NetEqNetworkStatistics RunTest(int loss_cadence, std::string* checksum) {
|
||||
// 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;
|
||||
|
Reference in New Issue
Block a user