| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 |
| 11 #include "webrtc/modules/audio_coding/neteq/decision_logic.h" | 11 #include "webrtc/modules/audio_coding/neteq/decision_logic.h" |
| 12 | 12 |
| 13 #include <algorithm> | 13 #include <algorithm> |
| 14 | 14 |
| 15 #include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" | 15 #include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" |
| 16 #include "webrtc/modules/audio_coding/neteq/decision_logic_fax.h" | 16 #include "webrtc/modules/audio_coding/neteq/decision_logic_fax.h" |
| 17 #include "webrtc/modules/audio_coding/neteq/decision_logic_normal.h" | 17 #include "webrtc/modules/audio_coding/neteq/decision_logic_normal.h" |
| 18 #include "webrtc/modules/audio_coding/neteq/delay_manager.h" | 18 #include "webrtc/modules/audio_coding/neteq/delay_manager.h" |
| 19 #include "webrtc/modules/audio_coding/neteq/expand.h" | 19 #include "webrtc/modules/audio_coding/neteq/expand.h" |
| 20 #include "webrtc/modules/audio_coding/neteq/packet_buffer.h" | 20 #include "webrtc/modules/audio_coding/neteq/packet_buffer.h" |
| 21 #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" | 21 #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" |
| 22 #include "webrtc/system_wrappers/include/logging.h" | |
| 23 | 22 |
| 24 namespace webrtc { | 23 namespace webrtc { |
| 25 | 24 |
| 26 DecisionLogic* DecisionLogic::Create(int fs_hz, | 25 DecisionLogic* DecisionLogic::Create(int fs_hz, |
| 27 size_t output_size_samples, | 26 size_t output_size_samples, |
| 28 NetEqPlayoutMode playout_mode, | 27 NetEqPlayoutMode playout_mode, |
| 29 DecoderDatabase* decoder_database, | 28 DecoderDatabase* decoder_database, |
| 30 const PacketBuffer& packet_buffer, | 29 const PacketBuffer& packet_buffer, |
| 31 DelayManager* delay_manager, | 30 DelayManager* delay_manager, |
| 32 BufferLevelFilter* buffer_level_filter, | 31 BufferLevelFilter* buffer_level_filter, |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 timescale_countdown_ = | 161 timescale_countdown_ = |
| 163 tick_timer_->GetNewCountdown(kMinTimescaleInterval); | 162 tick_timer_->GetNewCountdown(kMinTimescaleInterval); |
| 164 } | 163 } |
| 165 buffer_level_filter_->Update(buffer_size_packets, sample_memory_local, | 164 buffer_level_filter_->Update(buffer_size_packets, sample_memory_local, |
| 166 packet_length_samples_); | 165 packet_length_samples_); |
| 167 prev_time_scale_ = false; | 166 prev_time_scale_ = false; |
| 168 } | 167 } |
| 169 } | 168 } |
| 170 | 169 |
| 171 } // namespace webrtc | 170 } // namespace webrtc |
| OLD | NEW |