diff --git a/modules/rtp_rtcp/source/fec_test_helper.cc b/modules/rtp_rtcp/source/fec_test_helper.cc index 1da057ea1c..8823e8b210 100644 --- a/modules/rtp_rtcp/source/fec_test_helper.cc +++ b/modules/rtp_rtcp/source/fec_test_helper.cc @@ -54,6 +54,7 @@ ForwardErrorCorrection::PacketList MediaPacketGenerator::ConstructMediaPackets( std::unique_ptr media_packet( new ForwardErrorCorrection::Packet()); media_packet->length = random_->Rand(min_packet_size_, max_packet_size_); + media_packet->data.SetSize(media_packet->length); // Generate random values for the first 2 bytes media_packet->data[0] = random_->Rand(); @@ -120,16 +121,18 @@ std::unique_ptr AugmentedPacketGenerator::NextPacket( size_t length) { std::unique_ptr packet(new AugmentedPacket()); + packet->data.SetSize(length + kRtpHeaderSize); for (size_t i = 0; i < length; ++i) packet->data[i + kRtpHeaderSize] = offset + i; packet->length = length + kRtpHeaderSize; + packet->data.SetSize(packet->length); packet->header.headerLength = kRtpHeaderSize; packet->header.markerBit = (num_packets_ == 1); packet->header.payloadType = kVp8PayloadType; packet->header.sequenceNumber = seq_num_; packet->header.timestamp = timestamp_; packet->header.ssrc = ssrc_; - WriteRtpHeader(packet->header, packet->data); + WriteRtpHeader(packet->header, packet->data.data()); ++seq_num_; --num_packets_; @@ -167,9 +170,10 @@ std::unique_ptr FlexfecPacketGenerator::BuildFlexfecPacket( std::unique_ptr packet_with_rtp_header( new AugmentedPacket()); - WriteRtpHeader(header, packet_with_rtp_header->data); - memcpy(packet_with_rtp_header->data + kRtpHeaderSize, packet.data, - packet.length); + packet_with_rtp_header->data.SetSize(kRtpHeaderSize + packet.length); + WriteRtpHeader(header, packet_with_rtp_header->data.data()); + memcpy(packet_with_rtp_header->data.data() + kRtpHeaderSize, + packet.data.cdata(), packet.length); packet_with_rtp_header->length = kRtpHeaderSize + packet.length; return packet_with_rtp_header; @@ -185,11 +189,12 @@ std::unique_ptr UlpfecPacketGenerator::BuildMediaRedPacket( const size_t kHeaderLength = packet.header.headerLength; red_packet->header = packet.header; red_packet->length = packet.length + 1; // 1 byte RED header. + red_packet->data.SetSize(packet.length + 1); // Copy RTP header. - memcpy(red_packet->data, packet.data, kHeaderLength); + memcpy(red_packet->data.data(), packet.data.cdata(), kHeaderLength); SetRedHeader(red_packet->data[1] & 0x7f, kHeaderLength, red_packet.get()); - memcpy(red_packet->data + kHeaderLength + 1, packet.data + kHeaderLength, - packet.length - kHeaderLength); + memcpy(red_packet->data.data() + kHeaderLength + 1, + packet.data.cdata() + kHeaderLength, packet.length - kHeaderLength); return red_packet; } @@ -203,8 +208,10 @@ std::unique_ptr UlpfecPacketGenerator::BuildUlpfecRedPacket( red_packet->data[1] &= ~0x80; // Clear marker bit. const size_t kHeaderLength = red_packet->header.headerLength; + red_packet->data.SetSize(kHeaderLength + 1 + packet.length); SetRedHeader(kFecPayloadType, kHeaderLength, red_packet.get()); - memcpy(red_packet->data + kHeaderLength + 1, packet.data, packet.length); + memcpy(red_packet->data.data() + kHeaderLength + 1, packet.data.cdata(), + packet.length); red_packet->length = kHeaderLength + 1 + packet.length; return red_packet; diff --git a/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc b/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc index e3cb0e9e87..04b48cae0f 100644 --- a/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc +++ b/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc @@ -125,7 +125,7 @@ bool FlexfecHeaderReader::ReadFecHeader( RTC_LOG(LS_WARNING) << "Discarding truncated FlexFEC packet."; return false; } - uint8_t* const packet_mask = fec_packet->pkt->data + kPacketMaskOffset; + uint8_t* const packet_mask = fec_packet->pkt->data.data() + kPacketMaskOffset; bool k_bit0 = (packet_mask[0] & 0x80) != 0; uint16_t mask_part0 = ByteReader::ReadBigEndian(&packet_mask[0]); // Shift away K-bit 0, implicitly clearing the last bit. @@ -260,7 +260,8 @@ void FlexfecHeaderWriter::FinalizeFecHeader( // // We treat the mask parts as unsigned integers with host order endianness // in order to simplify the bit shifting between bytes. - uint8_t* const written_packet_mask = fec_packet->data + kPacketMaskOffset; + uint8_t* const written_packet_mask = + fec_packet->data.data() + kPacketMaskOffset; if (packet_mask_size == kUlpfecPacketMaskSizeLBitSet) { // The packet mask is 48 bits long. uint16_t tmp_mask_part0 = diff --git a/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc b/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc index 81d0cb311b..7c1e4dbe47 100644 --- a/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc +++ b/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc @@ -78,6 +78,7 @@ rtc::scoped_refptr WriteHeader(const uint8_t* packet_mask, FlexfecHeaderWriter writer; rtc::scoped_refptr written_packet(new Packet()); written_packet->length = kMediaPacketLength; + written_packet->data.SetSize(kMediaPacketLength); for (size_t i = 0; i < written_packet->length; ++i) { written_packet->data[i] = i; // Actual content doesn't matter. } @@ -91,7 +92,7 @@ std::unique_ptr ReadHeader(const Packet& written_packet) { std::unique_ptr read_packet(new ReceivedFecPacket()); read_packet->ssrc = kFlexfecSsrc; read_packet->pkt = rtc::scoped_refptr(new Packet()); - memcpy(read_packet->pkt->data, written_packet.data, written_packet.length); + read_packet->pkt->data = written_packet.data; read_packet->pkt->length = written_packet.length; EXPECT_TRUE(reader.ReadFecHeader(read_packet.get())); return read_packet; @@ -112,16 +113,17 @@ void VerifyReadHeaders(size_t expected_fec_header_size, EXPECT_EQ(read_packet.pkt->length - expected_fec_header_size, read_packet.protection_length); // Ensure that the K-bits are removed and the packet mask has been packed. - EXPECT_THAT(::testing::make_tuple(read_packet.pkt->data + packet_mask_offset, - read_packet.packet_mask_size), - ::testing::ElementsAreArray(expected_packet_mask, - expected_packet_mask_size)); + EXPECT_THAT( + ::testing::make_tuple(read_packet.pkt->data.cdata() + packet_mask_offset, + read_packet.packet_mask_size), + ::testing::ElementsAreArray(expected_packet_mask, + expected_packet_mask_size)); } void VerifyFinalizedHeaders(const uint8_t* expected_packet_mask, size_t expected_packet_mask_size, const Packet& written_packet) { - const uint8_t* packet = written_packet.data; + const uint8_t* packet = written_packet.data.cdata(); EXPECT_EQ(0x00, packet[0] & 0x80); // F bit clear. EXPECT_EQ(0x00, packet[0] & 0x40); // R bit clear. EXPECT_EQ(0x01, packet[8]); // SSRCCount = 1. @@ -148,17 +150,17 @@ void VerifyWrittenAndReadHeaders(size_t expected_fec_header_size, EXPECT_EQ(written_packet.length - expected_fec_header_size, read_packet.protection_length); // Verify that the call to ReadFecHeader did normalize the packet masks. - EXPECT_THAT( - ::testing::make_tuple(read_packet.pkt->data + kFlexfecPacketMaskOffset, - read_packet.packet_mask_size), - ::testing::ElementsAreArray(expected_packet_mask, - expected_packet_mask_size)); + EXPECT_THAT(::testing::make_tuple( + read_packet.pkt->data.cdata() + kFlexfecPacketMaskOffset, + read_packet.packet_mask_size), + ::testing::ElementsAreArray(expected_packet_mask, + expected_packet_mask_size)); // Verify that the call to ReadFecHeader did not tamper with the payload. EXPECT_THAT(::testing::make_tuple( - read_packet.pkt->data + read_packet.fec_header_size, + read_packet.pkt->data.cdata() + read_packet.fec_header_size, read_packet.pkt->length - read_packet.fec_header_size), ::testing::ElementsAreArray( - written_packet.data + expected_fec_header_size, + written_packet.data.cdata() + expected_fec_header_size, written_packet.length - expected_fec_header_size)); } @@ -182,7 +184,7 @@ TEST(FlexfecHeaderReaderTest, ReadsHeaderWithKBit0Set) { const size_t packet_length = sizeof(kPacketData); ReceivedFecPacket read_packet; read_packet.pkt = rtc::scoped_refptr(new Packet()); - memcpy(read_packet.pkt->data, kPacketData, packet_length); + read_packet.pkt->data.SetData(kPacketData, packet_length); read_packet.pkt->length = packet_length; FlexfecHeaderReader reader; @@ -214,7 +216,7 @@ TEST(FlexfecHeaderReaderTest, ReadsHeaderWithKBit1Set) { const size_t packet_length = sizeof(kPacketData); ReceivedFecPacket read_packet; read_packet.pkt = rtc::scoped_refptr(new Packet()); - memcpy(read_packet.pkt->data, kPacketData, packet_length); + read_packet.pkt->data.SetData(kPacketData, packet_length); read_packet.pkt->length = packet_length; FlexfecHeaderReader reader; @@ -253,7 +255,7 @@ TEST(FlexfecHeaderReaderTest, ReadsHeaderWithKBit2Set) { const size_t packet_length = sizeof(kPacketData); ReceivedFecPacket read_packet; read_packet.pkt = rtc::scoped_refptr(new Packet()); - memcpy(read_packet.pkt->data, kPacketData, packet_length); + read_packet.pkt->data.SetData(kPacketData, packet_length); read_packet.pkt->length = packet_length; FlexfecHeaderReader reader; @@ -273,6 +275,7 @@ TEST(FlexfecHeaderReaderTest, ReadPacketWithoutStreamSpecificHeaderShouldFail) { read_packet.ssrc = kFlexfecSsrc; read_packet.pkt = std::move(written_packet); read_packet.pkt->length = 12; + read_packet.pkt->data.SetSize(read_packet.pkt->length); FlexfecHeaderReader reader; EXPECT_FALSE(reader.ReadFecHeader(&read_packet)); @@ -288,6 +291,7 @@ TEST(FlexfecHeaderReaderTest, ReadShortPacketWithKBit0SetShouldFail) { read_packet.ssrc = kFlexfecSsrc; read_packet.pkt = std::move(written_packet); read_packet.pkt->length = 18; + read_packet.pkt->data.SetSize(read_packet.pkt->length); FlexfecHeaderReader reader; EXPECT_FALSE(reader.ReadFecHeader(&read_packet)); @@ -304,6 +308,7 @@ TEST(FlexfecHeaderReaderTest, ReadShortPacketWithKBit1SetShouldFail) { read_packet.ssrc = kFlexfecSsrc; read_packet.pkt = std::move(written_packet); read_packet.pkt->length = 20; + read_packet.pkt->data.SetSize(read_packet.pkt->length); FlexfecHeaderReader reader; EXPECT_FALSE(reader.ReadFecHeader(&read_packet)); @@ -320,6 +325,7 @@ TEST(FlexfecHeaderReaderTest, ReadShortPacketWithKBit2SetShouldFail) { read_packet.ssrc = kFlexfecSsrc; read_packet.pkt = std::move(written_packet); read_packet.pkt->length = 24; + read_packet.pkt->data.SetSize(read_packet.pkt->length); FlexfecHeaderReader reader; EXPECT_FALSE(reader.ReadFecHeader(&read_packet)); @@ -331,6 +337,7 @@ TEST(FlexfecHeaderWriterTest, FinalizesHeaderWithKBit0Set) { constexpr uint8_t kUlpfecPacketMask[] = {0x11, 0x02}; Packet written_packet; written_packet.length = kMediaPacketLength; + written_packet.data.SetSize(written_packet.length); for (size_t i = 0; i < written_packet.length; ++i) { written_packet.data[i] = i; } @@ -349,6 +356,7 @@ TEST(FlexfecHeaderWriterTest, FinalizesHeaderWithKBit1Set) { constexpr uint8_t kUlpfecPacketMask[] = {0x91, 0x02, 0x08, 0x44, 0x00, 0x84}; Packet written_packet; written_packet.length = kMediaPacketLength; + written_packet.data.SetSize(written_packet.length); for (size_t i = 0; i < written_packet.length; ++i) { written_packet.data[i] = i; } @@ -371,6 +379,7 @@ TEST(FlexfecHeaderWriterTest, FinalizesHeaderWithKBit2Set) { constexpr uint8_t kUlpfecPacketMask[] = {0x22, 0x22, 0x44, 0x44, 0x44, 0x41}; Packet written_packet; written_packet.length = kMediaPacketLength; + written_packet.data.SetSize(written_packet.length); for (size_t i = 0; i < written_packet.length; ++i) { written_packet.data[i] = i; } diff --git a/modules/rtp_rtcp/source/flexfec_receiver.cc b/modules/rtp_rtcp/source/flexfec_receiver.cc index 4c788f4b22..da7bda16eb 100644 --- a/modules/rtp_rtcp/source/flexfec_receiver.cc +++ b/modules/rtp_rtcp/source/flexfec_receiver.cc @@ -107,12 +107,12 @@ FlexfecReceiver::AddReceivedPacket(const RtpPacketReceived& packet) { ++packet_counter_.num_fec_packets; // Insert packet payload into erasure code. - // TODO(brandtr): Remove this memcpy when the FEC packet classes - // are using COW buffers internally. received_packet->pkt = rtc::scoped_refptr( new ForwardErrorCorrection::Packet()); + // TODO(ilnik): after slice capability is added to COW, use it here instead + // of initializing COW buffer with ArrayView. auto payload = packet.payload(); - memcpy(received_packet->pkt->data, payload.data(), payload.size()); + received_packet->pkt->data.SetData(payload.data(), payload.size()); received_packet->pkt->length = payload.size(); } else { // This is a media packet, or a FlexFEC packet belonging to some @@ -123,11 +123,13 @@ FlexfecReceiver::AddReceivedPacket(const RtpPacketReceived& packet) { received_packet->is_fec = false; // Insert entire packet into erasure code. + // Create a copy and fill with zeros all mutable extensions. received_packet->pkt = rtc::scoped_refptr( new ForwardErrorCorrection::Packet()); - // Create a copy and fill with zeros all mutable extensions. - packet.CopyAndZeroMutableExtensions(received_packet->pkt->data); - received_packet->pkt->length = packet.size(); + RtpPacketReceived packet_copy(packet); + packet_copy.ZeroMutableExtensions(); + received_packet->pkt->data = packet_copy.Buffer(); + received_packet->pkt->length = received_packet->pkt->data.size(); } ++packet_counter_.num_packets; @@ -161,14 +163,14 @@ void FlexfecReceiver::ProcessReceivedPacket( // Set this flag first, since OnRecoveredPacket may end up here // again, with the same packet. recovered_packet->returned = true; - RTC_CHECK(recovered_packet->pkt); + RTC_CHECK_GT(recovered_packet->pkt->data.size(), 0); recovered_packet_receiver_->OnRecoveredPacket( - recovered_packet->pkt->data, recovered_packet->pkt->length); + recovered_packet->pkt->data.cdata(), recovered_packet->pkt->length); // Periodically log the incoming packets. int64_t now_ms = clock_->TimeInMilliseconds(); if (now_ms - last_recovered_packet_ms_ > kPacketLogIntervalMs) { uint32_t media_ssrc = - ForwardErrorCorrection::ParseSsrc(recovered_packet->pkt->data); + ForwardErrorCorrection::ParseSsrc(recovered_packet->pkt->data.data()); RTC_LOG(LS_VERBOSE) << "Recovered media packet with SSRC: " << media_ssrc << " from FlexFEC stream with SSRC: " << ssrc_ << "."; last_recovered_packet_ms_ = now_ms; diff --git a/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc b/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc index 3d77d7bf54..1542e745fc 100644 --- a/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc +++ b/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc @@ -39,7 +39,7 @@ constexpr uint32_t kMediaSsrc = 8353; RtpPacketReceived ParsePacket(const Packet& packet) { RtpPacketReceived parsed_packet; - EXPECT_TRUE(parsed_packet.Parse(packet.data, packet.length)); + EXPECT_TRUE(parsed_packet.Parse(packet.data)); return parsed_packet; } @@ -241,8 +241,8 @@ TEST_F(FlexfecReceiverTest, RecoversFromSingleMediaLoss) { media_it++; EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_, (*media_it)->length)) - .With( - Args<0, 1>(ElementsAreArray((*media_it)->data, (*media_it)->length))); + .With(Args<0, 1>( + ElementsAreArray((*media_it)->data.cdata(), (*media_it)->length))); receiver_.OnRtpPacket(ParsePacket(*packet_with_rtp_header)); } @@ -263,8 +263,8 @@ TEST_F(FlexfecReceiverTest, RecoversFromDoubleMediaLoss) { auto media_it = media_packets.begin(); EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_, (*media_it)->length)) - .With( - Args<0, 1>(ElementsAreArray((*media_it)->data, (*media_it)->length))); + .With(Args<0, 1>( + ElementsAreArray((*media_it)->data.cdata(), (*media_it)->length))); receiver_.OnRtpPacket(ParsePacket(*packet_with_rtp_header)); // Receive second FEC packet and recover second lost media packet. @@ -273,8 +273,8 @@ TEST_F(FlexfecReceiverTest, RecoversFromDoubleMediaLoss) { media_it++; EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_, (*media_it)->length)) - .With( - Args<0, 1>(ElementsAreArray((*media_it)->data, (*media_it)->length))); + .With(Args<0, 1>( + ElementsAreArray((*media_it)->data.cdata(), (*media_it)->length))); receiver_.OnRtpPacket(ParsePacket(*packet_with_rtp_header)); } @@ -312,8 +312,8 @@ TEST_F(FlexfecReceiverTest, DoesNotCallbackTwice) { media_it++; EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_, (*media_it)->length)) - .With( - Args<0, 1>(ElementsAreArray((*media_it)->data, (*media_it)->length))); + .With(Args<0, 1>( + ElementsAreArray((*media_it)->data.cdata(), (*media_it)->length))); receiver_.OnRtpPacket(ParsePacket(*packet_with_rtp_header)); // Receive the FEC packet again, but do not call back. @@ -366,7 +366,7 @@ TEST_F(FlexfecReceiverTest, RecoversFrom50PercentLoss) { EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_, (*media_it)->length)) .With(Args<0, 1>( - ElementsAreArray((*media_it)->data, (*media_it)->length))); + ElementsAreArray((*media_it)->data.cdata(), (*media_it)->length))); receiver_.OnRtpPacket(ParsePacket(*fec_packet_with_rtp_header)); ++media_it; } @@ -405,8 +405,8 @@ TEST_F(FlexfecReceiverTest, DelayedFecPacketDoesHelp) { media_it = media_packets.begin(); EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_, (*media_it)->length)) - .With( - Args<0, 1>(ElementsAreArray((*media_it)->data, (*media_it)->length))); + .With(Args<0, 1>( + ElementsAreArray((*media_it)->data.cdata(), (*media_it)->length))); receiver_.OnRtpPacket(ParsePacket(*packet_with_rtp_header)); } @@ -534,12 +534,12 @@ TEST_F(FlexfecReceiverTest, RecoversWithMediaPacketsOutOfOrder) { // Expect to recover lost media packets. EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_, (*media_packet1)->length)) - .With(Args<0, 1>( - ElementsAreArray((*media_packet1)->data, (*media_packet1)->length))); + .With(Args<0, 1>(ElementsAreArray((*media_packet1)->data.cdata(), + (*media_packet1)->length))); EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_, (*media_packet4)->length)) - .With(Args<0, 1>( - ElementsAreArray((*media_packet4)->data, (*media_packet4)->length))); + .With(Args<0, 1>(ElementsAreArray((*media_packet4)->data.cdata(), + (*media_packet4)->length))); // Add FEC packets. auto fec_it = fec_packets.begin(); @@ -636,8 +636,8 @@ TEST_F(FlexfecReceiverTest, CalculatesNumberOfPackets) { media_it++; EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_, (*media_it)->length)) - .With( - Args<0, 1>(ElementsAreArray((*media_it)->data, (*media_it)->length))); + .With(Args<0, 1>( + ElementsAreArray((*media_it)->data.cdata(), (*media_it)->length))); receiver_.OnRtpPacket(ParsePacket(*packet_with_rtp_header)); // Check stats calculations. diff --git a/modules/rtp_rtcp/source/flexfec_sender.cc b/modules/rtp_rtcp/source/flexfec_sender.cc index 038cef7b78..3fb51cd4c4 100644 --- a/modules/rtp_rtcp/source/flexfec_sender.cc +++ b/modules/rtp_rtcp/source/flexfec_sender.cc @@ -114,7 +114,7 @@ bool FlexfecSender::AddRtpPacketAndGenerateFec(const RtpPacketToSend& packet) { // protection. RTC_DCHECK_EQ(packet.Ssrc(), protected_media_ssrc_); return ulpfec_generator_.AddRtpPacketAndGenerateFec( - packet.data(), packet.payload_size(), packet.headers_size()) == 0; + packet.Buffer(), packet.headers_size()) == 0; } bool FlexfecSender::FecAvailable() const { @@ -154,7 +154,7 @@ std::vector> FlexfecSender::GetFecPackets() { // RTP payload. uint8_t* payload = fec_packet_to_send->AllocatePayload(fec_packet->length); - memcpy(payload, fec_packet->data, fec_packet->length); + memcpy(payload, fec_packet->data.cdata(), fec_packet->length); fec_packets_to_send.push_back(std::move(fec_packet_to_send)); } diff --git a/modules/rtp_rtcp/source/flexfec_sender_unittest.cc b/modules/rtp_rtcp/source/flexfec_sender_unittest.cc index c7291b02c4..10ec2e7495 100644 --- a/modules/rtp_rtcp/source/flexfec_sender_unittest.cc +++ b/modules/rtp_rtcp/source/flexfec_sender_unittest.cc @@ -62,7 +62,7 @@ std::unique_ptr GenerateSingleFlexfecPacket( std::unique_ptr packet = packet_generator.NextPacket(i, kPayloadLength); RtpPacketToSend rtp_packet(nullptr); // No header extensions. - rtp_packet.Parse(packet->data, packet->length); + rtp_packet.Parse(packet->data); EXPECT_TRUE(sender->AddRtpPacketAndGenerateFec(rtp_packet)); } EXPECT_TRUE(sender->FecAvailable()); @@ -133,7 +133,7 @@ TEST(FlexfecSenderTest, ProtectTwoFramesWithOneFecPacket) { std::unique_ptr packet = packet_generator.NextPacket(i, kPayloadLength); RtpPacketToSend rtp_packet(nullptr); - rtp_packet.Parse(packet->data, packet->length); + rtp_packet.Parse(packet->data); EXPECT_TRUE(sender.AddRtpPacketAndGenerateFec(rtp_packet)); } } @@ -173,7 +173,7 @@ TEST(FlexfecSenderTest, ProtectTwoFramesWithTwoFecPackets) { std::unique_ptr packet = packet_generator.NextPacket(i, kPayloadLength); RtpPacketToSend rtp_packet(nullptr); - rtp_packet.Parse(packet->data, packet->length); + rtp_packet.Parse(packet->data); EXPECT_TRUE(sender.AddRtpPacketAndGenerateFec(rtp_packet)); } EXPECT_TRUE(sender.FecAvailable()); diff --git a/modules/rtp_rtcp/source/forward_error_correction.cc b/modules/rtp_rtcp/source/forward_error_correction.cc index 413c7087cf..bfb4c2d35b 100644 --- a/modules/rtp_rtcp/source/forward_error_correction.cc +++ b/modules/rtp_rtcp/source/forward_error_correction.cc @@ -150,9 +150,11 @@ int ForwardErrorCorrection::EncodeFec(const PacketList& media_packets, return 0; } for (int i = 0; i < num_fec_packets; ++i) { - memset(generated_fec_packets_[i].data, 0, IP_PACKET_SIZE); + generated_fec_packets_[i].data.EnsureCapacity(IP_PACKET_SIZE); + memset(generated_fec_packets_[i].data.data(), 0, IP_PACKET_SIZE); // Use this as a marker for untouched packets. generated_fec_packets_[i].length = 0; + generated_fec_packets_[i].data.SetSize(0); fec_packets->push_back(&generated_fec_packets_[i]); } @@ -177,9 +179,9 @@ int ForwardErrorCorrection::EncodeFec(const PacketList& media_packets, GenerateFecPayloads(media_packets, num_fec_packets); // TODO(brandtr): Generalize this when multistream protection support is // added. - const uint32_t media_ssrc = ParseSsrc(media_packets.front()->data); + const uint32_t media_ssrc = ParseSsrc(media_packets.front()->data.data()); const uint16_t seq_num_base = - ParseSequenceNumber(media_packets.front()->data); + ParseSequenceNumber(media_packets.front()->data.data()); FinalizeFecHeaders(num_fec_packets, media_ssrc, seq_num_base); return 0; @@ -211,7 +213,8 @@ void ForwardErrorCorrection::GenerateFecPayloads( size_t media_pkt_idx = 0; auto media_packets_it = media_packets.cbegin(); - uint16_t prev_seq_num = ParseSequenceNumber((*media_packets_it)->data); + uint16_t prev_seq_num = + ParseSequenceNumber((*media_packets_it)->data.data()); while (media_packets_it != media_packets.end()) { Packet* const media_packet = media_packets_it->get(); // Should |media_packet| be protected by |fec_packet|? @@ -225,6 +228,7 @@ void ForwardErrorCorrection::GenerateFecPayloads( // with) is the identity operator, thus all prior XORs are // still correct even though we expand the packet length here. fec_packet->length = fec_packet_length; + fec_packet->data.SetSize(fec_packet->length); } if (first_protected_packet) { // Write P, X, CC, M, and PT recovery fields. @@ -237,8 +241,10 @@ void ForwardErrorCorrection::GenerateFecPayloads( // Write timestamp recovery field. memcpy(&fec_packet->data[4], &media_packet->data[4], 4); // Write payload. - memcpy(&fec_packet->data[fec_header_size], - &media_packet->data[kRtpHeaderSize], media_payload_length); + if (media_payload_length > 0) { + memcpy(&fec_packet->data[fec_header_size], + &media_packet->data[kRtpHeaderSize], media_payload_length); + } } else { XorHeaders(*media_packet, fec_packet); XorPayloads(*media_packet, media_payload_length, fec_header_size, @@ -247,7 +253,8 @@ void ForwardErrorCorrection::GenerateFecPayloads( } media_packets_it++; if (media_packets_it != media_packets.end()) { - uint16_t seq_num = ParseSequenceNumber((*media_packets_it)->data); + uint16_t seq_num = + ParseSequenceNumber((*media_packets_it)->data.data()); media_pkt_idx += static_cast(seq_num - prev_seq_num); prev_seq_num = seq_num; } @@ -266,8 +273,10 @@ int ForwardErrorCorrection::InsertZerosInPacketMasks( if (num_media_packets <= 1) { return num_media_packets; } - uint16_t last_seq_num = ParseSequenceNumber(media_packets.back()->data); - uint16_t first_seq_num = ParseSequenceNumber(media_packets.front()->data); + uint16_t last_seq_num = + ParseSequenceNumber(media_packets.back()->data.data()); + uint16_t first_seq_num = + ParseSequenceNumber(media_packets.front()->data.data()); size_t total_missing_seq_nums = static_cast(last_seq_num - first_seq_num) - num_media_packets + 1; @@ -300,7 +309,7 @@ int ForwardErrorCorrection::InsertZerosInPacketMasks( // We can only cover up to 48 packets. break; } - uint16_t seq_num = ParseSequenceNumber((*media_packets_it)->data); + uint16_t seq_num = ParseSequenceNumber((*media_packets_it)->data.data()); const int num_zeros_to_insert = static_cast(seq_num - prev_seq_num - 1); if (num_zeros_to_insert > 0) { @@ -535,25 +544,29 @@ bool ForwardErrorCorrection::StartPacketRecovery( << "for its own header."; return false; } + if (fec_packet.protection_length > + std::min(size_t{IP_PACKET_SIZE - kRtpHeaderSize}, + IP_PACKET_SIZE - fec_packet.fec_header_size)) { + RTC_LOG(LS_WARNING) << "Incorrect protection length, dropping FEC packet."; + return false; + } // Initialize recovered packet data. recovered_packet->pkt = new Packet(); - memset(recovered_packet->pkt->data, 0, IP_PACKET_SIZE); + recovered_packet->pkt->data.SetSize(fec_packet.protection_length + + kRtpHeaderSize); recovered_packet->returned = false; recovered_packet->was_recovered = true; // Copy bytes corresponding to minimum RTP header size. // Note that the sequence number and SSRC fields will be overwritten // at the end of packet recovery. - memcpy(&recovered_packet->pkt->data, fec_packet.pkt->data, kRtpHeaderSize); + memcpy(recovered_packet->pkt->data.data(), fec_packet.pkt->data.cdata(), + kRtpHeaderSize); // Copy remaining FEC payload. - if (fec_packet.protection_length > - std::min(sizeof(recovered_packet->pkt->data) - kRtpHeaderSize, - sizeof(fec_packet.pkt->data) - fec_packet.fec_header_size)) { - RTC_LOG(LS_WARNING) << "Incorrect protection length, dropping FEC packet."; - return false; + if (fec_packet.protection_length > 0) { + memcpy(recovered_packet->pkt->data.data() + kRtpHeaderSize, + fec_packet.pkt->data.cdata() + fec_packet.fec_header_size, + fec_packet.protection_length); } - memcpy(&recovered_packet->pkt->data[kRtpHeaderSize], - &fec_packet.pkt->data[fec_packet.fec_header_size], - fec_packet.protection_length); return true; } @@ -564,15 +577,16 @@ bool ForwardErrorCorrection::FinishPacketRecovery( recovered_packet->pkt->data[0] |= 0x80; // Set the 1st bit. recovered_packet->pkt->data[0] &= 0xbf; // Clear the 2nd bit. // Recover the packet length, from temporary location. - recovered_packet->pkt->length = + const size_t new_size = ByteReader::ReadBigEndian(&recovered_packet->pkt->data[2]) + kRtpHeaderSize; - if (recovered_packet->pkt->length > - sizeof(recovered_packet->pkt->data) - kRtpHeaderSize) { + if (new_size > size_t{IP_PACKET_SIZE - kRtpHeaderSize}) { RTC_LOG(LS_WARNING) << "The recovered packet had a length larger than a " << "typical IP packet, and is thus dropped."; return false; } + recovered_packet->pkt->length = new_size; + recovered_packet->pkt->data.SetSize(new_size); // Set the SN field. ByteWriter::WriteBigEndian(&recovered_packet->pkt->data[2], recovered_packet->seq_num); @@ -609,8 +623,8 @@ void ForwardErrorCorrection::XorPayloads(const Packet& src, size_t dst_offset, Packet* dst) { // XOR the payload. - RTC_DCHECK_LE(kRtpHeaderSize + payload_length, sizeof(src.data)); - RTC_DCHECK_LE(dst_offset + payload_length, sizeof(dst->data)); + RTC_DCHECK_LE(kRtpHeaderSize + payload_length, src.data.size()); + RTC_DCHECK_LE(dst_offset + payload_length, dst->data.size()); for (size_t i = 0; i < payload_length; ++i) { dst->data[dst_offset + i] ^= src.data[kRtpHeaderSize + i]; } @@ -627,7 +641,8 @@ bool ForwardErrorCorrection::RecoverPacket(const ReceivedFecPacket& fec_packet, recovered_packet->seq_num = protected_packet->seq_num; } else { XorHeaders(*protected_packet->pkt, recovered_packet->pkt); - XorPayloads(*protected_packet->pkt, protected_packet->pkt->length, + XorPayloads(*protected_packet->pkt, + protected_packet->pkt->length - kRtpHeaderSize, kRtpHeaderSize, recovered_packet->pkt); } } diff --git a/modules/rtp_rtcp/source/forward_error_correction.h b/modules/rtp_rtcp/source/forward_error_correction.h index ad2eef1b5a..c00264707d 100644 --- a/modules/rtp_rtcp/source/forward_error_correction.h +++ b/modules/rtp_rtcp/source/forward_error_correction.h @@ -22,6 +22,7 @@ #include "modules/include/module_fec_types.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/forward_error_correction_internal.h" +#include "rtc_base/copy_on_write_buffer.h" namespace webrtc { @@ -53,7 +54,7 @@ class ForwardErrorCorrection { virtual int32_t Release(); size_t length; // Length of packet in bytes. - uint8_t data[IP_PACKET_SIZE]; // Packet data. + rtc::CopyOnWriteBuffer data; // Packet data. private: int32_t ref_count_; // Counts the number of references to a packet. diff --git a/modules/rtp_rtcp/source/rtp_fec_unittest.cc b/modules/rtp_rtcp/source/rtp_fec_unittest.cc index 1c248c8c3f..7d3b05420b 100644 --- a/modules/rtp_rtcp/source/rtp_fec_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_fec_unittest.cc @@ -121,7 +121,7 @@ void RtpFecTest::ReceivedPackets( new ForwardErrorCorrection::ReceivedPacket()); received_packet->pkt = new ForwardErrorCorrection::Packet(); received_packet->pkt->length = packet->length; - memcpy(received_packet->pkt->data, packet->data, packet->length); + received_packet->pkt->data = packet->data; received_packet->is_fec = is_fec; if (!is_fec) { received_packet->ssrc = kMediaSsrc; @@ -158,7 +158,8 @@ bool RtpFecTest::IsRecoveryComplete() { if (media_packet->length != recovered_packet->pkt->length) { return false; } - if (memcmp(media_packet->data, recovered_packet->pkt->data, + if (memcmp(media_packet->data.cdata(), + recovered_packet->pkt->data.cdata(), media_packet->length) != 0) { return false; } diff --git a/modules/rtp_rtcp/source/rtp_packet.cc b/modules/rtp_rtcp/source/rtp_packet.cc index 5f919ff24e..b9c7e54c26 100644 --- a/modules/rtp_rtcp/source/rtp_packet.cc +++ b/modules/rtp_rtcp/source/rtp_packet.cc @@ -157,10 +157,7 @@ void RtpPacket::SetSsrc(uint32_t ssrc) { ByteWriter::WriteBigEndian(WriteAt(8), ssrc); } -void RtpPacket::CopyAndZeroMutableExtensions( - rtc::ArrayView buffer) const { - RTC_CHECK_GE(buffer.size(), buffer_.size()); - memcpy(buffer.data(), buffer_.cdata(), buffer_.size()); +void RtpPacket::ZeroMutableExtensions() { for (const ExtensionInfo& extension : extension_entries_) { switch (extensions_.GetType(extension.id)) { case RTPExtensionType::kRtpExtensionNone: { @@ -170,9 +167,9 @@ void RtpPacket::CopyAndZeroMutableExtensions( case RTPExtensionType::kRtpExtensionVideoTiming: { // Nullify 3 last entries: packetization delay and 2 network timestamps. // Each of them is 2 bytes. - memset(buffer.data() + extension.offset + - VideoSendTiming::kPacerExitDeltaOffset, - 0, 6); + memset( + WriteAt(extension.offset + VideoSendTiming::kPacerExitDeltaOffset), + 0, 6); break; } case RTPExtensionType::kRtpExtensionTransportSequenceNumber: @@ -180,7 +177,7 @@ void RtpPacket::CopyAndZeroMutableExtensions( case RTPExtensionType::kRtpExtensionTransmissionTimeOffset: case RTPExtensionType::kRtpExtensionAbsoluteSendTime: { // Nullify whole extension, as it's filled in the pacer. - memset(buffer.data() + extension.offset, 0, extension.length); + memset(WriteAt(extension.offset), 0, extension.length); break; } case RTPExtensionType::kRtpExtensionAudioLevel: diff --git a/modules/rtp_rtcp/source/rtp_packet.h b/modules/rtp_rtcp/source/rtp_packet.h index c49e0709a3..145f1d7bd8 100644 --- a/modules/rtp_rtcp/source/rtp_packet.h +++ b/modules/rtp_rtcp/source/rtp_packet.h @@ -89,9 +89,9 @@ class RtpPacket { void SetTimestamp(uint32_t timestamp); void SetSsrc(uint32_t ssrc); - // Copies the buffer with zero-ed mutable extensions, + // Fills with zeroes mutable extensions, // which are modified after FEC protection is generated. - void CopyAndZeroMutableExtensions(rtc::ArrayView buffer) const; + void ZeroMutableExtensions(); // Removes extension of given |type|, returns false is extension was not // registered in packet's extension map or not present in the packet. Only diff --git a/modules/rtp_rtcp/source/rtp_sender_video.cc b/modules/rtp_rtcp/source/rtp_sender_video.cc index 632088baec..0147994337 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video.cc +++ b/modules/rtp_rtcp/source/rtp_sender_video.cc @@ -278,8 +278,7 @@ void RTPSenderVideo::SendVideoPacketAsRedMaybeWithUlpfec( if (ulpfec_enabled()) { if (protect_media_packet) { ulpfec_generator_.AddRtpPacketAndGenerateFec( - media_packet->data(), media_packet->payload_size(), - media_packet->headers_size()); + media_packet->Buffer(), media_packet->headers_size()); } uint16_t num_fec_packets = ulpfec_generator_.NumAvailableFecPackets(); if (num_fec_packets > 0) { diff --git a/modules/rtp_rtcp/source/ulpfec_generator.cc b/modules/rtp_rtcp/source/ulpfec_generator.cc index ec9088c027..791fff9d91 100644 --- a/modules/rtp_rtcp/source/ulpfec_generator.cc +++ b/modules/rtp_rtcp/source/ulpfec_generator.cc @@ -133,9 +133,9 @@ void UlpfecGenerator::SetFecParameters(const FecProtectionParams& params) { } } -int UlpfecGenerator::AddRtpPacketAndGenerateFec(const uint8_t* data_buffer, - size_t payload_length, - size_t rtp_header_length) { +int UlpfecGenerator::AddRtpPacketAndGenerateFec( + const rtc::CopyOnWriteBuffer& data_buffer, + size_t rtp_header_length) { RTC_DCHECK(generated_fec_packets_.empty()); if (media_packets_.empty()) { params_ = new_params_; @@ -146,8 +146,9 @@ int UlpfecGenerator::AddRtpPacketAndGenerateFec(const uint8_t* data_buffer, // Our packet masks can only protect up to |kUlpfecMaxMediaPackets| packets. std::unique_ptr packet( new ForwardErrorCorrection::Packet()); - packet->length = payload_length + rtp_header_length; - memcpy(packet->data, data_buffer, packet->length); + RTC_DCHECK_GE(data_buffer.size(), rtp_header_length); + packet->data = data_buffer; + packet->length = packet->data.size(); media_packets_.push_back(std::move(packet)); // Keep track of the RTP header length, so we can copy the RTP header // from |packet| to newly generated ULPFEC+RED packets. @@ -226,12 +227,12 @@ std::vector> UlpfecGenerator::GetUlpfecPacketsAsRed( std::unique_ptr red_packet( new RedPacket(last_media_packet_rtp_header_length_ + kRedForFecHeaderLength + fec_packet->length)); - red_packet->CreateHeader(last_media_packet->data, + red_packet->CreateHeader(last_media_packet->data.data(), last_media_packet_rtp_header_length_, red_payload_type, ulpfec_payload_type); red_packet->SetSeqNum(seq_num++); red_packet->ClearMarkerBit(); - red_packet->AssignPayload(fec_packet->data, fec_packet->length); + red_packet->AssignPayload(fec_packet->data.data(), fec_packet->length); red_packets.push_back(std::move(red_packet)); } diff --git a/modules/rtp_rtcp/source/ulpfec_generator.h b/modules/rtp_rtcp/source/ulpfec_generator.h index 7b18c6e0bc..cdfa1ff67d 100644 --- a/modules/rtp_rtcp/source/ulpfec_generator.h +++ b/modules/rtp_rtcp/source/ulpfec_generator.h @@ -58,8 +58,7 @@ class UlpfecGenerator { // Adds a media packet to the internal buffer. When enough media packets // have been added, the FEC packets are generated and stored internally. // These FEC packets are then obtained by calling GetFecPacketsAsRed(). - int AddRtpPacketAndGenerateFec(const uint8_t* data_buffer, - size_t payload_length, + int AddRtpPacketAndGenerateFec(const rtc::CopyOnWriteBuffer& data_buffer, size_t rtp_header_length); // Returns true if there are generated FEC packets available. diff --git a/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc b/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc index 6880f79cfb..8c1c7ea396 100644 --- a/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc +++ b/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc @@ -90,8 +90,9 @@ TEST_F(UlpfecGeneratorTest, NoEmptyFecWithSeqNumGaps) { packet[1] &= ~0x80; } ByteWriter::WriteBigEndian(&packet[2], p.seq_num); - ulpfec_generator_.AddRtpPacketAndGenerateFec(packet, p.payload_size, - p.header_size); + ulpfec_generator_.AddRtpPacketAndGenerateFec( + rtc::CopyOnWriteBuffer(packet, p.payload_size + p.header_size), + p.header_size); size_t num_fec_packets = ulpfec_generator_.NumAvailableFecPackets(); if (num_fec_packets > 0) { std::vector> fec_packets = @@ -117,8 +118,8 @@ TEST_F(UlpfecGeneratorTest, OneFrameFec) { for (size_t i = 0; i < kNumPackets; ++i) { std::unique_ptr packet = packet_generator_.NextPacket(i, 10); - EXPECT_EQ(0, ulpfec_generator_.AddRtpPacketAndGenerateFec( - packet->data, packet->length, kRtpHeaderSize)); + EXPECT_EQ(0, ulpfec_generator_.AddRtpPacketAndGenerateFec(packet->data, + kRtpHeaderSize)); last_timestamp = packet->header.timestamp; } EXPECT_TRUE(ulpfec_generator_.FecAvailable()); @@ -152,7 +153,7 @@ TEST_F(UlpfecGeneratorTest, TwoFrameFec) { std::unique_ptr packet = packet_generator_.NextPacket(i * kNumPackets + j, 10); EXPECT_EQ(0, ulpfec_generator_.AddRtpPacketAndGenerateFec( - packet->data, packet->length, kRtpHeaderSize)); + packet->data, kRtpHeaderSize)); last_timestamp = packet->header.timestamp; } } @@ -181,7 +182,7 @@ TEST_F(UlpfecGeneratorTest, MixedMediaRtpHeaderLengths) { std::unique_ptr packet = packet_generator_.NextPacket(i, 10); EXPECT_EQ(0, ulpfec_generator_.AddRtpPacketAndGenerateFec( - packet->data, packet->length, kShortRtpHeaderLength)); + packet->data, kShortRtpHeaderLength)); EXPECT_FALSE(ulpfec_generator_.FecAvailable()); } @@ -190,7 +191,7 @@ TEST_F(UlpfecGeneratorTest, MixedMediaRtpHeaderLengths) { std::unique_ptr packet = packet_generator_.NextPacket(kUlpfecMaxMediaPackets, 10); EXPECT_EQ(0, ulpfec_generator_.AddRtpPacketAndGenerateFec( - packet->data, packet->length, kLongRtpHeaderLength)); + packet->data, kLongRtpHeaderLength)); EXPECT_TRUE(ulpfec_generator_.FecAvailable()); // Ensure that the RED header is placed correctly, i.e. the correct diff --git a/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc b/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc index 725f9a53ee..fb593b326b 100644 --- a/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc +++ b/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc @@ -53,6 +53,7 @@ std::unique_ptr WriteHeader(const uint8_t* packet_mask, UlpfecHeaderWriter writer; std::unique_ptr written_packet(new Packet()); written_packet->length = kMediaPacketLength; + written_packet->data.SetSize(written_packet->length); for (size_t i = 0; i < written_packet->length; ++i) { written_packet->data[i] = i; // Actual content doesn't matter. } @@ -66,7 +67,7 @@ std::unique_ptr ReadHeader(const Packet& written_packet) { std::unique_ptr read_packet(new ReceivedFecPacket()); read_packet->ssrc = kMediaSsrc; read_packet->pkt = rtc::scoped_refptr(new Packet()); - memcpy(read_packet->pkt->data, written_packet.data, written_packet.length); + read_packet->pkt->data = written_packet.data; read_packet->pkt->length = written_packet.length; EXPECT_TRUE(reader.ReadFecHeader(read_packet.get())); return read_packet; @@ -89,8 +90,8 @@ void VerifyHeaders(size_t expected_fec_header_size, &read_packet.pkt->data[read_packet.packet_mask_offset], read_packet.packet_mask_size)); // Verify that the call to ReadFecHeader did not tamper with the payload. - EXPECT_EQ(0, memcmp(&written_packet.data[expected_fec_header_size], - &read_packet.pkt->data[expected_fec_header_size], + EXPECT_EQ(0, memcmp(written_packet.data.data() + expected_fec_header_size, + read_packet.pkt->data.cdata() + expected_fec_header_size, written_packet.length - expected_fec_header_size)); } @@ -107,7 +108,7 @@ TEST(UlpfecHeaderReaderTest, ReadsSmallHeader) { const size_t packet_length = sizeof(packet); ReceivedFecPacket read_packet; read_packet.pkt = rtc::scoped_refptr(new Packet()); - memcpy(read_packet.pkt->data, packet, packet_length); + read_packet.pkt->data.SetData(packet, packet_length); read_packet.pkt->length = packet_length; UlpfecHeaderReader reader; @@ -132,7 +133,7 @@ TEST(UlpfecHeaderReaderTest, ReadsLargeHeader) { const size_t packet_length = sizeof(packet); ReceivedFecPacket read_packet; read_packet.pkt = rtc::scoped_refptr(new Packet()); - memcpy(read_packet.pkt->data, packet, packet_length); + read_packet.pkt->data.SetData(packet, packet_length); read_packet.pkt->length = packet_length; UlpfecHeaderReader reader; @@ -150,6 +151,7 @@ TEST(UlpfecHeaderWriterTest, FinalizesSmallHeader) { auto packet_mask = GeneratePacketMask(packet_mask_size, 0xabcd); Packet written_packet; written_packet.length = kMediaPacketLength; + written_packet.data.SetSize(written_packet.length); for (size_t i = 0; i < written_packet.length; ++i) { written_packet.data[i] = i; } @@ -158,7 +160,7 @@ TEST(UlpfecHeaderWriterTest, FinalizesSmallHeader) { writer.FinalizeFecHeader(kMediaSsrc, kMediaStartSeqNum, packet_mask.get(), packet_mask_size, &written_packet); - const uint8_t* packet = written_packet.data; + const uint8_t* packet = written_packet.data.cdata(); EXPECT_EQ(0x00, packet[0] & 0x80); // E bit. EXPECT_EQ(0x00, packet[0] & 0x40); // L bit. EXPECT_EQ(kMediaStartSeqNum, ByteReader::ReadBigEndian(packet + 2)); @@ -174,6 +176,7 @@ TEST(UlpfecHeaderWriterTest, FinalizesLargeHeader) { auto packet_mask = GeneratePacketMask(packet_mask_size, 0xabcd); Packet written_packet; written_packet.length = kMediaPacketLength; + written_packet.data.SetSize(written_packet.length); for (size_t i = 0; i < written_packet.length; ++i) { written_packet.data[i] = i; } @@ -182,7 +185,7 @@ TEST(UlpfecHeaderWriterTest, FinalizesLargeHeader) { writer.FinalizeFecHeader(kMediaSsrc, kMediaStartSeqNum, packet_mask.get(), packet_mask_size, &written_packet); - const uint8_t* packet = written_packet.data; + const uint8_t* packet = written_packet.data.cdata(); EXPECT_EQ(0x00, packet[0] & 0x80); // E bit. EXPECT_EQ(0x40, packet[0] & 0x40); // L bit. EXPECT_EQ(kMediaStartSeqNum, ByteReader::ReadBigEndian(packet + 2)); diff --git a/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc b/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc index a5d6368df0..b950cbd814 100644 --- a/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc +++ b/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc @@ -130,26 +130,28 @@ int32_t UlpfecReceiverImpl::AddReceivedRedPacket( ++packet_counter_.num_fec_packets; // everything behind the RED header - memcpy(received_packet->pkt->data, - incoming_rtp_packet + header.headerLength + red_header_length, - payload_data_length - red_header_length); + received_packet->pkt->data.SetData( + incoming_rtp_packet + header.headerLength + red_header_length, + payload_data_length - red_header_length); received_packet->pkt->length = payload_data_length - red_header_length; received_packet->ssrc = ByteReader::ReadBigEndian(&incoming_rtp_packet[8]); } else { + received_packet->pkt->data.SetSize(header.headerLength + + payload_data_length - red_header_length); // Copy RTP header. - memcpy(received_packet->pkt->data, incoming_rtp_packet, + memcpy(received_packet->pkt->data.data(), incoming_rtp_packet, header.headerLength); - // Set payload type. received_packet->pkt->data[1] &= 0x80; // Reset RED payload type. received_packet->pkt->data[1] += payload_type; // Set media payload type. - // Copy payload data. - memcpy(received_packet->pkt->data + header.headerLength, - incoming_rtp_packet + header.headerLength + red_header_length, - payload_data_length - red_header_length); + if (payload_data_length > red_header_length) { + memcpy(received_packet->pkt->data.data() + header.headerLength, + incoming_rtp_packet + header.headerLength + red_header_length, + payload_data_length - red_header_length); + } received_packet->pkt->length = header.headerLength + payload_data_length - red_header_length; } @@ -182,16 +184,18 @@ int32_t UlpfecReceiverImpl::ProcessReceivedFec() { if (!received_packet->is_fec) { ForwardErrorCorrection::Packet* packet = received_packet->pkt; crit_sect_.Leave(); - recovered_packet_callback_->OnRecoveredPacket(packet->data, + recovered_packet_callback_->OnRecoveredPacket(packet->data.data(), packet->length); crit_sect_.Enter(); + // Create a packet with the buffer to modify it. RtpPacketReceived rtp_packet; - // TODO(ilnik): move extension nullifying out of RtpPacket, so there's no - // need to create one here, and avoid two memcpy calls below. - rtp_packet.Parse(packet->data, packet->length); // Does memcopy. + rtp_packet.Parse(packet->data); rtp_packet.IdentifyExtensions(extensions_); - rtp_packet.CopyAndZeroMutableExtensions( // Does memcopy. - rtc::MakeArrayView(packet->data, packet->length)); + // Reset buffer reference, so zeroing would work on a buffer with a + // single reference. + packet->data = rtc::CopyOnWriteBuffer(0); + rtp_packet.ZeroMutableExtensions(); + packet->data = rtp_packet.Buffer(); } fec_->DecodeFec(*received_packet, &recovered_packets_); } @@ -208,7 +212,8 @@ int32_t UlpfecReceiverImpl::ProcessReceivedFec() { // header, OnRecoveredPacket will recurse back here. recovered_packet->returned = true; crit_sect_.Leave(); - recovered_packet_callback_->OnRecoveredPacket(packet->data, packet->length); + recovered_packet_callback_->OnRecoveredPacket(packet->data.data(), + packet->length); crit_sect_.Enter(); } diff --git a/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc b/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc index cd1798bbea..bbe616f059 100644 --- a/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc +++ b/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc @@ -126,16 +126,16 @@ void UlpfecReceiverTest::BuildAndAddRedMediaPacket(AugmentedPacket* packet) { std::unique_ptr red_packet( packet_generator_.BuildMediaRedPacket(*packet)); EXPECT_EQ(0, receiver_fec_->AddReceivedRedPacket( - red_packet->header, red_packet->data, red_packet->length, - kFecPayloadType)); + red_packet->header, red_packet->data.cdata(), + red_packet->length, kFecPayloadType)); } void UlpfecReceiverTest::BuildAndAddRedFecPacket(Packet* packet) { std::unique_ptr red_packet( packet_generator_.BuildUlpfecRedPacket(*packet)); EXPECT_EQ(0, receiver_fec_->AddReceivedRedPacket( - red_packet->header, red_packet->data, red_packet->length, - kFecPayloadType)); + red_packet->header, red_packet->data.cdata(), + red_packet->length, kFecPayloadType)); } void UlpfecReceiverTest::VerifyReconstructedMediaPacket( @@ -145,7 +145,7 @@ void UlpfecReceiverTest::VerifyReconstructedMediaPacket( // content of |packet|, and that the same content is received |times| number // of times in a row. EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_, packet.length)) - .With(Args<0, 1>(ElementsAreArray(packet.data, packet.length))) + .With(Args<0, 1>(ElementsAreArray(packet.data.cdata(), packet.length))) .Times(times); } diff --git a/modules/rtp_rtcp/test/testFec/test_fec.cc b/modules/rtp_rtcp/test/testFec/test_fec.cc index 3a893b37ca..434d3ac4fb 100644 --- a/modules/rtp_rtcp/test/testFec/test_fec.cc +++ b/modules/rtp_rtcp/test/testFec/test_fec.cc @@ -70,8 +70,7 @@ void ReceivePackets( new ForwardErrorCorrection::ReceivedPacket()); *duplicate_packet = *received_packet; duplicate_packet->pkt = new ForwardErrorCorrection::Packet(); - memcpy(duplicate_packet->pkt->data, received_packet->pkt->data, - received_packet->pkt->length); + duplicate_packet->pkt->data = received_packet->pkt->data; duplicate_packet->pkt->length = received_packet->pkt->length; to_decode_list->push_back(std::move(duplicate_packet)); @@ -254,6 +253,7 @@ void RunTest(bool use_flexfec) { IP_PACKET_SIZE - 12 - 28 - fec->MaxPacketOverhead()); media_packet->length = random.Rand(kMinPacketSize, kMaxPacketSize); + media_packet->data.SetSize(media_packet->length); // Generate random values for the first 2 bytes. media_packet->data[0] = random.Rand(); @@ -312,8 +312,7 @@ void RunTest(bool use_flexfec) { new ForwardErrorCorrection::ReceivedPacket()); received_packet->pkt = new ForwardErrorCorrection::Packet(); received_packet->pkt->length = media_packet->length; - memcpy(received_packet->pkt->data, media_packet->data, - media_packet->length); + received_packet->pkt->data = media_packet->data; received_packet->ssrc = media_ssrc; received_packet->seq_num = ByteReader::ReadBigEndian(&media_packet->data[2]); @@ -334,8 +333,7 @@ void RunTest(bool use_flexfec) { new ForwardErrorCorrection::ReceivedPacket()); received_packet->pkt = new ForwardErrorCorrection::Packet(); received_packet->pkt->length = fec_packet->length; - memcpy(received_packet->pkt->data, fec_packet->data, - fec_packet->length); + received_packet->pkt->data = fec_packet->data; received_packet->seq_num = fec_seq_num_offset + seq_num; received_packet->is_fec = true; received_packet->ssrc = fec_ssrc; @@ -426,8 +424,9 @@ void RunTest(bool use_flexfec) { ASSERT_EQ(recovered_packet->pkt->length, media_packet->length) << "Recovered packet length not identical to original " << "media packet"; - ASSERT_EQ(0, memcmp(recovered_packet->pkt->data, - media_packet->data, media_packet->length)) + ASSERT_EQ( + 0, memcmp(recovered_packet->pkt->data.cdata(), + media_packet->data.cdata(), media_packet->length)) << "Recovered packet payload not identical to original " << "media packet"; recovered_packet_list.pop_front(); diff --git a/test/fuzzers/flexfec_header_reader_fuzzer.cc b/test/fuzzers/flexfec_header_reader_fuzzer.cc index c887d2eb7d..2f4c498edb 100644 --- a/test/fuzzers/flexfec_header_reader_fuzzer.cc +++ b/test/fuzzers/flexfec_header_reader_fuzzer.cc @@ -25,7 +25,8 @@ void FuzzOneInput(const uint8_t* data, size_t size) { packet.pkt = rtc::scoped_refptr(new Packet()); const size_t packet_size = std::min(size, static_cast(IP_PACKET_SIZE)); - memcpy(packet.pkt->data, data, packet_size); + packet.pkt->data.SetSize(packet_size); + memcpy(packet.pkt->data.data(), data, packet_size); packet.pkt->length = packet_size; FlexfecHeaderReader flexfec_reader; diff --git a/test/fuzzers/forward_error_correction_fuzzer.cc b/test/fuzzers/forward_error_correction_fuzzer.cc index 1c37889a53..3e674cda16 100644 --- a/test/fuzzers/forward_error_correction_fuzzer.cc +++ b/test/fuzzers/forward_error_correction_fuzzer.cc @@ -67,7 +67,7 @@ void FuzzOneInput(const uint8_t* data, size_t size) { received_packet.pkt = rtc::scoped_refptr( new ForwardErrorCorrection::Packet()); received_packet.pkt->length = kPacketSize; - uint8_t* packet_buffer = received_packet.pkt->data; + uint8_t* packet_buffer = received_packet.pkt->data.data(); uint8_t reordering; uint16_t seq_num_diff; uint8_t packet_type; diff --git a/test/fuzzers/ulpfec_generator_fuzzer.cc b/test/fuzzers/ulpfec_generator_fuzzer.cc index ce9d8fdbc8..be24895e02 100644 --- a/test/fuzzers/ulpfec_generator_fuzzer.cc +++ b/test/fuzzers/ulpfec_generator_fuzzer.cc @@ -15,6 +15,7 @@ #include "modules/rtp_rtcp/source/fec_test_helper.h" #include "modules/rtp_rtcp/source/ulpfec_generator.h" #include "rtc_base/checks.h" +#include "rtc_base/copy_on_write_buffer.h" namespace webrtc { @@ -38,9 +39,7 @@ void FuzzOneInput(const uint8_t* data, size_t size) { size_t payload_size = data[i++] % 10; if (i + payload_size + rtp_header_length + 2 > size) break; - std::unique_ptr packet( - new uint8_t[payload_size + rtp_header_length]); - memcpy(packet.get(), &data[i], payload_size + rtp_header_length); + rtc::CopyOnWriteBuffer packet(&data[i], payload_size + rtp_header_length); // Make sure sequence numbers are increasing. ByteWriter::WriteBigEndian(&packet[2], seq_num++); @@ -52,8 +51,7 @@ void FuzzOneInput(const uint8_t* data, size_t size) { // number became out of order. if (protect && IsNewerSequenceNumber(seq_num, prev_seq_num) && seq_num < prev_seq_num + kUlpfecMaxMediaPackets) { - generator.AddRtpPacketAndGenerateFec(packet.get(), payload_size, - rtp_header_length); + generator.AddRtpPacketAndGenerateFec(packet, rtp_header_length); prev_seq_num = seq_num; } const size_t num_fec_packets = generator.NumAvailableFecPackets(); diff --git a/test/fuzzers/ulpfec_header_reader_fuzzer.cc b/test/fuzzers/ulpfec_header_reader_fuzzer.cc index 46fe67b1d2..cf211f12ea 100644 --- a/test/fuzzers/ulpfec_header_reader_fuzzer.cc +++ b/test/fuzzers/ulpfec_header_reader_fuzzer.cc @@ -25,7 +25,8 @@ void FuzzOneInput(const uint8_t* data, size_t size) { packet.pkt = rtc::scoped_refptr(new Packet()); const size_t packet_size = std::min(size, static_cast(IP_PACKET_SIZE)); - memcpy(packet.pkt->data, data, packet_size); + packet.pkt->data.SetSize(packet_size); + memcpy(packet.pkt->data.data(), data, packet_size); packet.pkt->length = packet_size; UlpfecHeaderReader ulpfec_reader;