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

Side by Side Diff: webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc

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 | « webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc ('k') | no next file » | 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 990 matching lines...) Expand 10 before | Expand all | Expand 10 after
1001 *sample_rate_hz = 16000; 1001 *sample_rate_hz = 16000;
1002 *channels = 1; 1002 *channels = 1;
1003 break; 1003 break;
1004 #endif 1004 #endif
1005 #ifdef WEBRTC_CODEC_ISAC 1005 #ifdef WEBRTC_CODEC_ISAC
1006 case acm2::ACMCodecDB::kISACSWB: 1006 case acm2::ACMCodecDB::kISACSWB:
1007 *codec_name = "ISAC"; 1007 *codec_name = "ISAC";
1008 *sample_rate_hz = 32000; 1008 *sample_rate_hz = 32000;
1009 *channels = 1; 1009 *channels = 1;
1010 break; 1010 break;
1011 case acm2::ACMCodecDB::kISACFB:
1012 *codec_name = "ISAC";
1013 *sample_rate_hz = 48000;
1014 *channels = 1;
1015 break;
1016 #endif 1011 #endif
1017 #ifdef WEBRTC_CODEC_ILBC 1012 #ifdef WEBRTC_CODEC_ILBC
1018 case acm2::ACMCodecDB::kILBC: 1013 case acm2::ACMCodecDB::kILBC:
1019 *codec_name = "ILBC"; 1014 *codec_name = "ILBC";
1020 *sample_rate_hz = 8000; 1015 *sample_rate_hz = 8000;
1021 *channels = 1; 1016 *channels = 1;
1022 break; 1017 break;
1023 #endif 1018 #endif
1024 case acm2::ACMCodecDB::kPCMA: 1019 case acm2::ACMCodecDB::kPCMA:
1025 *codec_name = "PCMA"; 1020 *codec_name = "PCMA";
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
1085 *sample_rate_hz = 8000; 1080 *sample_rate_hz = 8000;
1086 *channels = 1; 1081 *channels = 1;
1087 break; 1082 break;
1088 default: 1083 default:
1089 FATAL() << "Codec type " << codec_type << " not supported."; 1084 FATAL() << "Codec type " << codec_type << " not supported.";
1090 } 1085 }
1091 return true; 1086 return true;
1092 } 1087 }
1093 1088
1094 } // namespace webrtc 1089 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698