From ee2bac26dd3eb4463126098f87701ff66098b288 Mon Sep 17 00:00:00 2001 From: kwiberg Date: Wed, 11 Nov 2015 10:34:00 -0800 Subject: AcmReceiver::InsertPacket and NetEq::InsertPacket: Take ArrayView arguments Instead of separate pointer and size arguments. Review URL: https://codereview.webrtc.org/1429943004 Cr-Commit-Position: refs/heads/master@{#10606} --- .../neteq/neteq_external_decoder_unittest.cc | 29 +++++++++------------- 1 file changed, 12 insertions(+), 17 deletions(-) (limited to 'webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc') diff --git a/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc index 09eb5614fe..cf22953962 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc @@ -105,7 +105,8 @@ class NetEqExternalDecoderUnitTest : public test::NetEqExternalDecoderTest { uint32_t time_now = 0; for (int k = 0; k < num_loops; ++k) { while (time_now >= next_arrival_time) { - InsertPacket(rtp_header_, encoded_, payload_size_bytes_, + InsertPacket(rtp_header_, rtc::ArrayView( + encoded_, payload_size_bytes_), next_arrival_time); // Get next input packet. do { @@ -124,17 +125,14 @@ class NetEqExternalDecoderUnitTest : public test::NetEqExternalDecoderTest { } } - void InsertPacket(WebRtcRTPHeader rtp_header, const uint8_t* payload, - size_t payload_size_bytes, + void InsertPacket(WebRtcRTPHeader rtp_header, + rtc::ArrayView payload, uint32_t receive_timestamp) override { - EXPECT_CALL(*external_decoder_, - IncomingPacket(_, - payload_size_bytes, - rtp_header.header.sequenceNumber, - rtp_header.header.timestamp, - receive_timestamp)); + EXPECT_CALL( + *external_decoder_, + IncomingPacket(_, payload.size(), rtp_header.header.sequenceNumber, + rtp_header.header.timestamp, receive_timestamp)); NetEqExternalDecoderTest::InsertPacket(rtp_header, payload, - payload_size_bytes, receive_timestamp); } @@ -210,18 +208,15 @@ class NetEqExternalVsInternalDecoderTest : public NetEqExternalDecoderUnitTest, } } - void InsertPacket(WebRtcRTPHeader rtp_header, const uint8_t* payload, - size_t payload_size_bytes, + void InsertPacket(WebRtcRTPHeader rtp_header, + rtc::ArrayView payload, uint32_t receive_timestamp) override { // Insert packet in internal decoder. - ASSERT_EQ( - NetEq::kOK, - neteq_internal_->InsertPacket( - rtp_header, payload, payload_size_bytes, receive_timestamp)); + ASSERT_EQ(NetEq::kOK, neteq_internal_->InsertPacket(rtp_header, payload, + receive_timestamp)); // Insert packet in external decoder instance. NetEqExternalDecoderUnitTest::InsertPacket(rtp_header, payload, - payload_size_bytes, receive_timestamp); } -- cgit v1.2.3 From d7b7ae8bdaaf51d885bbbcf6d2ccd2da2522ab03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= Date: Tue, 8 Dec 2015 13:41:35 +0100 Subject: Add encode/decode time tracing to audio_coding. Also removes virtual from VideoDecoder::Decode and updated mocks and tests accordingly to use VideoDecoder::DecodeInternal instead. BUG=webrtc:5167 R=henrik.lundin@webrtc.org Review URL: https://codereview.webrtc.org/1512483003 . Cr-Commit-Position: refs/heads/master@{#10935} --- webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc') diff --git a/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc index cf22953962..90f9a10d18 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc @@ -98,8 +98,9 @@ class NetEqExternalDecoderUnitTest : public test::NetEqExternalDecoderTest { next_arrival_time = GetArrivalTime(next_send_time); } while (Lost()); // If lost, immediately read the next packet. - EXPECT_CALL(*external_decoder_, - Decode(_, payload_size_bytes_, 1000 * samples_per_ms_, _, _, _)) + EXPECT_CALL( + *external_decoder_, + DecodeInternal(_, payload_size_bytes_, 1000 * samples_per_ms_, _, _)) .Times(NumExpectedDecodeCalls(num_loops)); uint32_t time_now = 0; -- cgit v1.2.3 From 4cf61dd116288e9f119209c59e07f1d9439d8d05 Mon Sep 17 00:00:00 2001 From: "henrik.lundin" Date: Wed, 9 Dec 2015 06:20:58 -0800 Subject: NetEq: Add codec name and RTP timestamp rate to DecoderInfo The new fields are default-populated for built-in decoders, but for external decoders, the name can now be given when registering the decoder. BUG=webrtc:3520 Review URL: https://codereview.webrtc.org/1484343003 Cr-Commit-Position: refs/heads/master@{#10952} --- .../modules/audio_coding/neteq/neteq_external_decoder_unittest.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc') diff --git a/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc index 90f9a10d18..7bf9499778 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc @@ -180,9 +180,9 @@ class NetEqExternalVsInternalDecoderTest : public NetEqExternalDecoderUnitTest, } void SetUp() override { - ASSERT_EQ(NetEq::kOK, - neteq_internal_->RegisterPayloadType( - NetEqDecoder::kDecoderPCM16Bswb32kHz, kPayloadType)); + ASSERT_EQ(NetEq::kOK, neteq_internal_->RegisterPayloadType( + NetEqDecoder::kDecoderPCM16Bswb32kHz, + "pcm16-swb32", kPayloadType)); } void GetAndVerifyOutput() override { -- cgit v1.2.3 From 6955870806624479723addfae6dcf5d13968796c Mon Sep 17 00:00:00 2001 From: Peter Kasting Date: Tue, 12 Jan 2016 16:26:35 -0800 Subject: Convert channel counts to size_t. IIRC, this was originally requested by ajm during review of the other size_t conversions I did over the past year, and I agreed it made sense, but wanted to do it separately since those changes were already gargantuan. BUG=chromium:81439 TEST=none R=henrik.lundin@webrtc.org, henrika@webrtc.org, kjellander@webrtc.org, minyue@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org Review URL: https://codereview.webrtc.org/1316523002 . Cr-Commit-Position: refs/heads/master@{#11229} --- webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc') diff --git a/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc index 7bf9499778..c03fbb7347 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc @@ -188,7 +188,7 @@ class NetEqExternalVsInternalDecoderTest : public NetEqExternalDecoderUnitTest, void GetAndVerifyOutput() override { NetEqOutputType output_type; size_t samples_per_channel; - int num_channels; + size_t num_channels; // Get audio from internal decoder instance. EXPECT_EQ(NetEq::kOK, neteq_internal_->GetAudio(kMaxBlockSize, @@ -196,7 +196,7 @@ class NetEqExternalVsInternalDecoderTest : public NetEqExternalDecoderUnitTest, &samples_per_channel, &num_channels, &output_type)); - EXPECT_EQ(1, num_channels); + EXPECT_EQ(1u, num_channels); EXPECT_EQ(static_cast(kOutputLengthMs * sample_rate_hz_ / 1000), samples_per_channel); -- cgit v1.2.3