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

Side by Side Diff: webrtc/modules/audio_coding/main/acm2/rent_a_codec.cc

Issue 1438663003: modules/audio_coding: Remove some codec include dirs (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Updated needed after rebase Created 5 years, 1 month 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/main/acm2/rent_a_codec.h" 11 #include "webrtc/modules/audio_coding/main/acm2/rent_a_codec.h"
12 12
13 #include "webrtc/base/logging.h" 13 #include "webrtc/base/logging.h"
14 #include "webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h" 14 #include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h"
15 #ifdef WEBRTC_CODEC_G722 15 #ifdef WEBRTC_CODEC_G722
16 #include "webrtc/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h" 16 #include "webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h"
17 #endif 17 #endif
18 #ifdef WEBRTC_CODEC_ILBC 18 #ifdef WEBRTC_CODEC_ILBC
19 #include "webrtc/modules/audio_coding/codecs/ilbc/include/audio_encoder_ilbc.h" 19 #include "webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h"
20 #endif 20 #endif
21 #ifdef WEBRTC_CODEC_ISACFX 21 #ifdef WEBRTC_CODEC_ISACFX
22 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isac fix.h" 22 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isac fix.h"
23 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isac fix.h" 23 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isac fix.h"
24 #endif 24 #endif
25 #ifdef WEBRTC_CODEC_ISAC 25 #ifdef WEBRTC_CODEC_ISAC
26 #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isa c.h" 26 #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isa c.h"
27 #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isa c.h" 27 #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isa c.h"
28 #endif 28 #endif
29 #ifdef WEBRTC_CODEC_OPUS 29 #ifdef WEBRTC_CODEC_OPUS
30 #include "webrtc/modules/audio_coding/codecs/opus/include/audio_encoder_opus.h" 30 #include "webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h"
31 #endif 31 #endif
32 #include "webrtc/modules/audio_coding/codecs/pcm16b/include/audio_encoder_pcm16b .h" 32 #include "webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h"
33 #include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h" 33 #include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h"
34 #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h" 34 #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h"
35 35
36 namespace webrtc { 36 namespace webrtc {
37 namespace acm2 { 37 namespace acm2 {
38 38
39 rtc::Optional<RentACodec::CodecId> RentACodec::CodecIdByParams( 39 rtc::Optional<RentACodec::CodecId> RentACodec::CodecIdByParams(
40 const char* payload_name, 40 const char* payload_name,
41 int sampling_freq_hz, 41 int sampling_freq_hz,
42 int channels) { 42 int channels) {
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 } 167 }
168 168
169 AudioDecoder* RentACodec::RentIsacDecoder() { 169 AudioDecoder* RentACodec::RentIsacDecoder() {
170 if (!isac_decoder_) 170 if (!isac_decoder_)
171 isac_decoder_ = CreateIsacDecoder(&isac_bandwidth_info_); 171 isac_decoder_ = CreateIsacDecoder(&isac_bandwidth_info_);
172 return isac_decoder_.get(); 172 return isac_decoder_.get();
173 } 173 }
174 174
175 } // namespace acm2 175 } // namespace acm2
176 } // namespace webrtc 176 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698