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

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: Rebasing 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 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 decoder_frame_length_) + 311 decoder_frame_length_) +
312 sync_buffer_->FutureLength(); 312 sync_buffer_->FutureLength();
313 assert(delay_manager_.get()); 313 assert(delay_manager_.get());
314 assert(decision_logic_.get()); 314 assert(decision_logic_.get());
315 stats_.GetNetworkStatistics(fs_hz_, total_samples_in_buffers, 315 stats_.GetNetworkStatistics(fs_hz_, total_samples_in_buffers,
316 decoder_frame_length_, *delay_manager_.get(), 316 decoder_frame_length_, *delay_manager_.get(),
317 *decision_logic_.get(), stats); 317 *decision_logic_.get(), stats);
318 return 0; 318 return 0;
319 } 319 }
320 320
321 void NetEqImpl::WaitingTimes(std::vector<int>* waiting_times) {
322 CriticalSectionScoped lock(crit_sect_.get());
323 stats_.WaitingTimes(waiting_times);
324 }
325
326 void NetEqImpl::GetRtcpStatistics(RtcpStatistics* stats) { 321 void NetEqImpl::GetRtcpStatistics(RtcpStatistics* stats) {
327 CriticalSectionScoped lock(crit_sect_.get()); 322 CriticalSectionScoped lock(crit_sect_.get());
328 if (stats) { 323 if (stats) {
329 rtcp_.GetStatistics(false, stats); 324 rtcp_.GetStatistics(false, stats);
330 } 325 }
331 } 326 }
332 327
333 void NetEqImpl::GetRtcpStatisticsNoReset(RtcpStatistics* stats) { 328 void NetEqImpl::GetRtcpStatisticsNoReset(RtcpStatistics* stats) {
334 CriticalSectionScoped lock(crit_sect_.get()); 329 CriticalSectionScoped lock(crit_sect_.get());
335 if (stats) { 330 if (stats) {
(...skipping 1639 matching lines...) Expand 10 before | Expand all | Expand 10 after
1975 1970
1976 void NetEqImpl::CreateDecisionLogic() { 1971 void NetEqImpl::CreateDecisionLogic() {
1977 decision_logic_.reset(DecisionLogic::Create(fs_hz_, output_size_samples_, 1972 decision_logic_.reset(DecisionLogic::Create(fs_hz_, output_size_samples_,
1978 playout_mode_, 1973 playout_mode_,
1979 decoder_database_.get(), 1974 decoder_database_.get(),
1980 *packet_buffer_.get(), 1975 *packet_buffer_.get(),
1981 delay_manager_.get(), 1976 delay_manager_.get(),
1982 buffer_level_filter_.get())); 1977 buffer_level_filter_.get()));
1983 } 1978 }
1984 } // namespace webrtc 1979 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698