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

Side by Side Diff: webrtc/modules/audio_coding/main/test/TestAllCodecs.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) 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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 RegisterSendCodec('A', codec_isac, 32000, -1, 960, kVariableSize); 216 RegisterSendCodec('A', codec_isac, 32000, -1, 960, kVariableSize);
217 Run(channel_a_to_b_); 217 Run(channel_a_to_b_);
218 RegisterSendCodec('A', codec_isac, 32000, 56000, 960, kVariableSize); 218 RegisterSendCodec('A', codec_isac, 32000, 56000, 960, kVariableSize);
219 Run(channel_a_to_b_); 219 Run(channel_a_to_b_);
220 RegisterSendCodec('A', codec_isac, 32000, 37000, 960, kVariableSize); 220 RegisterSendCodec('A', codec_isac, 32000, 37000, 960, kVariableSize);
221 Run(channel_a_to_b_); 221 Run(channel_a_to_b_);
222 RegisterSendCodec('A', codec_isac, 32000, 32000, 960, kVariableSize); 222 RegisterSendCodec('A', codec_isac, 32000, 32000, 960, kVariableSize);
223 Run(channel_a_to_b_); 223 Run(channel_a_to_b_);
224 outfile_b_.Close(); 224 outfile_b_.Close();
225 #endif 225 #endif
226 #ifdef WEBRTC_CODEC_PCM16
227 if (test_mode_ != 0) { 226 if (test_mode_ != 0) {
228 printf("===============================================================\n"); 227 printf("===============================================================\n");
229 } 228 }
230 test_count_++; 229 test_count_++;
231 OpenOutFile(test_count_); 230 OpenOutFile(test_count_);
232 char codec_l16[] = "L16"; 231 char codec_l16[] = "L16";
233 RegisterSendCodec('A', codec_l16, 8000, 128000, 80, 0); 232 RegisterSendCodec('A', codec_l16, 8000, 128000, 80, 0);
234 Run(channel_a_to_b_); 233 Run(channel_a_to_b_);
235 RegisterSendCodec('A', codec_l16, 8000, 128000, 160, 0); 234 RegisterSendCodec('A', codec_l16, 8000, 128000, 160, 0);
236 Run(channel_a_to_b_); 235 Run(channel_a_to_b_);
(...skipping 19 matching lines...) Expand all
256 if (test_mode_ != 0) { 255 if (test_mode_ != 0) {
257 printf("===============================================================\n"); 256 printf("===============================================================\n");
258 } 257 }
259 test_count_++; 258 test_count_++;
260 OpenOutFile(test_count_); 259 OpenOutFile(test_count_);
261 RegisterSendCodec('A', codec_l16, 32000, 512000, 320, 0); 260 RegisterSendCodec('A', codec_l16, 32000, 512000, 320, 0);
262 Run(channel_a_to_b_); 261 Run(channel_a_to_b_);
263 RegisterSendCodec('A', codec_l16, 32000, 512000, 640, 0); 262 RegisterSendCodec('A', codec_l16, 32000, 512000, 640, 0);
264 Run(channel_a_to_b_); 263 Run(channel_a_to_b_);
265 outfile_b_.Close(); 264 outfile_b_.Close();
266 #endif
267 if (test_mode_ != 0) { 265 if (test_mode_ != 0) {
268 printf("===============================================================\n"); 266 printf("===============================================================\n");
269 } 267 }
270 test_count_++; 268 test_count_++;
271 OpenOutFile(test_count_); 269 OpenOutFile(test_count_);
272 char codec_pcma[] = "PCMA"; 270 char codec_pcma[] = "PCMA";
273 RegisterSendCodec('A', codec_pcma, 8000, 64000, 80, 0); 271 RegisterSendCodec('A', codec_pcma, 8000, 64000, 80, 0);
274 Run(channel_a_to_b_); 272 Run(channel_a_to_b_);
275 RegisterSendCodec('A', codec_pcma, 8000, 64000, 160, 0); 273 RegisterSendCodec('A', codec_pcma, 8000, 64000, 160, 0);
276 Run(channel_a_to_b_); 274 Run(channel_a_to_b_);
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 #endif 330 #endif
333 #ifndef WEBRTC_CODEC_ILBC 331 #ifndef WEBRTC_CODEC_ILBC
334 printf(" iLBC\n"); 332 printf(" iLBC\n");
335 #endif 333 #endif
336 #ifndef WEBRTC_CODEC_ISAC 334 #ifndef WEBRTC_CODEC_ISAC
337 printf(" ISAC float\n"); 335 printf(" ISAC float\n");
338 #endif 336 #endif
339 #ifndef WEBRTC_CODEC_ISACFX 337 #ifndef WEBRTC_CODEC_ISACFX
340 printf(" ISAC fix\n"); 338 printf(" ISAC fix\n");
341 #endif 339 #endif
342 #ifndef WEBRTC_CODEC_PCM16
343 printf(" PCM16\n");
344 #endif
345 340
346 printf("\nTo complete the test, listen to the %d number of output files.\n", 341 printf("\nTo complete the test, listen to the %d number of output files.\n",
347 test_count_); 342 test_count_);
348 } 343 }
349 } 344 }
350 345
351 // Register Codec to use in the test 346 // Register Codec to use in the test
352 // 347 //
353 // Input: side - which ACM to use, 'A' or 'B' 348 // Input: side - which ACM to use, 'A' or 'B'
354 // codec_name - name to use when register the codec 349 // codec_name - name to use when register the codec
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 477
483 void TestAllCodecs::DisplaySendReceiveCodec() { 478 void TestAllCodecs::DisplaySendReceiveCodec() {
484 CodecInst my_codec_param; 479 CodecInst my_codec_param;
485 acm_a_->SendCodec(&my_codec_param); 480 acm_a_->SendCodec(&my_codec_param);
486 printf("%s -> ", my_codec_param.plname); 481 printf("%s -> ", my_codec_param.plname);
487 acm_b_->ReceiveCodec(&my_codec_param); 482 acm_b_->ReceiveCodec(&my_codec_param);
488 printf("%s\n", my_codec_param.plname); 483 printf("%s\n", my_codec_param.plname);
489 } 484 }
490 485
491 } // namespace webrtc 486 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/main/acm2/codec_owner.cc ('k') | webrtc/modules/audio_coding/main/test/TestRedFec.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698