Index: webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h |
diff --git a/webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h b/webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h |
index 102396f70b372375ab7227783eef0f6df4622619..cdf49443c0d9a9b94e7457b11aea2273f57320ee 100644 |
--- a/webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h |
+++ b/webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h |
@@ -11,12 +11,12 @@ |
#ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_ |
#define WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_ |
+#include <memory> |
#include <string> |
#include <vector> |
#include "webrtc/base/buffer.h" |
#include "webrtc/base/criticalsection.h" |
-#include "webrtc/base/scoped_ptr.h" |
#include "webrtc/base/thread_annotations.h" |
#include "webrtc/common_types.h" |
#include "webrtc/engine_configurations.h" |
@@ -253,7 +253,7 @@ class AudioCodingModuleImpl final : public AudioCodingModule { |
CodecManager codec_manager; |
RentACodec rent_a_codec; |
}; |
- rtc::scoped_ptr<EncoderFactory> encoder_factory_ GUARDED_BY(acm_crit_sect_); |
+ std::unique_ptr<EncoderFactory> encoder_factory_ GUARDED_BY(acm_crit_sect_); |
// Current encoder stack, either obtained from |
// encoder_factory_->rent_a_codec.RentEncoderStack or provided by a call to |
@@ -269,7 +269,7 @@ class AudioCodingModuleImpl final : public AudioCodingModule { |
// IMPORTANT: this variable is only used in IncomingPayload(), therefore, |
// no lock acquired when interacting with this variable. If it is going to |
// be used in other methods, locks need to be taken. |
- rtc::scoped_ptr<WebRtcRTPHeader> aux_rtp_header_; |
+ std::unique_ptr<WebRtcRTPHeader> aux_rtp_header_; |
bool receiver_initialized_ GUARDED_BY(acm_crit_sect_); |