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 17 matching lines...) Expand all Loading... |
28 #include "webrtc/modules/audio_coding/neteq/comfort_noise.h" | 28 #include "webrtc/modules/audio_coding/neteq/comfort_noise.h" |
29 #include "webrtc/modules/audio_coding/neteq/decision_logic.h" | 29 #include "webrtc/modules/audio_coding/neteq/decision_logic.h" |
30 #include "webrtc/modules/audio_coding/neteq/decoder_database.h" | 30 #include "webrtc/modules/audio_coding/neteq/decoder_database.h" |
31 #include "webrtc/modules/audio_coding/neteq/defines.h" | 31 #include "webrtc/modules/audio_coding/neteq/defines.h" |
32 #include "webrtc/modules/audio_coding/neteq/delay_manager.h" | 32 #include "webrtc/modules/audio_coding/neteq/delay_manager.h" |
33 #include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" | 33 #include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" |
34 #include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h" | 34 #include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h" |
35 #include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h" | 35 #include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h" |
36 #include "webrtc/modules/audio_coding/neteq/expand.h" | 36 #include "webrtc/modules/audio_coding/neteq/expand.h" |
37 #include "webrtc/modules/audio_coding/neteq/merge.h" | 37 #include "webrtc/modules/audio_coding/neteq/merge.h" |
38 #include "webrtc/modules/audio_coding/neteq/nack.h" | 38 #include "webrtc/modules/audio_coding/neteq/nack_tracker.h" |
39 #include "webrtc/modules/audio_coding/neteq/normal.h" | 39 #include "webrtc/modules/audio_coding/neteq/normal.h" |
40 #include "webrtc/modules/audio_coding/neteq/packet_buffer.h" | 40 #include "webrtc/modules/audio_coding/neteq/packet_buffer.h" |
41 #include "webrtc/modules/audio_coding/neteq/packet.h" | 41 #include "webrtc/modules/audio_coding/neteq/packet.h" |
42 #include "webrtc/modules/audio_coding/neteq/payload_splitter.h" | 42 #include "webrtc/modules/audio_coding/neteq/payload_splitter.h" |
43 #include "webrtc/modules/audio_coding/neteq/post_decode_vad.h" | 43 #include "webrtc/modules/audio_coding/neteq/post_decode_vad.h" |
44 #include "webrtc/modules/audio_coding/neteq/preemptive_expand.h" | 44 #include "webrtc/modules/audio_coding/neteq/preemptive_expand.h" |
45 #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" | 45 #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" |
46 #include "webrtc/modules/audio_coding/neteq/tick_timer.h" | 46 #include "webrtc/modules/audio_coding/neteq/tick_timer.h" |
47 #include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" | 47 #include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" |
48 #include "webrtc/modules/include/module_common_types.h" | 48 #include "webrtc/modules/include/module_common_types.h" |
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
469 void NetEqImpl::PacketBufferStatistics(int* current_num_packets, | 469 void NetEqImpl::PacketBufferStatistics(int* current_num_packets, |
470 int* max_num_packets) const { | 470 int* max_num_packets) const { |
471 rtc::CritScope lock(&crit_sect_); | 471 rtc::CritScope lock(&crit_sect_); |
472 packet_buffer_->BufferStat(current_num_packets, max_num_packets); | 472 packet_buffer_->BufferStat(current_num_packets, max_num_packets); |
473 } | 473 } |
474 | 474 |
475 void NetEqImpl::EnableNack(size_t max_nack_list_size) { | 475 void NetEqImpl::EnableNack(size_t max_nack_list_size) { |
476 rtc::CritScope lock(&crit_sect_); | 476 rtc::CritScope lock(&crit_sect_); |
477 if (!nack_enabled_) { | 477 if (!nack_enabled_) { |
478 const int kNackThresholdPackets = 2; | 478 const int kNackThresholdPackets = 2; |
479 nack_.reset(Nack::Create(kNackThresholdPackets)); | 479 nack_.reset(NackTracker::Create(kNackThresholdPackets)); |
480 nack_enabled_ = true; | 480 nack_enabled_ = true; |
481 nack_->UpdateSampleRate(fs_hz_); | 481 nack_->UpdateSampleRate(fs_hz_); |
482 } | 482 } |
483 nack_->SetMaxNackListSize(max_nack_list_size); | 483 nack_->SetMaxNackListSize(max_nack_list_size); |
484 } | 484 } |
485 | 485 |
486 void NetEqImpl::DisableNack() { | 486 void NetEqImpl::DisableNack() { |
487 rtc::CritScope lock(&crit_sect_); | 487 rtc::CritScope lock(&crit_sect_); |
488 nack_.reset(); | 488 nack_.reset(); |
489 nack_enabled_ = false; | 489 nack_enabled_ = false; |
(...skipping 1677 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2167 } | 2167 } |
2168 } | 2168 } |
2169 | 2169 |
2170 void NetEqImpl::CreateDecisionLogic() { | 2170 void NetEqImpl::CreateDecisionLogic() { |
2171 decision_logic_.reset(DecisionLogic::Create( | 2171 decision_logic_.reset(DecisionLogic::Create( |
2172 fs_hz_, output_size_samples_, playout_mode_, decoder_database_.get(), | 2172 fs_hz_, output_size_samples_, playout_mode_, decoder_database_.get(), |
2173 *packet_buffer_.get(), delay_manager_.get(), buffer_level_filter_.get(), | 2173 *packet_buffer_.get(), delay_manager_.get(), buffer_level_filter_.get(), |
2174 tick_timer_.get())); | 2174 tick_timer_.get())); |
2175 } | 2175 } |
2176 } // namespace webrtc | 2176 } // namespace webrtc |
OLD | NEW |