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

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

Issue 1336923002: Remove the preprocessor symbol WEBRTC_CODEC_PCM16 (it was always defined) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
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 20 matching lines...) Expand all
31 // be the same as when creating the database in acm_codec_database.cc. 31 // be the same as when creating the database in acm_codec_database.cc.
32 enum { 32 enum {
33 kNone = -1 33 kNone = -1
34 #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)) 34 #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX))
35 , kISAC 35 , kISAC
36 # if (defined(WEBRTC_CODEC_ISAC)) 36 # if (defined(WEBRTC_CODEC_ISAC))
37 , kISACSWB 37 , kISACSWB
38 , kISACFB 38 , kISACFB
39 # endif 39 # endif
40 #endif 40 #endif
41 #ifdef WEBRTC_CODEC_PCM16
42 // Mono 41 // Mono
43 , kPCM16B 42 , kPCM16B
44 , kPCM16Bwb 43 , kPCM16Bwb
45 , kPCM16Bswb32kHz 44 , kPCM16Bswb32kHz
46 // Stereo 45 // Stereo
47 , kPCM16B_2ch 46 , kPCM16B_2ch
48 , kPCM16Bwb_2ch 47 , kPCM16Bwb_2ch
49 , kPCM16Bswb32kHz_2ch 48 , kPCM16Bswb32kHz_2ch
50 #endif
51 // Mono 49 // Mono
52 , kPCMU 50 , kPCMU
53 , kPCMA 51 , kPCMA
54 // Stereo 52 // Stereo
55 , kPCMU_2ch 53 , kPCMU_2ch
56 , kPCMA_2ch 54 , kPCMA_2ch
57 #ifdef WEBRTC_CODEC_ILBC 55 #ifdef WEBRTC_CODEC_ILBC
58 , kILBC 56 , kILBC
59 #endif 57 #endif
60 #ifdef WEBRTC_CODEC_G722 58 #ifdef WEBRTC_CODEC_G722
(...skipping 22 matching lines...) Expand all
83 }; 81 };
84 82
85 // Set unsupported codecs to -1 83 // Set unsupported codecs to -1
86 #ifndef WEBRTC_CODEC_ISAC 84 #ifndef WEBRTC_CODEC_ISAC
87 enum {kISACSWB = -1}; 85 enum {kISACSWB = -1};
88 enum {kISACFB = -1}; 86 enum {kISACFB = -1};
89 # ifndef WEBRTC_CODEC_ISACFX 87 # ifndef WEBRTC_CODEC_ISACFX
90 enum {kISAC = -1}; 88 enum {kISAC = -1};
91 # endif 89 # endif
92 #endif 90 #endif
93 #ifndef WEBRTC_CODEC_PCM16
94 // Mono
95 enum {kPCM16B = -1};
96 enum {kPCM16Bwb = -1};
97 enum {kPCM16Bswb32kHz = -1};
98 // Stereo
99 enum {kPCM16B_2ch = -1};
100 enum {kPCM16Bwb_2ch = -1};
101 enum {kPCM16Bswb32kHz_2ch = -1};
102 #endif
103 // 48 kHz not supported, always set to -1. 91 // 48 kHz not supported, always set to -1.
104 enum {kPCM16Bswb48kHz = -1}; 92 enum {kPCM16Bswb48kHz = -1};
105 #ifndef WEBRTC_CODEC_ILBC 93 #ifndef WEBRTC_CODEC_ILBC
106 enum {kILBC = -1}; 94 enum {kILBC = -1};
107 #endif 95 #endif
108 #ifndef WEBRTC_CODEC_G722 96 #ifndef WEBRTC_CODEC_G722
109 // Mono 97 // Mono
110 enum {kG722 = -1}; 98 enum {kG722 = -1};
111 // Stereo 99 // Stereo
112 enum {kG722_2ch = -1}; 100 enum {kG722_2ch = -1};
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 static const CodecInst database_[kMaxNumCodecs]; 229 static const CodecInst database_[kMaxNumCodecs];
242 static const CodecSettings codec_settings_[kMaxNumCodecs]; 230 static const CodecSettings codec_settings_[kMaxNumCodecs];
243 static const NetEqDecoder neteq_decoders_[kMaxNumCodecs]; 231 static const NetEqDecoder neteq_decoders_[kMaxNumCodecs];
244 }; 232 };
245 233
246 } // namespace acm2 234 } // namespace acm2
247 235
248 } // namespace webrtc 236 } // namespace webrtc
249 237
250 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_CODEC_DATABASE_H_ 238 #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