| OLD | NEW |
| 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 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 445 // is used to avoid problems when switching codec or frame size in the | 445 // is used to avoid problems when switching codec or frame size in the |
| 446 // test. | 446 // test. |
| 447 timestamp_diff = channel->timestamp_diff(); | 447 timestamp_diff = channel->timestamp_diff(); |
| 448 if ((counter > 10) && | 448 if ((counter > 10) && |
| 449 (static_cast<int>(timestamp_diff) != packet_size_samples_) && | 449 (static_cast<int>(timestamp_diff) != packet_size_samples_) && |
| 450 (packet_size_samples_ > -1)) | 450 (packet_size_samples_ > -1)) |
| 451 error_count++; | 451 error_count++; |
| 452 } | 452 } |
| 453 | 453 |
| 454 // Run received side of ACM. | 454 // Run received side of ACM. |
| 455 CHECK_ERROR(acm_b_->PlayoutData10Ms(out_freq_hz, &audio_frame)); | 455 bool muted; |
| 456 CHECK_ERROR(acm_b_->PlayoutData10Ms(out_freq_hz, &audio_frame, &muted)); |
| 457 ASSERT_FALSE(muted); |
| 456 | 458 |
| 457 // Write output speech to file. | 459 // Write output speech to file. |
| 458 outfile_b_.Write10MsData(audio_frame.data_, | 460 outfile_b_.Write10MsData(audio_frame.data_, |
| 459 audio_frame.samples_per_channel_); | 461 audio_frame.samples_per_channel_); |
| 460 | 462 |
| 461 // Update loop counter | 463 // Update loop counter |
| 462 counter++; | 464 counter++; |
| 463 } | 465 } |
| 464 | 466 |
| 465 EXPECT_EQ(0, error_count); | 467 EXPECT_EQ(0, error_count); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 480 } | 482 } |
| 481 | 483 |
| 482 void TestAllCodecs::DisplaySendReceiveCodec() { | 484 void TestAllCodecs::DisplaySendReceiveCodec() { |
| 483 CodecInst my_codec_param; | 485 CodecInst my_codec_param; |
| 484 printf("%s -> ", acm_a_->SendCodec()->plname); | 486 printf("%s -> ", acm_a_->SendCodec()->plname); |
| 485 acm_b_->ReceiveCodec(&my_codec_param); | 487 acm_b_->ReceiveCodec(&my_codec_param); |
| 486 printf("%s\n", my_codec_param.plname); | 488 printf("%s\n", my_codec_param.plname); |
| 487 } | 489 } |
| 488 | 490 |
| 489 } // namespace webrtc | 491 } // namespace webrtc |
| OLD | NEW |