From 70a83949b72331a9189997c98b5f946250b288ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Tue, 12 Mar 2019 09:54:30 +0100 Subject: [PATCH] Delete use of WebRtcRTPHeader from FEC test code Tbr: srte@webrtc.org # comment change in modules/remote_bitrate_estimator/ Bug: webrtc:10397 Change-Id: Ic30e724c18c8812810ac7a608b7065d56a7676e8 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126941 Commit-Queue: Niels Moller Reviewed-by: Rasmus Brandt Cr-Commit-Position: refs/heads/master@{#27069} --- ...remote_bitrate_estimator_unittest_helper.h | 2 +- modules/rtp_rtcp/source/fec_test_helper.cc | 19 +++++++++---------- modules/rtp_rtcp/source/fec_test_helper.h | 3 +-- .../source/ulpfec_generator_unittest.cc | 4 ++-- .../source/ulpfec_receiver_unittest.cc | 8 ++++---- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h b/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h index 8485adafb4..fc9f511015 100644 --- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h +++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h @@ -166,7 +166,7 @@ class RemoteBitrateEstimatorTest : public ::testing::Test { // Helper to add two absolute send time values and keep it less than 1<<24. static uint32_t AddAbsSendTime(uint32_t t1, uint32_t t2); - // Helper to create a WebRtcRTPHeader containing the relevant data for the + // Helper to create an RTPHeader containing the relevant data for the // estimator (all other fields are cleared) and call IncomingPacket on the // estimator. void IncomingPacket(uint32_t ssrc, diff --git a/modules/rtp_rtcp/source/fec_test_helper.cc b/modules/rtp_rtcp/source/fec_test_helper.cc index b325d6750b..1da057ea1c 100644 --- a/modules/rtp_rtcp/source/fec_test_helper.cc +++ b/modules/rtp_rtcp/source/fec_test_helper.cc @@ -123,14 +123,13 @@ std::unique_ptr AugmentedPacketGenerator::NextPacket( for (size_t i = 0; i < length; ++i) packet->data[i + kRtpHeaderSize] = offset + i; packet->length = length + kRtpHeaderSize; - packet->header.frameType = kVideoFrameDelta; - packet->header.header.headerLength = kRtpHeaderSize; - packet->header.header.markerBit = (num_packets_ == 1); - packet->header.header.payloadType = kVp8PayloadType; - packet->header.header.sequenceNumber = seq_num_; - packet->header.header.timestamp = timestamp_; - packet->header.header.ssrc = ssrc_; - WriteRtpHeader(packet->header.header, packet->data); + 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); ++seq_num_; --num_packets_; @@ -183,7 +182,7 @@ std::unique_ptr UlpfecPacketGenerator::BuildMediaRedPacket( const AugmentedPacket& packet) { std::unique_ptr red_packet(new AugmentedPacket()); - const size_t kHeaderLength = packet.header.header.headerLength; + const size_t kHeaderLength = packet.header.headerLength; red_packet->header = packet.header; red_packet->length = packet.length + 1; // 1 byte RED header. // Copy RTP header. @@ -203,7 +202,7 @@ std::unique_ptr UlpfecPacketGenerator::BuildUlpfecRedPacket( NextPacket(0, packet.length + 1); red_packet->data[1] &= ~0x80; // Clear marker bit. - const size_t kHeaderLength = red_packet->header.header.headerLength; + const size_t kHeaderLength = red_packet->header.headerLength; SetRedHeader(kFecPayloadType, kHeaderLength, red_packet.get()); memcpy(red_packet->data + kHeaderLength + 1, packet.data, packet.length); red_packet->length = kHeaderLength + 1 + packet.length; diff --git a/modules/rtp_rtcp/source/fec_test_helper.h b/modules/rtp_rtcp/source/fec_test_helper.h index 004edf77d4..635062a5b6 100644 --- a/modules/rtp_rtcp/source/fec_test_helper.h +++ b/modules/rtp_rtcp/source/fec_test_helper.h @@ -13,7 +13,6 @@ #include -#include "modules/include/module_common_types.h" #include "modules/rtp_rtcp/source/forward_error_correction.h" #include "rtc_base/random.h" @@ -22,7 +21,7 @@ namespace test { namespace fec { struct AugmentedPacket : public ForwardErrorCorrection::Packet { - WebRtcRTPHeader header; + RTPHeader header; }; // TODO(brandtr): Consider merging MediaPacketGenerator and diff --git a/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc b/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc index 39ead62ca5..10099cfa19 100644 --- a/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc +++ b/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc @@ -118,7 +118,7 @@ TEST_F(UlpfecGeneratorTest, OneFrameFec) { packet_generator_.NextPacket(i, 10); EXPECT_EQ(0, ulpfec_generator_.AddRtpPacketAndGenerateFec( packet->data, packet->length, kRtpHeaderSize)); - last_timestamp = packet->header.header.timestamp; + last_timestamp = packet->header.timestamp; } EXPECT_TRUE(ulpfec_generator_.FecAvailable()); const uint16_t seq_num = packet_generator_.NextPacketSeqNum(); @@ -152,7 +152,7 @@ TEST_F(UlpfecGeneratorTest, TwoFrameFec) { packet_generator_.NextPacket(i * kNumPackets + j, 10); EXPECT_EQ(0, ulpfec_generator_.AddRtpPacketAndGenerateFec( packet->data, packet->length, kRtpHeaderSize)); - last_timestamp = packet->header.header.timestamp; + last_timestamp = packet->header.timestamp; } } EXPECT_TRUE(ulpfec_generator_.FecAvailable()); diff --git a/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc b/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc index e050f807d0..2203fc8fd7 100644 --- a/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc +++ b/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc @@ -124,16 +124,16 @@ void UlpfecReceiverTest::BuildAndAddRedMediaPacket(AugmentedPacket* packet) { std::unique_ptr red_packet( packet_generator_.BuildMediaRedPacket(*packet)); EXPECT_EQ(0, receiver_fec_->AddReceivedRedPacket( - red_packet->header.header, red_packet->data, - red_packet->length, kFecPayloadType)); + red_packet->header, red_packet->data, 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.header, red_packet->data, - red_packet->length, kFecPayloadType)); + red_packet->header, red_packet->data, red_packet->length, + kFecPayloadType)); } void UlpfecReceiverTest::VerifyReconstructedMediaPacket(