From 64a59f1bf8ddc3170d0076c57cb96ffe7d7927b7 Mon Sep 17 00:00:00 2001
From: Danil Chapovalov <danilchap@webrtc.org>
Date: Tue, 27 Jul 2021 22:17:04 +0200
Subject: [PATCH] Move Word32Align helper next to the only place it is used in
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: None
Change-Id: I99b34b78c6a560afa3638e2ba2f403e25602b12e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/226862
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34583}
---
 modules/rtp_rtcp/source/fec_test_helper.cc         |  4 +++-
 modules/rtp_rtcp/source/flexfec_sender_unittest.cc | 10 ++++++++--
 modules/rtp_rtcp/source/rtp_utility.cc             | 11 -----------
 modules/rtp_rtcp/source/rtp_utility.h              |  6 ------
 4 files changed, 11 insertions(+), 20 deletions(-)

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<RtpPacketToSend> 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);