| 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 kPLCCNG, | 65 kPLCCNG, |
| 66 kVadPassive | 66 kVadPassive |
| 67 }; | 67 }; |
| 68 | 68 |
| 69 struct Dependencies { | 69 struct Dependencies { |
| 70 // The constructor populates the Dependencies struct with the default | 70 // The constructor populates the Dependencies struct with the default |
| 71 // implementations of the objects. They can all be replaced by the user | 71 // implementations of the objects. They can all be replaced by the user |
| 72 // before sending the struct to the NetEqImpl constructor. However, there | 72 // before sending the struct to the NetEqImpl constructor. However, there |
| 73 // are dependencies between some of the classes inside the struct, so | 73 // are dependencies between some of the classes inside the struct, so |
| 74 // swapping out one may make it necessary to re-create another one. | 74 // swapping out one may make it necessary to re-create another one. |
| 75 explicit Dependencies(const NetEq::Config& config); | 75 explicit Dependencies( |
| 76 const NetEq::Config& config, |
| 77 std::shared_ptr<AudioDecoderFactory> decoder_factory); |
| 76 ~Dependencies(); | 78 ~Dependencies(); |
| 77 | 79 |
| 78 std::unique_ptr<TickTimer> tick_timer; | 80 std::unique_ptr<TickTimer> tick_timer; |
| 79 std::unique_ptr<BufferLevelFilter> buffer_level_filter; | 81 std::unique_ptr<BufferLevelFilter> buffer_level_filter; |
| 80 std::unique_ptr<DecoderDatabase> decoder_database; | 82 std::unique_ptr<DecoderDatabase> decoder_database; |
| 81 std::unique_ptr<DelayPeakDetector> delay_peak_detector; | 83 std::unique_ptr<DelayPeakDetector> delay_peak_detector; |
| 82 std::unique_ptr<DelayManager> delay_manager; | 84 std::unique_ptr<DelayManager> delay_manager; |
| 83 std::unique_ptr<DtmfBuffer> dtmf_buffer; | 85 std::unique_ptr<DtmfBuffer> dtmf_buffer; |
| 84 std::unique_ptr<DtmfToneGenerator> dtmf_tone_generator; | 86 std::unique_ptr<DtmfToneGenerator> dtmf_tone_generator; |
| 85 std::unique_ptr<PacketBuffer> packet_buffer; | 87 std::unique_ptr<PacketBuffer> packet_buffer; |
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 405 bool nack_enabled_ GUARDED_BY(crit_sect_); | 407 bool nack_enabled_ GUARDED_BY(crit_sect_); |
| 406 AudioFrame::VADActivity last_vad_activity_ GUARDED_BY(crit_sect_) = | 408 AudioFrame::VADActivity last_vad_activity_ GUARDED_BY(crit_sect_) = |
| 407 AudioFrame::kVadPassive; | 409 AudioFrame::kVadPassive; |
| 408 | 410 |
| 409 private: | 411 private: |
| 410 RTC_DISALLOW_COPY_AND_ASSIGN(NetEqImpl); | 412 RTC_DISALLOW_COPY_AND_ASSIGN(NetEqImpl); |
| 411 }; | 413 }; |
| 412 | 414 |
| 413 } // namespace webrtc | 415 } // namespace webrtc |
| 414 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ | 416 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ |
| OLD | NEW |