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

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

Issue 1336923002: Remove the preprocessor symbol WEBRTC_CODEC_PCM16 (it was always defined) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 115
116 bool IsPcmU(const CodecInst& codec) { 116 bool IsPcmU(const CodecInst& codec) {
117 return !STR_CASE_CMP(codec.plname, "pcmu"); 117 return !STR_CASE_CMP(codec.plname, "pcmu");
118 } 118 }
119 119
120 bool IsPcmA(const CodecInst& codec) { 120 bool IsPcmA(const CodecInst& codec) {
121 return !STR_CASE_CMP(codec.plname, "pcma"); 121 return !STR_CASE_CMP(codec.plname, "pcma");
122 } 122 }
123 123
124 bool IsPcm16B(const CodecInst& codec) { 124 bool IsPcm16B(const CodecInst& codec) {
125 return 125 return !STR_CASE_CMP(codec.plname, "l16");
126 #ifdef WEBRTC_CODEC_PCM16
127 !STR_CASE_CMP(codec.plname, "l16") ||
128 #endif
129 false;
130 } 126 }
131 127
132 bool IsIlbc(const CodecInst& codec) { 128 bool IsIlbc(const CodecInst& codec) {
133 return 129 return
134 #ifdef WEBRTC_CODEC_ILBC 130 #ifdef WEBRTC_CODEC_ILBC
135 !STR_CASE_CMP(codec.plname, "ilbc") || 131 !STR_CASE_CMP(codec.plname, "ilbc") ||
136 #endif 132 #endif
137 false; 133 false;
138 } 134 }
139 135
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 case 48000: 462 case 48000:
467 return -1; 463 return -1;
468 default: 464 default:
469 FATAL() << sample_rate_hz << " Hz is not supported"; 465 FATAL() << sample_rate_hz << " Hz is not supported";
470 return -1; 466 return -1;
471 } 467 }
472 } 468 }
473 469
474 } // namespace acm2 470 } // namespace acm2
475 } // namespace webrtc 471 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698