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

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

Issue 1234463003: Integrate Intelligibility with APM (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Added resampling support to InterleaveTo; removed VAD logic Created 5 years, 4 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
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 102
103 const float* keyboard_data() const; 103 const float* keyboard_data() const;
104 104
105 void set_activity(AudioFrame::VADActivity activity); 105 void set_activity(AudioFrame::VADActivity activity);
106 AudioFrame::VADActivity activity() const; 106 AudioFrame::VADActivity activity() const;
107 107
108 // Use for int16 interleaved data. 108 // Use for int16 interleaved data.
109 void DeinterleaveFrom(AudioFrame* audioFrame); 109 void DeinterleaveFrom(AudioFrame* audioFrame);
110 // If |data_changed| is false, only the non-audio data members will be copied 110 // If |data_changed| is false, only the non-audio data members will be copied
111 // to |frame|. 111 // to |frame|.
112 void InterleaveTo(AudioFrame* frame, bool data_changed) const; 112 void InterleaveTo(AudioFrame* frame, bool data_changed);
113 113
114 // Use for float deinterleaved data. 114 // Use for float deinterleaved data.
115 void CopyFrom(const float* const* data, 115 void CopyFrom(const float* const* data,
116 int num_frames, 116 int num_frames,
117 AudioProcessing::ChannelLayout layout); 117 AudioProcessing::ChannelLayout layout);
118 void CopyTo(int num_frames, 118 void CopyTo(int num_frames,
119 AudioProcessing::ChannelLayout layout, 119 AudioProcessing::ChannelLayout layout,
120 float* const* data); 120 float* const* data);
121 void CopyLowPassToReference(); 121 void CopyLowPassToReference();
122 122
(...skipping 26 matching lines...) Expand all
149 bool reference_copied_; 149 bool reference_copied_;
150 AudioFrame::VADActivity activity_; 150 AudioFrame::VADActivity activity_;
151 151
152 const float* keyboard_data_; 152 const float* keyboard_data_;
153 rtc::scoped_ptr<IFChannelBuffer> data_; 153 rtc::scoped_ptr<IFChannelBuffer> data_;
154 rtc::scoped_ptr<IFChannelBuffer> split_data_; 154 rtc::scoped_ptr<IFChannelBuffer> split_data_;
155 rtc::scoped_ptr<SplittingFilter> splitting_filter_; 155 rtc::scoped_ptr<SplittingFilter> splitting_filter_;
156 rtc::scoped_ptr<ChannelBuffer<int16_t> > mixed_low_pass_channels_; 156 rtc::scoped_ptr<ChannelBuffer<int16_t> > mixed_low_pass_channels_;
157 rtc::scoped_ptr<ChannelBuffer<int16_t> > low_pass_reference_channels_; 157 rtc::scoped_ptr<ChannelBuffer<int16_t> > low_pass_reference_channels_;
158 rtc::scoped_ptr<IFChannelBuffer> input_buffer_; 158 rtc::scoped_ptr<IFChannelBuffer> input_buffer_;
159 rtc::scoped_ptr<IFChannelBuffer> output_buffer_;
159 rtc::scoped_ptr<ChannelBuffer<float> > process_buffer_; 160 rtc::scoped_ptr<ChannelBuffer<float> > process_buffer_;
160 ScopedVector<PushSincResampler> input_resamplers_; 161 ScopedVector<PushSincResampler> input_resamplers_;
161 ScopedVector<PushSincResampler> output_resamplers_; 162 ScopedVector<PushSincResampler> output_resamplers_;
162 }; 163 };
163 164
164 } // namespace webrtc 165 } // namespace webrtc
165 166
166 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_ 167 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698