zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace scoped_ptr with unique_ptr in webrtc/modules/audio_processing/

Browse Source 
BUG=webrtc:5520

Review URL: https://codereview.webrtc.org/1710483002

Cr-Commit-Position: refs/heads/master@{#11684}
This commit is contained in:
kwiberg
2016-02-19 07:04:49 -08:00
committed by Commit bot
parent df88460372
commit 88788adcfd
28 changed files with 111 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/modules/audio_processing/voice_detection_impl.h
View File

@ -11,9 +11,10 @@
#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_
#define WEBRTC_MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_
#include <memory>
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/criticalsection.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
namespace webrtc {
@ -49,7 +50,7 @@ class VoiceDetectionImpl : public VoiceDetection {
int frame_size_ms_ GUARDED_BY(crit_) = 10;
size_t frame_size_samples_ GUARDED_BY(crit_) = 0;
int sample_rate_hz_ GUARDED_BY(crit_) = 0;
rtc::scoped_ptr<Vad> vad_ GUARDED_BY(crit_);
std::unique_ptr<Vad> vad_ GUARDED_BY(crit_);
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(VoiceDetectionImpl);
};
} // namespace webrtc