OLD | NEW |
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 25 matching lines...) Expand all Loading... |
36 } | 36 } |
37 | 37 |
38 void NetEqExternalDecoderTest::InsertPacket( | 38 void NetEqExternalDecoderTest::InsertPacket( |
39 WebRtcRTPHeader rtp_header, | 39 WebRtcRTPHeader rtp_header, |
40 rtc::ArrayView<const uint8_t> payload, | 40 rtc::ArrayView<const uint8_t> payload, |
41 uint32_t receive_timestamp) { | 41 uint32_t receive_timestamp) { |
42 ASSERT_EQ(NetEq::kOK, | 42 ASSERT_EQ(NetEq::kOK, |
43 neteq_->InsertPacket(rtp_header, payload, receive_timestamp)); | 43 neteq_->InsertPacket(rtp_header, payload, receive_timestamp)); |
44 } | 44 } |
45 | 45 |
46 size_t NetEqExternalDecoderTest::GetOutputAudio(size_t max_length, | 46 void NetEqExternalDecoderTest::GetOutputAudio(AudioFrame* output, |
47 int16_t* output, | 47 NetEqOutputType* output_type) { |
48 NetEqOutputType* output_type) { | |
49 // Get audio from regular instance. | 48 // Get audio from regular instance. |
50 size_t samples_per_channel; | 49 EXPECT_EQ(NetEq::kOK, neteq_->GetAudio(output, output_type)); |
51 size_t num_channels; | 50 EXPECT_EQ(channels_, output->num_channels_); |
52 EXPECT_EQ(NetEq::kOK, | |
53 neteq_->GetAudio(max_length, | |
54 output, | |
55 &samples_per_channel, | |
56 &num_channels, | |
57 output_type)); | |
58 EXPECT_EQ(channels_, num_channels); | |
59 EXPECT_EQ(static_cast<size_t>(kOutputLengthMs * sample_rate_hz_ / 1000), | 51 EXPECT_EQ(static_cast<size_t>(kOutputLengthMs * sample_rate_hz_ / 1000), |
60 samples_per_channel); | 52 output->samples_per_channel_); |
61 EXPECT_EQ(sample_rate_hz_, neteq_->last_output_sample_rate_hz()); | 53 EXPECT_EQ(sample_rate_hz_, neteq_->last_output_sample_rate_hz()); |
62 return samples_per_channel; | |
63 } | 54 } |
64 | 55 |
65 } // namespace test | 56 } // namespace test |
66 } // namespace webrtc | 57 } // namespace webrtc |
OLD | NEW |