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

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

Issue 1993783002: Moved CreateBuiltinDecoderFactory out to VoEBaseImpl. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@audio-decoder-factory-injections-2
Patch Set: 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
11 #include "webrtc/modules/audio_coding/neteq/neteq_impl.h" 11 #include "webrtc/modules/audio_coding/neteq/neteq_impl.h"
12 12
13 #include <assert.h> 13 #include <assert.h>
14 #include <memory.h> // memset 14 #include <memory.h> // memset
15 15
16 #include <algorithm> 16 #include <algorithm>
17 #include <vector> 17 #include <vector>
18 18
19 #include "webrtc/base/checks.h" 19 #include "webrtc/base/checks.h"
20 #include "webrtc/base/logging.h" 20 #include "webrtc/base/logging.h"
21 #include "webrtc/base/safe_conversions.h" 21 #include "webrtc/base/safe_conversions.h"
22 #include "webrtc/base/trace_event.h" 22 #include "webrtc/base/trace_event.h"
23 #include "webrtc/common_audio/signal_processing/include/signal_processing_librar y.h" 23 #include "webrtc/common_audio/signal_processing/include/signal_processing_librar y.h"
24 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h" 24 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
25 #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
ossu 2016/05/18 16:12:27 This one should already have been removed in previ
kwiberg-webrtc 2016/05/25 09:19:16 Acknowledged.
26 #include "webrtc/modules/audio_coding/neteq/accelerate.h" 25 #include "webrtc/modules/audio_coding/neteq/accelerate.h"
27 #include "webrtc/modules/audio_coding/neteq/background_noise.h" 26 #include "webrtc/modules/audio_coding/neteq/background_noise.h"
28 #include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" 27 #include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h"
29 #include "webrtc/modules/audio_coding/neteq/comfort_noise.h" 28 #include "webrtc/modules/audio_coding/neteq/comfort_noise.h"
30 #include "webrtc/modules/audio_coding/neteq/decision_logic.h" 29 #include "webrtc/modules/audio_coding/neteq/decision_logic.h"
31 #include "webrtc/modules/audio_coding/neteq/decoder_database.h" 30 #include "webrtc/modules/audio_coding/neteq/decoder_database.h"
32 #include "webrtc/modules/audio_coding/neteq/defines.h" 31 #include "webrtc/modules/audio_coding/neteq/defines.h"
33 #include "webrtc/modules/audio_coding/neteq/delay_manager.h" 32 #include "webrtc/modules/audio_coding/neteq/delay_manager.h"
34 #include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" 33 #include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h"
35 #include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h" 34 #include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h"
(...skipping 2129 matching lines...) Expand 10 before | Expand all | Expand 10 after
2165 } 2164 }
2166 } 2165 }
2167 2166
2168 void NetEqImpl::CreateDecisionLogic() { 2167 void NetEqImpl::CreateDecisionLogic() {
2169 decision_logic_.reset(DecisionLogic::Create( 2168 decision_logic_.reset(DecisionLogic::Create(
2170 fs_hz_, output_size_samples_, playout_mode_, decoder_database_.get(), 2169 fs_hz_, output_size_samples_, playout_mode_, decoder_database_.get(),
2171 *packet_buffer_.get(), delay_manager_.get(), buffer_level_filter_.get(), 2170 *packet_buffer_.get(), delay_manager_.get(), buffer_level_filter_.get(),
2172 tick_timer_.get())); 2171 tick_timer_.get()));
2173 } 2172 }
2174 } // namespace webrtc 2173 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698