zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert of Parse FlexFEC RTP headers in Call and add integration with BWE. (patchset #17 id:460001 of https://codereview.webrtc.org/2553863003/ )"

Browse Source 
Problem fixed: RTP header extensions were not properly set in tests.

BUG=webrtc:5654

Review-Url: https://codereview.webrtc.org/2593963003
Cr-Commit-Position: refs/heads/master@{#15741}
This commit is contained in:
brandtr
2016-12-21 06:37:18 -08:00
committed by Commit bot
parent 9ba94baa9c
commit b29e652b10
18 changed files with 306 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
webrtc/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc
View File

@ -16,6 +16,7 @@
#include "webrtc/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h"
#include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h"
#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
@ -36,6 +37,12 @@ constexpr size_t kPayloadLength = 500;
constexpr uint32_t kFlexfecSsrc = 42984;
constexpr uint32_t kMediaSsrc = 8353;
RtpPacketReceived ParsePacket(const Packet& packet) {
RtpPacketReceived parsed_packet;
EXPECT_TRUE(parsed_packet.Parse(packet.data, packet.length));
return parsed_packet;
}
} // namespace
class FlexfecReceiverTest : public ::testing::Test {
@ -93,21 +100,8 @@ TEST_F(FlexfecReceiverTest, ReceivesMediaPacket) {
std::unique_ptr<Packet> media_packet(
packet_generator_.NextPacket(0, kPayloadLength));
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(media_packet->data,
media_packet->length));
}
TEST_F(FlexfecReceiverTest, FailsOnTruncatedMediaPacket) {
const size_t kNoPayload = 0;
packet_generator_.NewFrame(1);
std::unique_ptr<Packet> media_packet(
packet_generator_.NextPacket(0, kNoPayload));
// Simulate truncated media packet.
media_packet->length = kRtpHeaderSize - 1;
EXPECT_FALSE(receiver_.AddAndProcessReceivedPacket(media_packet->data,
media_packet->length));
EXPECT_TRUE(
receiver_.AddAndProcessReceivedPacket(ParsePacket(*media_packet)));
}
TEST_F(FlexfecReceiverTest, ReceivesMediaAndFecPackets) {
@ -117,13 +111,12 @@ TEST_F(FlexfecReceiverTest, ReceivesMediaAndFecPackets) {
PacketList media_packets;
PacketizeFrame(kNumMediaPackets, 0, &media_packets);
std::list<Packet*> fec_packets = EncodeFec(media_packets, kNumFecPackets);
auto media_packet = media_packets.front().get();
const auto& media_packet = media_packets.front();
auto fec_packet = packet_generator_.BuildFlexfecPacket(*fec_packets.front());
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(media_packet->data,
media_packet->length));
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(fec_packet->data,
fec_packet->length));
EXPECT_TRUE(
receiver_.AddAndProcessReceivedPacket(ParsePacket(*media_packet)));
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(ParsePacket(*fec_packet)));
}
TEST_F(FlexfecReceiverTest, FailsOnTruncatedFecPacket) {
@ -133,15 +126,14 @@ TEST_F(FlexfecReceiverTest, FailsOnTruncatedFecPacket) {
PacketList media_packets;
PacketizeFrame(kNumMediaPackets, 0, &media_packets);
std::list<Packet*> fec_packets = EncodeFec(media_packets, kNumFecPackets);
auto media_packet = media_packets.front().get();
const auto& media_packet = media_packets.front();
// Simulate truncated FlexFEC payload.
fec_packets.front()->length = 1;
auto fec_packet = packet_generator_.BuildFlexfecPacket(*fec_packets.front());
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(media_packet->data,
media_packet->length));
EXPECT_FALSE(receiver_.AddAndProcessReceivedPacket(fec_packet->data,
fec_packet->length));
EXPECT_TRUE(
receiver_.AddAndProcessReceivedPacket(ParsePacket(*media_packet)));
EXPECT_FALSE(receiver_.AddAndProcessReceivedPacket(ParsePacket(*fec_packet)));
}
TEST_F(FlexfecReceiverTest, FailsOnUnknownMediaSsrc) {
@ -149,15 +141,15 @@ TEST_F(FlexfecReceiverTest, FailsOnUnknownMediaSsrc) {
PacketList media_packets;
PacketizeFrame(kNumMediaPackets, 0, &media_packets);
auto media_packet = media_packets.front().get();
auto& media_packet = media_packets.front();
// Corrupt the SSRC.
media_packet->data[8] = 0;
media_packet->data[9] = 1;
media_packet->data[10] = 2;
media_packet->data[11] = 3;
EXPECT_FALSE(receiver_.AddAndProcessReceivedPacket(media_packet->data,
media_packet->length));
EXPECT_FALSE(
receiver_.AddAndProcessReceivedPacket(ParsePacket(*media_packet)));
}
TEST_F(FlexfecReceiverTest, FailsOnUnknownFecSsrc) {
@ -167,7 +159,7 @@ TEST_F(FlexfecReceiverTest, FailsOnUnknownFecSsrc) {
PacketList media_packets;
PacketizeFrame(kNumMediaPackets, 0, &media_packets);
std::list<Packet*> fec_packets = EncodeFec(media_packets, kNumFecPackets);
auto media_packet = media_packets.front().get();
const auto& media_packet = media_packets.front();
auto fec_packet = packet_generator_.BuildFlexfecPacket(*fec_packets.front());
// Corrupt the SSRC.
fec_packet->data[8] = 4;
@ -175,10 +167,9 @@ TEST_F(FlexfecReceiverTest, FailsOnUnknownFecSsrc) {
fec_packet->data[10] = 6;
fec_packet->data[11] = 7;
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(media_packet->data,
media_packet->length));
EXPECT_FALSE(receiver_.AddAndProcessReceivedPacket(fec_packet->data,
fec_packet->length));
EXPECT_TRUE(
receiver_.AddAndProcessReceivedPacket(ParsePacket(*media_packet)));
EXPECT_FALSE(receiver_.AddAndProcessReceivedPacket(ParsePacket(*fec_packet)));
}
TEST_F(FlexfecReceiverTest, ReceivesMultiplePackets) {
@ -191,8 +182,8 @@ TEST_F(FlexfecReceiverTest, ReceivesMultiplePackets) {
// Receive all media packets.
for (const auto& media_packet : media_packets) {
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(media_packet->data,
media_packet->length));
EXPECT_TRUE(
receiver_.AddAndProcessReceivedPacket(ParsePacket(*media_packet)));
}
// Receive FEC packet.
@ -200,7 +191,7 @@ TEST_F(FlexfecReceiverTest, ReceivesMultiplePackets) {
std::unique_ptr<Packet> packet_with_rtp_header =
packet_generator_.BuildFlexfecPacket(*fec_packet);
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(
packet_with_rtp_header->data, packet_with_rtp_header->length));
ParsePacket(*packet_with_rtp_header)));
}
TEST_F(FlexfecReceiverTest, RecoversFromSingleMediaLoss) {
@ -213,8 +204,7 @@ TEST_F(FlexfecReceiverTest, RecoversFromSingleMediaLoss) {
// Receive first media packet but drop second.
auto media_it = media_packets.begin();
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket((*media_it)->data,
(*media_it)->length));
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(ParsePacket(**media_it)));
// Receive FEC packet and ensure recovery of lost media packet.
auto fec_it = fec_packets.begin();
@ -227,7 +217,7 @@ TEST_F(FlexfecReceiverTest, RecoversFromSingleMediaLoss) {
Args<0, 1>(ElementsAreArray((*media_it)->data, (*media_it)->length)))
.WillOnce(Return(true));
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(
packet_with_rtp_header->data, packet_with_rtp_header->length));
ParsePacket(*packet_with_rtp_header)));
}
TEST_F(FlexfecReceiverTest, RecoversFromDoubleMediaLoss) {
@ -251,7 +241,7 @@ TEST_F(FlexfecReceiverTest, RecoversFromDoubleMediaLoss) {
Args<0, 1>(ElementsAreArray((*media_it)->data, (*media_it)->length)))
.WillOnce(Return(true));
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(
packet_with_rtp_header->data, packet_with_rtp_header->length));
ParsePacket(*packet_with_rtp_header)));
// Receive second FEC packet and recover second lost media packet.
fec_it++;
@ -263,7 +253,7 @@ TEST_F(FlexfecReceiverTest, RecoversFromDoubleMediaLoss) {
Args<0, 1>(ElementsAreArray((*media_it)->data, (*media_it)->length)))
.WillOnce(Return(true));
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(
packet_with_rtp_header->data, packet_with_rtp_header->length));
ParsePacket(*packet_with_rtp_header)));
}
TEST_F(FlexfecReceiverTest, DoesNotRecoverFromMediaAndFecLoss) {
@ -276,8 +266,7 @@ TEST_F(FlexfecReceiverTest, DoesNotRecoverFromMediaAndFecLoss) {
// Receive first media packet.
auto media_it = media_packets.begin();
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket((*media_it)->data,
(*media_it)->length));
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(ParsePacket(**media_it)));
// Drop second media packet and FEC packet. Do not expect call back.
}
@ -292,8 +281,7 @@ TEST_F(FlexfecReceiverTest, DoesNotCallbackTwice) {
// Receive first media packet but drop second.
auto media_it = media_packets.begin();
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket((*media_it)->data,
(*media_it)->length));
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(ParsePacket(**media_it)));
// Receive FEC packet and ensure recovery of lost media packet.
auto fec_it = fec_packets.begin();
@ -306,11 +294,11 @@ TEST_F(FlexfecReceiverTest, DoesNotCallbackTwice) {
Args<0, 1>(ElementsAreArray((*media_it)->data, (*media_it)->length)))
.WillOnce(Return(true));
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(
packet_with_rtp_header->data, packet_with_rtp_header->length));
ParsePacket(*packet_with_rtp_header)));
// Receive FEC packet again.
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(
packet_with_rtp_header->data, packet_with_rtp_header->length));
ParsePacket(*packet_with_rtp_header)));
// Do not call back again.
}
@ -332,8 +320,7 @@ TEST_F(FlexfecReceiverTest, RecoversFrom50PercentLoss) {
// Drop every second media packet.
auto media_it = media_packets.begin();
while (media_it != media_packets.end()) {
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket((*media_it)->data,
(*media_it)->length));
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(ParsePacket(**media_it)));
++media_it;
if (media_it == media_packets.end()) {
break;
@ -356,7 +343,7 @@ TEST_F(FlexfecReceiverTest, RecoversFrom50PercentLoss) {
ElementsAreArray((*media_it)->data, (*media_it)->length)))
.WillOnce(Return(true));
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(
fec_packet_with_rtp_header->data, fec_packet_with_rtp_header->length));
ParsePacket(*fec_packet_with_rtp_header)));
++media_it;
}
}
@ -383,8 +370,7 @@ TEST_F(FlexfecReceiverTest, DelayedFecPacketDoesHelp) {
// Receive all other media packets.
while (media_it != media_packets.end()) {
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket((*media_it)->data,
(*media_it)->length));
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(ParsePacket(**media_it)));
++media_it;
}
@ -399,7 +385,7 @@ TEST_F(FlexfecReceiverTest, DelayedFecPacketDoesHelp) {
Args<0, 1>(ElementsAreArray((*media_it)->data, (*media_it)->length)))
.WillOnce(Return(true));
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(
packet_with_rtp_header->data, packet_with_rtp_header->length));
ParsePacket(*packet_with_rtp_header)));
}
TEST_F(FlexfecReceiverTest, TooDelayedFecPacketDoesNotHelp) {
@ -424,8 +410,7 @@ TEST_F(FlexfecReceiverTest, TooDelayedFecPacketDoesNotHelp) {
// Receive all other media packets.
while (media_it != media_packets.end()) {
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket((*media_it)->data,
(*media_it)->length));
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(ParsePacket(**media_it)));
++media_it;
}
@ -434,7 +419,7 @@ TEST_F(FlexfecReceiverTest, TooDelayedFecPacketDoesNotHelp) {
std::unique_ptr<Packet> packet_with_rtp_header =
packet_generator_.BuildFlexfecPacket(**fec_it);
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(
packet_with_rtp_header->data, packet_with_rtp_header->length));
ParsePacket(*packet_with_rtp_header)));
// Do not expect a call back.
}
@ -455,14 +440,14 @@ TEST_F(FlexfecReceiverTest, RecoversWithMediaPacketsOutOfOrder) {
auto media_packet3 = media_it++;
auto media_packet4 = media_it++;
auto media_packet5 = media_it++;
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket((*media_packet5)->data,
(*media_packet5)->length));
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket((*media_packet2)->data,
(*media_packet2)->length));
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket((*media_packet3)->data,
(*media_packet3)->length));
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket((*media_packet0)->data,
(*media_packet0)->length));
EXPECT_TRUE(
receiver_.AddAndProcessReceivedPacket(ParsePacket(**media_packet5)));
EXPECT_TRUE(
receiver_.AddAndProcessReceivedPacket(ParsePacket(**media_packet2)));
EXPECT_TRUE(
receiver_.AddAndProcessReceivedPacket(ParsePacket(**media_packet3)));
EXPECT_TRUE(
receiver_.AddAndProcessReceivedPacket(ParsePacket(**media_packet0)));
// Expect to recover lost media packets.
EXPECT_CALL(recovered_packet_receiver_,
@ -482,7 +467,7 @@ TEST_F(FlexfecReceiverTest, RecoversWithMediaPacketsOutOfOrder) {
while (fec_it != fec_packets.end()) {
packet_with_rtp_header = packet_generator_.BuildFlexfecPacket(**fec_it);
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(
packet_with_rtp_header->data, packet_with_rtp_header->length));
ParsePacket(*packet_with_rtp_header)));
++fec_it;
}
}
@ -497,8 +482,7 @@ TEST_F(FlexfecReceiverTest, CalculatesNumberOfPackets) {
// Receive first media packet but drop second.
auto media_it = media_packets.begin();
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket((*media_it)->data,
(*media_it)->length));
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(ParsePacket(**media_it)));
// Receive FEC packet and ensure recovery of lost media packet.
auto fec_it = fec_packets.begin();
@ -511,7 +495,7 @@ TEST_F(FlexfecReceiverTest, CalculatesNumberOfPackets) {
Args<0, 1>(ElementsAreArray((*media_it)->data, (*media_it)->length)))
.WillOnce(Return(true));
EXPECT_TRUE(receiver_.AddAndProcessReceivedPacket(
packet_with_rtp_header->data, packet_with_rtp_header->length));
ParsePacket(*packet_with_rtp_header)));
// Check stats calculations.
FecPacketCounter packet_counter = receiver_.GetPacketCounter();