OLD | NEW |
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 |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 if (error != 0) { | 146 if (error != 0) { |
147 error_code_ = error; | 147 error_code_ = error; |
148 return kFail; | 148 return kFail; |
149 } | 149 } |
150 return kOK; | 150 return kOK; |
151 } | 151 } |
152 | 152 |
153 int NetEqImpl::GetAudio(size_t max_length, int16_t* output_audio, | 153 int NetEqImpl::GetAudio(size_t max_length, int16_t* output_audio, |
154 size_t* samples_per_channel, int* num_channels, | 154 size_t* samples_per_channel, int* num_channels, |
155 NetEqOutputType* type) { | 155 NetEqOutputType* type) { |
| 156 TRACE_EVENT0("webrtc", "NetEqImpl::GetAudio"); |
156 CriticalSectionScoped lock(crit_sect_.get()); | 157 CriticalSectionScoped lock(crit_sect_.get()); |
157 int error = GetAudioInternal(max_length, output_audio, samples_per_channel, | 158 int error = GetAudioInternal(max_length, output_audio, samples_per_channel, |
158 num_channels); | 159 num_channels); |
159 if (error != 0) { | 160 if (error != 0) { |
160 error_code_ = error; | 161 error_code_ = error; |
161 return kFail; | 162 return kFail; |
162 } | 163 } |
163 if (type) { | 164 if (type) { |
164 *type = LastOutputType(); | 165 *type = LastOutputType(); |
165 } | 166 } |
(...skipping 1878 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2044 | 2045 |
2045 void NetEqImpl::CreateDecisionLogic() { | 2046 void NetEqImpl::CreateDecisionLogic() { |
2046 decision_logic_.reset(DecisionLogic::Create(fs_hz_, output_size_samples_, | 2047 decision_logic_.reset(DecisionLogic::Create(fs_hz_, output_size_samples_, |
2047 playout_mode_, | 2048 playout_mode_, |
2048 decoder_database_.get(), | 2049 decoder_database_.get(), |
2049 *packet_buffer_.get(), | 2050 *packet_buffer_.get(), |
2050 delay_manager_.get(), | 2051 delay_manager_.get(), |
2051 buffer_level_filter_.get())); | 2052 buffer_level_filter_.get())); |
2052 } | 2053 } |
2053 } // namespace webrtc | 2054 } // namespace webrtc |
OLD | NEW |