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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc

Issue 1404463003: Delete iSAC-fb from NetEq (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@remove-isac-fb
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 | « webrtc/modules/audio_coding/neteq/audio_decoder_impl.h ('k') | webrtc/modules/audio_coding/neteq/audio_decoder_unittest.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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 case kDecoderPCMu_2ch: 80 case kDecoderPCMu_2ch:
81 case kDecoderPCMa_2ch: 81 case kDecoderPCMa_2ch:
82 #ifdef WEBRTC_CODEC_ILBC 82 #ifdef WEBRTC_CODEC_ILBC
83 case kDecoderILBC: 83 case kDecoderILBC:
84 #endif 84 #endif
85 #if defined(WEBRTC_CODEC_ISACFX) || defined(WEBRTC_CODEC_ISAC) 85 #if defined(WEBRTC_CODEC_ISACFX) || defined(WEBRTC_CODEC_ISAC)
86 case kDecoderISAC: 86 case kDecoderISAC:
87 #endif 87 #endif
88 #ifdef WEBRTC_CODEC_ISAC 88 #ifdef WEBRTC_CODEC_ISAC
89 case kDecoderISACswb: 89 case kDecoderISACswb:
90 case kDecoderISACfb:
91 #endif 90 #endif
92 case kDecoderPCM16B: 91 case kDecoderPCM16B:
93 case kDecoderPCM16Bwb: 92 case kDecoderPCM16Bwb:
94 case kDecoderPCM16Bswb32kHz: 93 case kDecoderPCM16Bswb32kHz:
95 case kDecoderPCM16Bswb48kHz: 94 case kDecoderPCM16Bswb48kHz:
96 case kDecoderPCM16B_2ch: 95 case kDecoderPCM16B_2ch:
97 case kDecoderPCM16Bwb_2ch: 96 case kDecoderPCM16Bwb_2ch:
98 case kDecoderPCM16Bswb32kHz_2ch: 97 case kDecoderPCM16Bswb32kHz_2ch:
99 case kDecoderPCM16Bswb48kHz_2ch: 98 case kDecoderPCM16Bswb48kHz_2ch:
100 case kDecoderPCM16B_5ch: 99 case kDecoderPCM16B_5ch:
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 case kDecoderPCM16Bwb_2ch: 142 case kDecoderPCM16Bwb_2ch:
144 #ifdef WEBRTC_CODEC_G722 143 #ifdef WEBRTC_CODEC_G722
145 case kDecoderG722: 144 case kDecoderG722:
146 case kDecoderG722_2ch: 145 case kDecoderG722_2ch:
147 #endif 146 #endif
148 case kDecoderCNGwb: { 147 case kDecoderCNGwb: {
149 return 16000; 148 return 16000;
150 } 149 }
151 #ifdef WEBRTC_CODEC_ISAC 150 #ifdef WEBRTC_CODEC_ISAC
152 case kDecoderISACswb: 151 case kDecoderISACswb:
153 case kDecoderISACfb:
154 #endif 152 #endif
155 case kDecoderPCM16Bswb32kHz: 153 case kDecoderPCM16Bswb32kHz:
156 case kDecoderPCM16Bswb32kHz_2ch: 154 case kDecoderPCM16Bswb32kHz_2ch:
157 case kDecoderCNGswb32kHz: { 155 case kDecoderCNGswb32kHz: {
158 return 32000; 156 return 32000;
159 } 157 }
160 case kDecoderPCM16Bswb48kHz: 158 case kDecoderPCM16Bswb48kHz:
161 case kDecoderPCM16Bswb48kHz_2ch: { 159 case kDecoderPCM16Bswb48kHz_2ch: {
162 return 48000; 160 return 48000;
163 } 161 }
(...skipping 29 matching lines...) Expand all
193 #ifdef WEBRTC_CODEC_ILBC 191 #ifdef WEBRTC_CODEC_ILBC
194 case kDecoderILBC: 192 case kDecoderILBC:
195 return new AudioDecoderIlbc; 193 return new AudioDecoderIlbc;
196 #endif 194 #endif
197 #if defined(WEBRTC_CODEC_ISACFX) 195 #if defined(WEBRTC_CODEC_ISACFX)
198 case kDecoderISAC: 196 case kDecoderISAC:
199 return new AudioDecoderIsacFix(); 197 return new AudioDecoderIsacFix();
200 #elif defined(WEBRTC_CODEC_ISAC) 198 #elif defined(WEBRTC_CODEC_ISAC)
201 case kDecoderISAC: 199 case kDecoderISAC:
202 case kDecoderISACswb: 200 case kDecoderISACswb:
203 case kDecoderISACfb:
204 return new AudioDecoderIsac(); 201 return new AudioDecoderIsac();
205 #endif 202 #endif
206 case kDecoderPCM16B: 203 case kDecoderPCM16B:
207 case kDecoderPCM16Bwb: 204 case kDecoderPCM16Bwb:
208 case kDecoderPCM16Bswb32kHz: 205 case kDecoderPCM16Bswb32kHz:
209 case kDecoderPCM16Bswb48kHz: 206 case kDecoderPCM16Bswb48kHz:
210 return new AudioDecoderPcm16B(1); 207 return new AudioDecoderPcm16B(1);
211 case kDecoderPCM16B_2ch: 208 case kDecoderPCM16B_2ch:
212 case kDecoderPCM16Bwb_2ch: 209 case kDecoderPCM16Bwb_2ch:
213 case kDecoderPCM16Bswb32kHz_2ch: 210 case kDecoderPCM16Bswb32kHz_2ch:
(...skipping 21 matching lines...) Expand all
235 case kDecoderRED: 232 case kDecoderRED:
236 case kDecoderAVT: 233 case kDecoderAVT:
237 case kDecoderArbitrary: 234 case kDecoderArbitrary:
238 default: { 235 default: {
239 return NULL; 236 return NULL;
240 } 237 }
241 } 238 }
242 } 239 }
243 240
244 } // namespace webrtc 241 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/audio_decoder_impl.h ('k') | webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698