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

Side by Side Diff: webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.cc

Issue 2656823005: iSAC: Untangle some cyclic dependencies (Closed)
Patch Set: Created 3 years, 10 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) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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/codecs/builtin_audio_decoder_factory.h" 11 #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
12 12
13 #include <vector> 13 #include <vector>
14 14
15 #include "webrtc/base/checks.h" 15 #include "webrtc/base/checks.h"
16 #include "webrtc/base/optional.h" 16 #include "webrtc/base/optional.h"
17 #include "webrtc/common_types.h" 17 #include "webrtc/common_types.h"
18 #include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h" 18 #include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h"
19 #include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h" 19 #include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h"
20 #ifdef WEBRTC_CODEC_G722 20 #ifdef WEBRTC_CODEC_G722
21 #include "webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h" 21 #include "webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h"
22 #endif 22 #endif
23 #ifdef WEBRTC_CODEC_ILBC 23 #ifdef WEBRTC_CODEC_ILBC
24 #include "webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h" 24 #include "webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h"
25 #endif 25 #endif
26 #ifdef WEBRTC_CODEC_ISACFX 26 #ifdef WEBRTC_CODEC_ISACFX
27 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isac fix.h" 27 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isac fix.h" // nogncheck
kjellander_webrtc 2017/01/26 15:22:00 This is not possible to solve, or you're punting i
kwiberg-webrtc 2017/01/30 09:44:45 This is how the gn docs recommend that you handle
kjellander_webrtc 2017/01/30 10:45:34 I hadn't seen it this before and I didn't know the
28 #endif 28 #endif
29 #ifdef WEBRTC_CODEC_ISAC 29 #ifdef WEBRTC_CODEC_ISAC
30 #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isa c.h" 30 #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isa c.h" // nogncheck
31 #endif 31 #endif
32 #ifdef WEBRTC_CODEC_OPUS 32 #ifdef WEBRTC_CODEC_OPUS
33 #include "webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h" 33 #include "webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h"
34 #endif 34 #endif
35 #include "webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h" 35 #include "webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h"
36 36
37 namespace webrtc { 37 namespace webrtc {
38 38
39 namespace { 39 namespace {
40 40
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 }; 233 };
234 234
235 } // namespace 235 } // namespace
236 236
237 rtc::scoped_refptr<AudioDecoderFactory> CreateBuiltinAudioDecoderFactory() { 237 rtc::scoped_refptr<AudioDecoderFactory> CreateBuiltinAudioDecoderFactory() {
238 return rtc::scoped_refptr<AudioDecoderFactory>( 238 return rtc::scoped_refptr<AudioDecoderFactory>(
239 new rtc::RefCountedObject<BuiltinAudioDecoderFactory>); 239 new rtc::RefCountedObject<BuiltinAudioDecoderFactory>);
240 } 240 }
241 241
242 } // namespace webrtc 242 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/BUILD.gn ('k') | webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698