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

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

Issue 1992763002: Moved injection of AudioDecoderFactory into voe::Channel. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@audio-decoder-factory-injections-1
Patch Set: Addressed nit. Created 4 years, 7 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 const rtc::scoped_refptr<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 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 AudioFrame::kVadPassive; 412 AudioFrame::kVadPassive;
411 std::unique_ptr<TickTimer::Stopwatch> generated_noise_stopwatch_ 413 std::unique_ptr<TickTimer::Stopwatch> generated_noise_stopwatch_
412 GUARDED_BY(crit_sect_); 414 GUARDED_BY(crit_sect_);
413 415
414 private: 416 private:
415 RTC_DISALLOW_COPY_AND_ASSIGN(NetEqImpl); 417 RTC_DISALLOW_COPY_AND_ASSIGN(NetEqImpl);
416 }; 418 };
417 419
418 } // namespace webrtc 420 } // namespace webrtc
419 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ 421 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc ('k') | webrtc/modules/audio_coding/neteq/neteq_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698