webrtc/modules/audio_processing/voice_detection_impl.h - Issue 1710483002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_processing/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/audio_processing/voice_detection_impl.h

Issue 1710483002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_processing/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: rebase 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

« no previous file with comments | « webrtc/modules/audio_processing/noise_suppression_impl.cc ('k') | webrtc/modules/audio_processing/voice_detection_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_processing/voice_detection_impl.h

diff --git a/webrtc/modules/audio_processing/voice_detection_impl.h b/webrtc/modules/audio_processing/voice_detection_impl.h

index 0d6d8cf14a4b9b748b41c54028dce656c4ddda88..6ba43dbc9e0528ab6e61314c3cea50fda946cf95 100644

--- a/webrtc/modules/audio_processing/voice_detection_impl.h

+++ b/webrtc/modules/audio_processing/voice_detection_impl.h

@@ -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