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

Unified Diff: webrtc/modules/audio_coding/acm2/rent_a_codec.h

Issue 1694073002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up-actest
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/acm2/rent_a_codec.h
diff --git a/webrtc/modules/audio_coding/acm2/rent_a_codec.h b/webrtc/modules/audio_coding/acm2/rent_a_codec.h
index 3f914ea825622ef4c2a5fbeafa183fefd48013b3..dd2deceb8d326983b39a60777b31bd7993b1e6ce 100644
--- a/webrtc/modules/audio_coding/acm2/rent_a_codec.h
+++ b/webrtc/modules/audio_coding/acm2/rent_a_codec.h
@@ -13,11 +13,11 @@
#include <stddef.h>
#include <map>
+#include <memory>
#include "webrtc/base/array_view.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/optional.h"
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
#include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h"
@@ -229,10 +229,10 @@ class RentACodec {
AudioDecoder* RentIsacDecoder();
private:
- rtc::scoped_ptr<AudioEncoder> speech_encoder_;
- rtc::scoped_ptr<AudioEncoder> cng_encoder_;
- rtc::scoped_ptr<AudioEncoder> red_encoder_;
- rtc::scoped_ptr<AudioDecoder> isac_decoder_;
+ std::unique_ptr<AudioEncoder> speech_encoder_;
+ std::unique_ptr<AudioEncoder> cng_encoder_;
+ std::unique_ptr<AudioEncoder> red_encoder_;
+ std::unique_ptr<AudioDecoder> isac_decoder_;
LockedIsacBandwidthInfo isac_bandwidth_info_;
RTC_DISALLOW_COPY_AND_ASSIGN(RentACodec);

Powered by Google App Engine
This is Rietveld 408576698