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

Side by Side Diff: webrtc/modules/audio_coding/neteq/neteq_impl.cc

Issue 1296633002: NetEq/ACM: Refactor how packet waiting times are calculated (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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) 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 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 decoder_frame_length_) + 310 decoder_frame_length_) +
311 static_cast<int>(sync_buffer_->FutureLength()); 311 static_cast<int>(sync_buffer_->FutureLength());
312 assert(delay_manager_.get()); 312 assert(delay_manager_.get());
313 assert(decision_logic_.get()); 313 assert(decision_logic_.get());
314 stats_.GetNetworkStatistics(fs_hz_, total_samples_in_buffers, 314 stats_.GetNetworkStatistics(fs_hz_, total_samples_in_buffers,
315 decoder_frame_length_, *delay_manager_.get(), 315 decoder_frame_length_, *delay_manager_.get(),
316 *decision_logic_.get(), stats); 316 *decision_logic_.get(), stats);
317 return 0; 317 return 0;
318 } 318 }
319 319
320 void NetEqImpl::WaitingTimes(std::vector<int>* waiting_times) {
321 CriticalSectionScoped lock(crit_sect_.get());
322 stats_.WaitingTimes(waiting_times);
323 }
324
325 void NetEqImpl::GetRtcpStatistics(RtcpStatistics* stats) { 320 void NetEqImpl::GetRtcpStatistics(RtcpStatistics* stats) {
326 CriticalSectionScoped lock(crit_sect_.get()); 321 CriticalSectionScoped lock(crit_sect_.get());
327 if (stats) { 322 if (stats) {
328 rtcp_.GetStatistics(false, stats); 323 rtcp_.GetStatistics(false, stats);
329 } 324 }
330 } 325 }
331 326
332 void NetEqImpl::GetRtcpStatisticsNoReset(RtcpStatistics* stats) { 327 void NetEqImpl::GetRtcpStatisticsNoReset(RtcpStatistics* stats) {
333 CriticalSectionScoped lock(crit_sect_.get()); 328 CriticalSectionScoped lock(crit_sect_.get());
334 if (stats) { 329 if (stats) {
(...skipping 1638 matching lines...) Expand 10 before | Expand all | Expand 10 after
1973 1968
1974 void NetEqImpl::CreateDecisionLogic() { 1969 void NetEqImpl::CreateDecisionLogic() {
1975 decision_logic_.reset(DecisionLogic::Create(fs_hz_, output_size_samples_, 1970 decision_logic_.reset(DecisionLogic::Create(fs_hz_, output_size_samples_,
1976 playout_mode_, 1971 playout_mode_,
1977 decoder_database_.get(), 1972 decoder_database_.get(),
1978 *packet_buffer_.get(), 1973 *packet_buffer_.get(),
1979 delay_manager_.get(), 1974 delay_manager_.get(),
1980 buffer_level_filter_.get())); 1975 buffer_level_filter_.get()));
1981 } 1976 }
1982 } // namespace webrtc 1977 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698