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

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

Issue 1404623002: Delete iSAC-fb from AudioCodingModule (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 | webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc » ('j') | 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) 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 17 matching lines...) Expand all
28 class ACMCodecDB { 28 class ACMCodecDB {
29 public: 29 public:
30 // Enum with array indexes for the supported codecs. NOTE! The order MUST 30 // Enum with array indexes for the supported codecs. NOTE! The order MUST
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
39 # endif 38 # endif
40 #endif 39 #endif
41 // Mono 40 // Mono
42 , kPCM16B 41 , kPCM16B
43 , kPCM16Bwb 42 , kPCM16Bwb
44 , kPCM16Bswb32kHz 43 , kPCM16Bswb32kHz
45 // Stereo 44 // Stereo
46 , kPCM16B_2ch 45 , kPCM16B_2ch
47 , kPCM16Bwb_2ch 46 , kPCM16Bwb_2ch
48 , kPCM16Bswb32kHz_2ch 47 , kPCM16Bswb32kHz_2ch
(...skipping 25 matching lines...) Expand all
74 , kAVT 73 , kAVT
75 #ifdef WEBRTC_CODEC_RED 74 #ifdef WEBRTC_CODEC_RED
76 , kRED 75 , kRED
77 #endif 76 #endif
78 , kNumCodecs 77 , kNumCodecs
79 }; 78 };
80 79
81 // Set unsupported codecs to -1 80 // Set unsupported codecs to -1
82 #ifndef WEBRTC_CODEC_ISAC 81 #ifndef WEBRTC_CODEC_ISAC
83 enum {kISACSWB = -1}; 82 enum {kISACSWB = -1};
84 enum {kISACFB = -1};
85 # ifndef WEBRTC_CODEC_ISACFX 83 # ifndef WEBRTC_CODEC_ISACFX
86 enum {kISAC = -1}; 84 enum {kISAC = -1};
87 # endif 85 # endif
88 #endif 86 #endif
89 // 48 kHz not supported, always set to -1. 87 // 48 kHz not supported, always set to -1.
90 enum {kPCM16Bswb48kHz = -1}; 88 enum {kPCM16Bswb48kHz = -1};
91 #ifndef WEBRTC_CODEC_ILBC 89 #ifndef WEBRTC_CODEC_ILBC
92 enum {kILBC = -1}; 90 enum {kILBC = -1};
93 #endif 91 #endif
94 #ifndef WEBRTC_CODEC_G722 92 #ifndef WEBRTC_CODEC_G722
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 static const CodecInst database_[kMaxNumCodecs]; 180 static const CodecInst database_[kMaxNumCodecs];
183 static const CodecSettings codec_settings_[kMaxNumCodecs]; 181 static const CodecSettings codec_settings_[kMaxNumCodecs];
184 static const NetEqDecoder neteq_decoders_[kMaxNumCodecs]; 182 static const NetEqDecoder neteq_decoders_[kMaxNumCodecs];
185 }; 183 };
186 184
187 } // namespace acm2 185 } // namespace acm2
188 186
189 } // namespace webrtc 187 } // namespace webrtc
190 188
191 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_CODEC_DATABASE_H_ 189 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_CODEC_DATABASE_H_
OLDNEW
« no previous file with comments | « no previous file | 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