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

Side by Side Diff: webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory_internal.cc

Issue 2845603002: Normalize codec names to those used by AcmCodecDatabase. (Closed)
Patch Set: Created 3 years, 8 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) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 opus_info.supports_network_adaption = true; 185 opus_info.supports_network_adaption = true;
186 // clang-format off 186 // clang-format off
187 SdpAudioFormat opus_format({"opus", 48000, 2, { 187 SdpAudioFormat opus_format({"opus", 48000, 2, {
188 {"minptime", "10"}, 188 {"minptime", "10"},
189 {"useinbandfec", "1"} 189 {"useinbandfec", "1"}
190 }}); 190 }});
191 // clang-format on 191 // clang-format on
192 specs.push_back({std::move(opus_format), opus_info}); 192 specs.push_back({std::move(opus_format), opus_info});
193 #endif 193 #endif
194 #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)) 194 #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX))
195 specs.push_back(AudioCodecSpec{{"isac", 16000, 1}, 195 specs.push_back(AudioCodecSpec{{"ISAC", 16000, 1},
196 {16000, 1, 32000, 10000, 56000}}); 196 {16000, 1, 32000, 10000, 56000}});
197 #endif 197 #endif
198 #if (defined(WEBRTC_CODEC_ISAC)) 198 #if (defined(WEBRTC_CODEC_ISAC))
199 specs.push_back(AudioCodecSpec{{"isac", 32000, 1}, 199 specs.push_back(AudioCodecSpec{{"ISAC", 32000, 1},
200 {32000, 1, 56000, 10000, 56000}}); 200 {32000, 1, 56000, 10000, 56000}});
201 #endif 201 #endif
202 #ifdef WEBRTC_CODEC_G722 202 #ifdef WEBRTC_CODEC_G722
203 specs.push_back(AudioCodecSpec{{"G722", 8000, 1}, 203 specs.push_back(AudioCodecSpec{{"G722", 8000, 1},
204 {16000, 1, 64000}}); 204 {16000, 1, 64000}});
205 #endif 205 #endif
206 #ifdef WEBRTC_CODEC_ILBC 206 #ifdef WEBRTC_CODEC_ILBC
207 specs.push_back(AudioCodecSpec{{"iLBC", 8000, 1}, 207 specs.push_back(AudioCodecSpec{{"ILBC", 8000, 1},
208 {8000, 1, 13300}}); 208 {8000, 1, 13300}});
209 #endif 209 #endif
210 specs.push_back(AudioCodecSpec{{"PCMU", 8000, 1}, 210 specs.push_back(AudioCodecSpec{{"PCMU", 8000, 1},
211 {8000, 1, 64000}}); 211 {8000, 1, 64000}});
212 specs.push_back(AudioCodecSpec{{"PCMA", 8000, 1}, 212 specs.push_back(AudioCodecSpec{{"PCMA", 8000, 1},
213 {8000, 1, 64000}}); 213 {8000, 1, 64000}});
214 return specs; 214 return specs;
215 }(); 215 }();
216 return specs; 216 return specs;
217 } 217 }
(...skipping 30 matching lines...) Expand all
248 248
249 } // namespace 249 } // namespace
250 250
251 rtc::scoped_refptr<AudioDecoderFactory> 251 rtc::scoped_refptr<AudioDecoderFactory>
252 CreateBuiltinAudioDecoderFactoryInternal() { 252 CreateBuiltinAudioDecoderFactoryInternal() {
253 return rtc::scoped_refptr<AudioDecoderFactory>( 253 return rtc::scoped_refptr<AudioDecoderFactory>(
254 new rtc::RefCountedObject<BuiltinAudioDecoderFactory>); 254 new rtc::RefCountedObject<BuiltinAudioDecoderFactory>);
255 } 255 }
256 256
257 } // namespace webrtc 257 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/media/engine/payload_type_mapper.cc ('k') | webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698