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

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

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)
Patch Set: Created 3 years, 5 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_inter nal.h" 11 #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory_inter nal.h"
12 12
13 #include <memory> 13 #include <memory>
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/base/checks.h"
17 #include "webrtc/base/optional.h"
16 #include "webrtc/common_types.h" 18 #include "webrtc/common_types.h"
17 #include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h" 19 #include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h"
18 #include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h" 20 #include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h"
19 #include "webrtc/rtc_base/checks.h"
20 #include "webrtc/rtc_base/optional.h"
21 #ifdef WEBRTC_CODEC_G722 21 #ifdef WEBRTC_CODEC_G722
22 #include "webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h" 22 #include "webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h"
23 #endif 23 #endif
24 #ifdef WEBRTC_CODEC_ILBC 24 #ifdef WEBRTC_CODEC_ILBC
25 #include "webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h" 25 #include "webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h"
26 #endif 26 #endif
27 #ifdef WEBRTC_CODEC_ISACFX 27 #ifdef WEBRTC_CODEC_ISACFX
28 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isac fix.h" // nogncheck 28 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isac fix.h" // nogncheck
29 #endif 29 #endif
30 #ifdef WEBRTC_CODEC_ISAC 30 #ifdef WEBRTC_CODEC_ISAC
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 248
249 } // namespace 249 } // namespace
250 250
251 rtc::scoped_refptr<AudioDecoderFactory> 251 rtc::scoped_refptr<AudioDecoderFactory>
252 CreateBuiltinAudioDecoderFactoryInternal() { 252 CreateBuiltinAudioDecoderFactoryInternal() {
253 return rtc::scoped_refptr<AudioDecoderFactory>( 253 return rtc::scoped_refptr<AudioDecoderFactory>(
254 new rtc::RefCountedObject<BuiltinAudioDecoderFactory>); 254 new rtc::RefCountedObject<BuiltinAudioDecoderFactory>);
255 } 255 }
256 256
257 } // namespace webrtc 257 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698