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

Side by Side Diff: webrtc/modules/audio_processing/vad/vad_audio_proc.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_VAD_AUDIO_PROC_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_H_
12 #define WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_H_ 12 #define WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_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/typedefs.h" 17 #include "webrtc/typedefs.h"
17 18
18 namespace webrtc { 19 namespace webrtc {
19 20
20 class AudioFrame; 21 class AudioFrame;
21 class PoleZeroFilter; 22 class PoleZeroFilter;
22 23
23 class VadAudioProc { 24 class VadAudioProc {
24 public: 25 public:
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 size_t ip_[kIpLength]; 73 size_t ip_[kIpLength];
73 float w_fft_[kWLength]; 74 float w_fft_[kWLength];
74 75
75 // A buffer of 5 ms (past audio) + 30 ms (one iSAC frame ). 76 // A buffer of 5 ms (past audio) + 30 ms (one iSAC frame ).
76 float audio_buffer_[kBufferLength]; 77 float audio_buffer_[kBufferLength];
77 size_t num_buffer_samples_; 78 size_t num_buffer_samples_;
78 79
79 double log_old_gain_; 80 double log_old_gain_;
80 double old_lag_; 81 double old_lag_;
81 82
82 rtc::scoped_ptr<PitchAnalysisStruct> pitch_analysis_handle_; 83 std::unique_ptr<PitchAnalysisStruct> pitch_analysis_handle_;
83 rtc::scoped_ptr<PreFiltBankstr> pre_filter_handle_; 84 std::unique_ptr<PreFiltBankstr> pre_filter_handle_;
84 rtc::scoped_ptr<PoleZeroFilter> high_pass_filter_; 85 std::unique_ptr<PoleZeroFilter> high_pass_filter_;
85 }; 86 };
86 87
87 } // namespace webrtc 88 } // namespace webrtc
88 89
89 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_H_ 90 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698