| Index: webrtc/modules/audio_processing/vad/voice_activity_detector.h
|
| diff --git a/webrtc/modules/audio_processing/vad/voice_activity_detector.h b/webrtc/modules/audio_processing/vad/voice_activity_detector.h
|
| index e2dcf022a95ced0e6022433c26cb47e8485ffe77..25f10dd2ebd2d263b80ef4186d24cc2afc1c4ba8 100644
|
| --- a/webrtc/modules/audio_processing/vad/voice_activity_detector.h
|
| +++ b/webrtc/modules/audio_processing/vad/voice_activity_detector.h
|
| @@ -11,9 +11,9 @@
|
| #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VOICE_ACTIVITY_DETECTOR_H_
|
| #define WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VOICE_ACTIVITY_DETECTOR_H_
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| -#include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/common_audio/resampler/include/resampler.h"
|
| #include "webrtc/modules/audio_processing/vad/vad_audio_proc.h"
|
| #include "webrtc/modules/audio_processing/vad/common.h"
|
| @@ -58,7 +58,7 @@ class VoiceActivityDetector {
|
| Resampler resampler_;
|
| VadAudioProc audio_processing_;
|
|
|
| - rtc::scoped_ptr<StandaloneVad> standalone_vad_;
|
| + std::unique_ptr<StandaloneVad> standalone_vad_;
|
| PitchBasedVad pitch_based_vad_;
|
|
|
| int16_t resampled_[kLength10Ms];
|
|
|