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

Side by Side Diff: webrtc/modules/audio_processing/audio_buffer.h

Issue 1839603002: Remove webrtc::ScopedVector (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 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) 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 <memory> 14 #include <memory>
15 #include <vector>
15 16
16 #include "webrtc/common_audio/channel_buffer.h" 17 #include "webrtc/common_audio/channel_buffer.h"
17 #include "webrtc/modules/audio_processing/include/audio_processing.h" 18 #include "webrtc/modules/audio_processing/include/audio_processing.h"
18 #include "webrtc/modules/audio_processing/splitting_filter.h" 19 #include "webrtc/modules/audio_processing/splitting_filter.h"
19 #include "webrtc/modules/include/module_common_types.h" 20 #include "webrtc/modules/include/module_common_types.h"
20 #include "webrtc/system_wrappers/include/scoped_vector.h"
21 #include "webrtc/typedefs.h" 21 #include "webrtc/typedefs.h"
22 22
23 namespace webrtc { 23 namespace webrtc {
24 24
25 class PushSincResampler; 25 class PushSincResampler;
26 class IFChannelBuffer; 26 class IFChannelBuffer;
27 27
28 enum Band { 28 enum Band {
29 kBand0To8kHz = 0, 29 kBand0To8kHz = 0,
30 kBand8To16kHz = 1, 30 kBand8To16kHz = 1,
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 148
149 const float* keyboard_data_; 149 const float* keyboard_data_;
150 std::unique_ptr<IFChannelBuffer> data_; 150 std::unique_ptr<IFChannelBuffer> data_;
151 std::unique_ptr<IFChannelBuffer> split_data_; 151 std::unique_ptr<IFChannelBuffer> split_data_;
152 std::unique_ptr<SplittingFilter> splitting_filter_; 152 std::unique_ptr<SplittingFilter> splitting_filter_;
153 std::unique_ptr<ChannelBuffer<int16_t> > mixed_low_pass_channels_; 153 std::unique_ptr<ChannelBuffer<int16_t> > mixed_low_pass_channels_;
154 std::unique_ptr<ChannelBuffer<int16_t> > low_pass_reference_channels_; 154 std::unique_ptr<ChannelBuffer<int16_t> > low_pass_reference_channels_;
155 std::unique_ptr<IFChannelBuffer> input_buffer_; 155 std::unique_ptr<IFChannelBuffer> input_buffer_;
156 std::unique_ptr<IFChannelBuffer> output_buffer_; 156 std::unique_ptr<IFChannelBuffer> output_buffer_;
157 std::unique_ptr<ChannelBuffer<float> > process_buffer_; 157 std::unique_ptr<ChannelBuffer<float> > process_buffer_;
158 ScopedVector<PushSincResampler> input_resamplers_; 158 std::vector<std::unique_ptr<PushSincResampler>> input_resamplers_;
159 ScopedVector<PushSincResampler> output_resamplers_; 159 std::vector<std::unique_ptr<PushSincResampler>> output_resamplers_;
160 }; 160 };
161 161
162 } // namespace webrtc 162 } // namespace webrtc
163 163
164 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_ 164 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_
OLDNEW
« no previous file with comments | « webrtc/common_audio/audio_ring_buffer.h ('k') | webrtc/modules/audio_processing/audio_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698