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

Side by Side Diff: webrtc/modules/audio_coding/main/acm2/acm_codec_database.h

Issue 1338283002: Remove the preprocessor symbol WEBRTC_CODEC_AVT (it was always defined) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@ifdef
Patch Set: rebase Created 5 years, 3 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #ifdef WEBRTC_CODEC_OPUS 64 #ifdef WEBRTC_CODEC_OPUS
65 // Mono and stereo 65 // Mono and stereo
66 , kOpus 66 , kOpus
67 #endif 67 #endif
68 , kCNNB 68 , kCNNB
69 , kCNWB 69 , kCNWB
70 , kCNSWB 70 , kCNSWB
71 #ifdef ENABLE_48000_HZ 71 #ifdef ENABLE_48000_HZ
72 , kCNFB 72 , kCNFB
73 #endif 73 #endif
74 #ifdef WEBRTC_CODEC_AVT
75 , kAVT 74 , kAVT
76 #endif
77 #ifdef WEBRTC_CODEC_RED 75 #ifdef WEBRTC_CODEC_RED
78 , kRED 76 , kRED
79 #endif 77 #endif
80 , kNumCodecs 78 , kNumCodecs
81 }; 79 };
82 80
83 // Set unsupported codecs to -1 81 // Set unsupported codecs to -1
84 #ifndef WEBRTC_CODEC_ISAC 82 #ifndef WEBRTC_CODEC_ISAC
85 enum {kISACSWB = -1}; 83 enum {kISACSWB = -1};
86 enum {kISACFB = -1}; 84 enum {kISACFB = -1};
87 # ifndef WEBRTC_CODEC_ISACFX 85 # ifndef WEBRTC_CODEC_ISACFX
88 enum {kISAC = -1}; 86 enum {kISAC = -1};
89 # endif 87 # endif
90 #endif 88 #endif
91 // 48 kHz not supported, always set to -1. 89 // 48 kHz not supported, always set to -1.
92 enum {kPCM16Bswb48kHz = -1}; 90 enum {kPCM16Bswb48kHz = -1};
93 #ifndef WEBRTC_CODEC_ILBC 91 #ifndef WEBRTC_CODEC_ILBC
94 enum {kILBC = -1}; 92 enum {kILBC = -1};
95 #endif 93 #endif
96 #ifndef WEBRTC_CODEC_G722 94 #ifndef WEBRTC_CODEC_G722
97 // Mono 95 // Mono
98 enum {kG722 = -1}; 96 enum {kG722 = -1};
99 // Stereo 97 // Stereo
100 enum {kG722_2ch = -1}; 98 enum {kG722_2ch = -1};
101 #endif 99 #endif
102 #ifndef WEBRTC_CODEC_OPUS 100 #ifndef WEBRTC_CODEC_OPUS
103 // Mono and stereo 101 // Mono and stereo
104 enum {kOpus = -1}; 102 enum {kOpus = -1};
105 #endif 103 #endif
106 #ifndef WEBRTC_CODEC_AVT
107 enum {kAVT = -1};
108 #endif
109 #ifndef WEBRTC_CODEC_RED 104 #ifndef WEBRTC_CODEC_RED
110 enum {kRED = -1}; 105 enum {kRED = -1};
111 #endif 106 #endif
112 #ifndef ENABLE_48000_HZ 107 #ifndef ENABLE_48000_HZ
113 enum { kCNFB = -1 }; 108 enum { kCNFB = -1 };
114 #endif 109 #endif
115 110
116 // kMaxNumCodecs - Maximum number of codecs that can be activated in one 111 // kMaxNumCodecs - Maximum number of codecs that can be activated in one
117 // build. 112 // build.
118 // kMaxNumPacketSize - Maximum number of allowed packet sizes for one codec. 113 // kMaxNumPacketSize - Maximum number of allowed packet sizes for one codec.
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 static const CodecInst database_[kMaxNumCodecs]; 224 static const CodecInst database_[kMaxNumCodecs];
230 static const CodecSettings codec_settings_[kMaxNumCodecs]; 225 static const CodecSettings codec_settings_[kMaxNumCodecs];
231 static const NetEqDecoder neteq_decoders_[kMaxNumCodecs]; 226 static const NetEqDecoder neteq_decoders_[kMaxNumCodecs];
232 }; 227 };
233 228
234 } // namespace acm2 229 } // namespace acm2
235 230
236 } // namespace webrtc 231 } // namespace webrtc
237 232
238 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_CODEC_DATABASE_H_ 233 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_CODEC_DATABASE_H_
OLDNEW
« no previous file with comments | « webrtc/engine_configurations.h ('k') | webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698