Index: webrtc/modules/audio_processing/test/audioproc_float.cc |
diff --git a/webrtc/modules/audio_processing/test/audioproc_float.cc b/webrtc/modules/audio_processing/test/audioproc_float.cc |
index a489d255c8af697e5dc3de3cb07cee433cf156b2..b403c1fe05e1c43b84617d63f09e6419732f29e6 100644 |
--- a/webrtc/modules/audio_processing/test/audioproc_float.cc |
+++ b/webrtc/modules/audio_processing/test/audioproc_float.cc |
@@ -9,7 +9,9 @@ |
*/ |
#include <stdio.h> |
+ |
#include <iostream> |
+#include <memory> |
#include <sstream> |
#include <string> |
#include <utility> |
@@ -17,7 +19,6 @@ |
#include "gflags/gflags.h" |
#include "webrtc/base/checks.h" |
#include "webrtc/base/format_macros.h" |
-#include "webrtc/base/scoped_ptr.h" |
#include "webrtc/common_audio/channel_buffer.h" |
#include "webrtc/common_audio/wav_file.h" |
#include "webrtc/modules/audio_processing/include/audio_processing.h" |
@@ -115,7 +116,7 @@ int main(int argc, char* argv[]) { |
config.Set<ExperimentalNs>(new ExperimentalNs(FLAGS_ts || FLAGS_all)); |
config.Set<Intelligibility>(new Intelligibility(FLAGS_ie || FLAGS_all)); |
- rtc::scoped_ptr<AudioProcessing> ap(AudioProcessing::Create(config)); |
+ std::unique_ptr<AudioProcessing> ap(AudioProcessing::Create(config)); |
RTC_CHECK_EQ(kNoErr, ap->echo_cancellation()->Enable(FLAGS_aec || FLAGS_all)); |
RTC_CHECK_EQ(kNoErr, ap->gain_control()->Enable(FLAGS_agc || FLAGS_all)); |
RTC_CHECK_EQ(kNoErr, ap->high_pass_filter()->Enable(FLAGS_hpf || FLAGS_all)); |
@@ -127,12 +128,12 @@ int main(int argc, char* argv[]) { |
} |
ap->set_stream_key_pressed(FLAGS_ts); |
- rtc::scoped_ptr<AudioFileProcessor> processor; |
- auto out_file = rtc_make_scoped_ptr(new WavWriter( |
+ std::unique_ptr<AudioFileProcessor> processor; |
+ auto out_file = std::unique_ptr<WavWriter>(new WavWriter( |
FLAGS_o, FLAGS_out_sample_rate, static_cast<size_t>(FLAGS_out_channels))); |
std::cout << FLAGS_o << ": " << out_file->FormatAsString() << std::endl; |
if (FLAGS_dump.empty()) { |
- auto in_file = rtc_make_scoped_ptr(new WavReader(FLAGS_i)); |
+ auto in_file = std::unique_ptr<WavReader>(new WavReader(FLAGS_i)); |
std::cout << FLAGS_i << ": " << in_file->FormatAsString() << std::endl; |
processor.reset(new WavFileProcessor(std::move(ap), std::move(in_file), |
std::move(out_file))); |