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

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

Issue 1368083002: Revert of CodecOwner: Don't look at definitions for classes we don't link with (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/codec_owner.h" 11 #include "webrtc/modules/audio_coding/main/acm2/codec_owner.h"
12 12
13 #include "webrtc/base/checks.h" 13 #include "webrtc/base/checks.h"
14 #include "webrtc/engine_configurations.h" 14 #include "webrtc/engine_configurations.h"
15 #include "webrtc/modules/audio_coding/codecs/cng/include/audio_encoder_cng.h" 15 #include "webrtc/modules/audio_coding/codecs/cng/include/audio_encoder_cng.h"
16 #include "webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h" 16 #include "webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h"
17 #ifdef WEBRTC_CODEC_G722
18 #include "webrtc/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h" 17 #include "webrtc/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h"
19 #endif
20 #ifdef WEBRTC_CODEC_ILBC
21 #include "webrtc/modules/audio_coding/codecs/ilbc/interface/audio_encoder_ilbc.h " 18 #include "webrtc/modules/audio_coding/codecs/ilbc/interface/audio_encoder_ilbc.h "
22 #endif
23 #ifdef WEBRTC_CODEC_ISACFX
24 #include "webrtc/modules/audio_coding/codecs/isac/fix/interface/audio_decoder_is acfix.h" 19 #include "webrtc/modules/audio_coding/codecs/isac/fix/interface/audio_decoder_is acfix.h"
25 #include "webrtc/modules/audio_coding/codecs/isac/fix/interface/audio_encoder_is acfix.h" 20 #include "webrtc/modules/audio_coding/codecs/isac/fix/interface/audio_encoder_is acfix.h"
26 #endif
27 #ifdef WEBRTC_CODEC_ISAC
28 #include "webrtc/modules/audio_coding/codecs/isac/main/interface/audio_decoder_i sac.h" 21 #include "webrtc/modules/audio_coding/codecs/isac/main/interface/audio_decoder_i sac.h"
29 #include "webrtc/modules/audio_coding/codecs/isac/main/interface/audio_encoder_i sac.h" 22 #include "webrtc/modules/audio_coding/codecs/isac/main/interface/audio_encoder_i sac.h"
30 #endif
31 #ifdef WEBRTC_CODEC_OPUS
32 #include "webrtc/modules/audio_coding/codecs/opus/interface/audio_encoder_opus.h " 23 #include "webrtc/modules/audio_coding/codecs/opus/interface/audio_encoder_opus.h "
33 #endif
34 #include "webrtc/modules/audio_coding/codecs/pcm16b/include/audio_encoder_pcm16b .h" 24 #include "webrtc/modules/audio_coding/codecs/pcm16b/include/audio_encoder_pcm16b .h"
35 #ifdef WEBRTC_CODEC_RED
36 #include "webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h" 25 #include "webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h"
37 #endif
38 26
39 namespace webrtc { 27 namespace webrtc {
40 namespace acm2 { 28 namespace acm2 {
41 29
42 namespace { 30 namespace {
43 bool IsIsac(const CodecInst& codec) { 31 bool IsIsac(const CodecInst& codec) {
44 return 32 return
45 #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)) 33 #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX))
46 !STR_CASE_CMP(codec.plname, "isac") || 34 !STR_CASE_CMP(codec.plname, "isac") ||
47 #endif 35 #endif
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 } 235 }
248 236
249 const AudioEncoder* CodecOwner::SpeechEncoder() const { 237 const AudioEncoder* CodecOwner::SpeechEncoder() const {
250 RTC_DCHECK(!speech_encoder_ || !external_speech_encoder_); 238 RTC_DCHECK(!speech_encoder_ || !external_speech_encoder_);
251 return external_speech_encoder_ ? external_speech_encoder_ 239 return external_speech_encoder_ ? external_speech_encoder_
252 : speech_encoder_.get(); 240 : speech_encoder_.get();
253 } 241 }
254 242
255 } // namespace acm2 243 } // namespace acm2
256 } // namespace webrtc 244 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698