diff options
Diffstat (limited to 'webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc')
-rw-r--r-- | webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc index 49750c26c8..694b9ed153 100644 --- a/webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc @@ -12,6 +12,7 @@ #include "webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h" #include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/base/format_macros.h" namespace webrtc { namespace test { @@ -21,26 +22,25 @@ NetEqExternalDecoderTest::NetEqExternalDecoderTest(NetEqDecoder codec, : codec_(codec), decoder_(decoder), sample_rate_hz_(CodecSampleRateHz(codec_)), - channels_(static_cast<int>(decoder_->Channels())) { + channels_(decoder_->Channels()) { NetEq::Config config; config.sample_rate_hz = sample_rate_hz_; neteq_.reset(NetEq::Create(config)); - printf("%d\n", channels_); + printf("%" PRIuS "\n", channels_); } void NetEqExternalDecoderTest::Init() { - ASSERT_EQ(NetEq::kOK, neteq_->RegisterExternalDecoder( - decoder_, codec_, kPayloadType, sample_rate_hz_)); + ASSERT_EQ(NetEq::kOK, + neteq_->RegisterExternalDecoder(decoder_, codec_, name_, + kPayloadType, sample_rate_hz_)); } -void NetEqExternalDecoderTest::InsertPacket(WebRtcRTPHeader rtp_header, - const uint8_t* payload, - size_t payload_size_bytes, - uint32_t receive_timestamp) { - ASSERT_EQ( - NetEq::kOK, - neteq_->InsertPacket( - rtp_header, payload, payload_size_bytes, receive_timestamp)); +void NetEqExternalDecoderTest::InsertPacket( + WebRtcRTPHeader rtp_header, + rtc::ArrayView<const uint8_t> payload, + uint32_t receive_timestamp) { + ASSERT_EQ(NetEq::kOK, + neteq_->InsertPacket(rtp_header, payload, receive_timestamp)); } size_t NetEqExternalDecoderTest::GetOutputAudio(size_t max_length, @@ -48,7 +48,7 @@ size_t NetEqExternalDecoderTest::GetOutputAudio(size_t max_length, NetEqOutputType* output_type) { // Get audio from regular instance. size_t samples_per_channel; - int num_channels; + size_t num_channels; EXPECT_EQ(NetEq::kOK, neteq_->GetAudio(max_length, output, @@ -58,6 +58,7 @@ size_t NetEqExternalDecoderTest::GetOutputAudio(size_t max_length, EXPECT_EQ(channels_, num_channels); EXPECT_EQ(static_cast<size_t>(kOutputLengthMs * sample_rate_hz_ / 1000), samples_per_channel); + EXPECT_EQ(sample_rate_hz_, neteq_->last_output_sample_rate_hz()); return samples_per_channel; } |