OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2011 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_AUDIO_BUFFER_H_ | 11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_ |
12 #define WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_ | 12 #define WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_ |
13 | 13 |
14 #include "webrtc/base/scoped_ptr.h" | 14 #include <memory> |
| 15 |
15 #include "webrtc/common_audio/channel_buffer.h" | 16 #include "webrtc/common_audio/channel_buffer.h" |
16 #include "webrtc/modules/audio_processing/include/audio_processing.h" | 17 #include "webrtc/modules/audio_processing/include/audio_processing.h" |
17 #include "webrtc/modules/audio_processing/splitting_filter.h" | 18 #include "webrtc/modules/audio_processing/splitting_filter.h" |
18 #include "webrtc/modules/include/module_common_types.h" | 19 #include "webrtc/modules/include/module_common_types.h" |
19 #include "webrtc/system_wrappers/include/scoped_vector.h" | 20 #include "webrtc/system_wrappers/include/scoped_vector.h" |
20 #include "webrtc/typedefs.h" | 21 #include "webrtc/typedefs.h" |
21 | 22 |
22 namespace webrtc { | 23 namespace webrtc { |
23 | 24 |
24 class PushSincResampler; | 25 class PushSincResampler; |
(...skipping 114 matching lines...) Loading... |
139 const size_t output_num_frames_; | 140 const size_t output_num_frames_; |
140 size_t num_channels_; | 141 size_t num_channels_; |
141 | 142 |
142 size_t num_bands_; | 143 size_t num_bands_; |
143 size_t num_split_frames_; | 144 size_t num_split_frames_; |
144 bool mixed_low_pass_valid_; | 145 bool mixed_low_pass_valid_; |
145 bool reference_copied_; | 146 bool reference_copied_; |
146 AudioFrame::VADActivity activity_; | 147 AudioFrame::VADActivity activity_; |
147 | 148 |
148 const float* keyboard_data_; | 149 const float* keyboard_data_; |
149 rtc::scoped_ptr<IFChannelBuffer> data_; | 150 std::unique_ptr<IFChannelBuffer> data_; |
150 rtc::scoped_ptr<IFChannelBuffer> split_data_; | 151 std::unique_ptr<IFChannelBuffer> split_data_; |
151 rtc::scoped_ptr<SplittingFilter> splitting_filter_; | 152 std::unique_ptr<SplittingFilter> splitting_filter_; |
152 rtc::scoped_ptr<ChannelBuffer<int16_t> > mixed_low_pass_channels_; | 153 std::unique_ptr<ChannelBuffer<int16_t> > mixed_low_pass_channels_; |
153 rtc::scoped_ptr<ChannelBuffer<int16_t> > low_pass_reference_channels_; | 154 std::unique_ptr<ChannelBuffer<int16_t> > low_pass_reference_channels_; |
154 rtc::scoped_ptr<IFChannelBuffer> input_buffer_; | 155 std::unique_ptr<IFChannelBuffer> input_buffer_; |
155 rtc::scoped_ptr<IFChannelBuffer> output_buffer_; | 156 std::unique_ptr<IFChannelBuffer> output_buffer_; |
156 rtc::scoped_ptr<ChannelBuffer<float> > process_buffer_; | 157 std::unique_ptr<ChannelBuffer<float> > process_buffer_; |
157 ScopedVector<PushSincResampler> input_resamplers_; | 158 ScopedVector<PushSincResampler> input_resamplers_; |
158 ScopedVector<PushSincResampler> output_resamplers_; | 159 ScopedVector<PushSincResampler> output_resamplers_; |
159 }; | 160 }; |
160 | 161 |
161 } // namespace webrtc | 162 } // namespace webrtc |
162 | 163 |
163 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_ | 164 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_ |
OLD | NEW |