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

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

Issue 1338283002: Remove the preprocessor symbol WEBRTC_CODEC_AVT (it was always defined) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@ifdef
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 1112 matching lines...) Expand 10 before | Expand all | Expand 10 after
1123 case acm2::ACMCodecDB::kCNSWB: 1123 case acm2::ACMCodecDB::kCNSWB:
1124 *codec_name = "CN"; 1124 *codec_name = "CN";
1125 *sample_rate_hz = 32000; 1125 *sample_rate_hz = 32000;
1126 *channels = 1; 1126 *channels = 1;
1127 break; 1127 break;
1128 case acm2::ACMCodecDB::kRED: 1128 case acm2::ACMCodecDB::kRED:
1129 *codec_name = "red"; 1129 *codec_name = "red";
1130 *sample_rate_hz = 8000; 1130 *sample_rate_hz = 8000;
1131 *channels = 1; 1131 *channels = 1;
1132 break; 1132 break;
1133 #ifdef WEBRTC_CODEC_AVT
1134 case acm2::ACMCodecDB::kAVT: 1133 case acm2::ACMCodecDB::kAVT:
1135 *codec_name = "telephone-event"; 1134 *codec_name = "telephone-event";
1136 *sample_rate_hz = 8000; 1135 *sample_rate_hz = 8000;
1137 *channels = 1; 1136 *channels = 1;
1138 break; 1137 break;
1139 #endif
1140 default: 1138 default:
1141 FATAL() << "Codec type " << codec_type << " not supported."; 1139 FATAL() << "Codec type " << codec_type << " not supported.";
1142 } 1140 }
1143 return true; 1141 return true;
1144 } 1142 }
1145 1143
1146 } // namespace webrtc 1144 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc ('k') | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698