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

Side by Side Diff: webrtc/modules/audio_coding/acm2/rent_a_codec.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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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/acm2/rent_a_codec.h" 11 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
12 12
13 #include <memory> 13 #include <memory>
14 #include <utility> 14 #include <utility>
15 15
16 #include "webrtc/base/logging.h"
16 #include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h" 17 #include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h"
17 #include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h" 18 #include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h"
18 #include "webrtc/rtc_base/logging.h"
19 #ifdef WEBRTC_CODEC_G722 19 #ifdef WEBRTC_CODEC_G722
20 #include "webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h" 20 #include "webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h"
21 #endif 21 #endif
22 #ifdef WEBRTC_CODEC_ILBC 22 #ifdef WEBRTC_CODEC_ILBC
23 #include "webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h" 23 #include "webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h"
24 #endif 24 #endif
25 #ifdef WEBRTC_CODEC_ISACFX 25 #ifdef WEBRTC_CODEC_ISACFX
26 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isac fix.h" // nogncheck 26 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isac fix.h" // nogncheck
27 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isac fix.h" // nogncheck 27 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isac fix.h" // nogncheck
28 #endif 28 #endif
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 } 305 }
306 return encoder_stack; 306 return encoder_stack;
307 } 307 }
308 308
309 std::unique_ptr<AudioDecoder> RentACodec::RentIsacDecoder(int sample_rate_hz) { 309 std::unique_ptr<AudioDecoder> RentACodec::RentIsacDecoder(int sample_rate_hz) {
310 return CreateIsacDecoder(sample_rate_hz, isac_bandwidth_info_); 310 return CreateIsacDecoder(sample_rate_hz, isac_bandwidth_info_);
311 } 311 }
312 312
313 } // namespace acm2 313 } // namespace acm2
314 } // namespace webrtc 314 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/acm2/rent_a_codec.h ('k') | webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698