diff --git a/modules/rtp_rtcp/source/fec_test_helper.cc b/modules/rtp_rtcp/source/fec_test_helper.cc index b9ac25e4a8..23e66c23bf 100644 --- a/modules/rtp_rtcp/source/fec_test_helper.cc +++ b/modules/rtp_rtcp/source/fec_test_helper.cc @@ -16,7 +16,6 @@ #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/byte_io.h" #include "modules/rtp_rtcp/source/rtp_packet.h" -#include "modules/rtp_rtcp/source/rtp_utility.h" #include "rtc_base/checks.h" namespace webrtc { @@ -24,6 +23,9 @@ namespace test { namespace fec { namespace { + +constexpr uint8_t kRtpMarkerBitMask = 0x80; + constexpr uint8_t kFecPayloadType = 96; constexpr uint8_t kRedPayloadType = 97; constexpr uint8_t kVp8PayloadType = 120; diff --git a/modules/rtp_rtcp/source/flexfec_sender_unittest.cc b/modules/rtp_rtcp/source/flexfec_sender_unittest.cc index 3ff657476b..19614d2bbd 100644 --- a/modules/rtp_rtcp/source/flexfec_sender_unittest.cc +++ b/modules/rtp_rtcp/source/flexfec_sender_unittest.cc @@ -18,7 +18,6 @@ #include "modules/rtp_rtcp/source/rtp_header_extensions.h" #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "modules/rtp_rtcp/source/rtp_sender.h" -#include "modules/rtp_rtcp/source/rtp_utility.h" #include "system_wrappers/include/clock.h" #include "test/gtest.h" @@ -26,7 +25,6 @@ namespace webrtc { namespace { -using RtpUtility::Word32Align; using test::fec::AugmentedPacket; using test::fec::AugmentedPacketGenerator; @@ -46,6 +44,14 @@ constexpr int64_t kInitialSimulatedClockTime = 1; constexpr uint16_t kDeterministicSequenceNumber = 28732; constexpr uint32_t kDeterministicTimestamp = 2305613085; +// Round up to the nearest size that is a multiple of 4. +size_t Word32Align(size_t size) { + uint32_t remainder = size % 4; + if (remainder != 0) + return size + 4 - remainder; + return size; +} + std::unique_ptr GenerateSingleFlexfecPacket( FlexfecSender* sender) { // Parameters selected to generate a single FEC packet. diff --git a/modules/rtp_rtcp/source/rtp_utility.cc b/modules/rtp_rtcp/source/rtp_utility.cc index c96c082473..159de27b4e 100644 --- a/modules/rtp_rtcp/source/rtp_utility.cc +++ b/modules/rtp_rtcp/source/rtp_utility.cc @@ -38,17 +38,6 @@ enum { kRtpMinParseLength = 12 }; -/* - * Misc utility routines - */ - -size_t Word32Align(size_t size) { - uint32_t remainder = size % 4; - if (remainder != 0) - return size + 4 - remainder; - return size; -} - RtpHeaderParser::RtpHeaderParser(const uint8_t* rtpData, const size_t rtpDataLength) : _ptrRTPDataBegin(rtpData), diff --git a/modules/rtp_rtcp/source/rtp_utility.h b/modules/rtp_rtcp/source/rtp_utility.h index 20aac54855..694cf2c022 100644 --- a/modules/rtp_rtcp/source/rtp_utility.h +++ b/modules/rtp_rtcp/source/rtp_utility.h @@ -22,14 +22,8 @@ #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" namespace webrtc { - -const uint8_t kRtpMarkerBitMask = 0x80; - namespace RtpUtility { -// Round up to the nearest size that is a multiple of 4. -size_t Word32Align(size_t size); - class RtpHeaderParser { public: RtpHeaderParser(const uint8_t* rtpData, size_t rtpDataLength);