Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(238)

Unified Diff: webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h

Issue 1697823002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/neteq/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up-codecs
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h
index c2b2effee24b303755d4a7dfd4b75f5ffdf567c2..8bae160476149c2227f1422c90304c03459a0fd5 100644
--- a/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h
+++ b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h
@@ -12,9 +12,9 @@
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_
#include <fstream>
+#include <memory>
#include <gflags/gflags.h>
#include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/audio_coding/neteq/include/neteq.h"
#include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h"
#include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h"
@@ -58,7 +58,7 @@ class GilbertElliotLoss : public LossModel {
// Prob. of losing current packet, when previous packet is not lost.
double prob_trans_01_;
bool lost_last_;
- rtc::scoped_ptr<UniformLoss> uniform_loss_model_;
+ std::unique_ptr<UniformLoss> uniform_loss_model_;
};
class NetEqQualityTest : public ::testing::Test {
@@ -119,17 +119,17 @@ class NetEqQualityTest : public ::testing::Test {
size_t payload_size_bytes_;
size_t max_payload_bytes_;
- rtc::scoped_ptr<InputAudioFile> in_file_;
- rtc::scoped_ptr<AudioSink> output_;
+ std::unique_ptr<InputAudioFile> in_file_;
+ std::unique_ptr<AudioSink> output_;
std::ofstream log_file_;
- rtc::scoped_ptr<RtpGenerator> rtp_generator_;
- rtc::scoped_ptr<NetEq> neteq_;
- rtc::scoped_ptr<LossModel> loss_model_;
+ std::unique_ptr<RtpGenerator> rtp_generator_;
+ std::unique_ptr<NetEq> neteq_;
+ std::unique_ptr<LossModel> loss_model_;
- rtc::scoped_ptr<int16_t[]> in_data_;
- rtc::scoped_ptr<uint8_t[]> payload_;
- rtc::scoped_ptr<int16_t[]> out_data_;
+ std::unique_ptr<int16_t[]> in_data_;
+ std::unique_ptr<uint8_t[]> payload_;
+ std::unique_ptr<int16_t[]> out_data_;
WebRtcRTPHeader rtp_header_;
size_t total_payload_size_bytes_;

Powered by Google App Engine
This is Rietveld 408576698