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

Side by Side Diff: webrtc/modules/audio_processing/vad/pitch_based_vad.h

Issue 1699003002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_processing/vad/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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_VAD_PITCH_BASED_VAD_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VAD_PITCH_BASED_VAD_H_
12 #define WEBRTC_MODULES_AUDIO_PROCESSING_VAD_PITCH_BASED_VAD_H_ 12 #define WEBRTC_MODULES_AUDIO_PROCESSING_VAD_PITCH_BASED_VAD_H_
13 13
14 #include "webrtc/base/scoped_ptr.h" 14 #include <memory>
15
15 #include "webrtc/modules/audio_processing/vad/common.h" 16 #include "webrtc/modules/audio_processing/vad/common.h"
16 #include "webrtc/modules/audio_processing/vad/gmm.h" 17 #include "webrtc/modules/audio_processing/vad/gmm.h"
17 #include "webrtc/typedefs.h" 18 #include "webrtc/typedefs.h"
18 19
19 namespace webrtc { 20 namespace webrtc {
20 21
21 class AudioFrame; 22 class AudioFrame;
22 class VadCircularBuffer; 23 class VadCircularBuffer;
23 24
24 // Computes the probability of the input audio frame to be active given 25 // Computes the probability of the input audio frame to be active given
(...skipping 18 matching lines...) Expand all
43 44
44 // TODO(turajs): maybe defining this at a higher level (maybe enum) so that 45 // TODO(turajs): maybe defining this at a higher level (maybe enum) so that
45 // all the code recognize it as "no-error." 46 // all the code recognize it as "no-error."
46 static const int kNoError = 0; 47 static const int kNoError = 0;
47 48
48 GmmParameters noise_gmm_; 49 GmmParameters noise_gmm_;
49 GmmParameters voice_gmm_; 50 GmmParameters voice_gmm_;
50 51
51 double p_prior_; 52 double p_prior_;
52 53
53 rtc::scoped_ptr<VadCircularBuffer> circular_buffer_; 54 std::unique_ptr<VadCircularBuffer> circular_buffer_;
54 }; 55 };
55 56
56 } // namespace webrtc 57 } // namespace webrtc
57 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_VAD_PITCH_BASED_VAD_H_ 58 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_VAD_PITCH_BASED_VAD_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698