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

Side by Side 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_
12 #define WEBRTC_MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_ 12 #define WEBRTC_MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_
13 13
14 #include <memory>
15
14 #include "webrtc/base/constructormagic.h" 16 #include "webrtc/base/constructormagic.h"
15 #include "webrtc/base/criticalsection.h" 17 #include "webrtc/base/criticalsection.h"
16 #include "webrtc/base/scoped_ptr.h"
17 #include "webrtc/modules/audio_processing/include/audio_processing.h" 18 #include "webrtc/modules/audio_processing/include/audio_processing.h"
18 19
19 namespace webrtc { 20 namespace webrtc {
20 21
21 class AudioBuffer; 22 class AudioBuffer;
22 23
23 class VoiceDetectionImpl : public VoiceDetection { 24 class VoiceDetectionImpl : public VoiceDetection {
24 public: 25 public:
25 explicit VoiceDetectionImpl(rtc::CriticalSection* crit); 26 explicit VoiceDetectionImpl(rtc::CriticalSection* crit);
26 ~VoiceDetectionImpl() override; 27 ~VoiceDetectionImpl() override;
(...skipping 15 matching lines...) Expand all
42 private: 43 private:
43 class Vad; 44 class Vad;
44 rtc::CriticalSection* const crit_; 45 rtc::CriticalSection* const crit_;
45 bool enabled_ GUARDED_BY(crit_) = false; 46 bool enabled_ GUARDED_BY(crit_) = false;
46 bool stream_has_voice_ GUARDED_BY(crit_) = false; 47 bool stream_has_voice_ GUARDED_BY(crit_) = false;
47 bool using_external_vad_ GUARDED_BY(crit_) = false; 48 bool using_external_vad_ GUARDED_BY(crit_) = false;
48 Likelihood likelihood_ GUARDED_BY(crit_) = kLowLikelihood; 49 Likelihood likelihood_ GUARDED_BY(crit_) = kLowLikelihood;
49 int frame_size_ms_ GUARDED_BY(crit_) = 10; 50 int frame_size_ms_ GUARDED_BY(crit_) = 10;
50 size_t frame_size_samples_ GUARDED_BY(crit_) = 0; 51 size_t frame_size_samples_ GUARDED_BY(crit_) = 0;
51 int sample_rate_hz_ GUARDED_BY(crit_) = 0; 52 int sample_rate_hz_ GUARDED_BY(crit_) = 0;
52 rtc::scoped_ptr<Vad> vad_ GUARDED_BY(crit_); 53 std::unique_ptr<Vad> vad_ GUARDED_BY(crit_);
53 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(VoiceDetectionImpl); 54 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(VoiceDetectionImpl);
54 }; 55 };
55 } // namespace webrtc 56 } // namespace webrtc
56 57
57 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_ 58 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698