From fb19f49c149018c02bd929cbb962aad4b3118000 Mon Sep 17 00:00:00 2001
From: Cesar Magalhaes <magalhaesc@webrtc.org>
Date: Wed, 15 Jul 2015 19:52:08 +0200
Subject: [PATCH] Replaced uint32_t with standard uint16_t for sequence_number
 variables.

R=stefan@webrtc.org

Review URL: https://codereview.webrtc.org/1232373004 .

Cr-Commit-Position: refs/heads/master@{#9588}
---
 .../test/bwe_test_framework.cc                   |  2 +-
 .../test/bwe_test_framework_unittest.cc          | 16 ++++++++--------
 .../remote_bitrate_estimator/test/packet.h       |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
index 90e4094cb3..fc6f01ebc7 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
@@ -175,7 +175,7 @@ MediaPacket::MediaPacket(int flow_id,
     : Packet(flow_id, send_time_us, payload_size), header_(header) {
 }
 
-MediaPacket::MediaPacket(int64_t send_time_us, uint32_t sequence_number)
+MediaPacket::MediaPacket(int64_t send_time_us, uint16_t sequence_number)
     : Packet(0, send_time_us, 0) {
   header_ = RTPHeader();
   header_.sequenceNumber = sequence_number;
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
index e46e170447..aaded7304b 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
@@ -379,7 +379,7 @@ class BweTestFramework_DelayFilterTest : public ::testing::Test {
 
  private:
   int64_t now_ms_;
-  uint32_t sequence_number_;
+  uint16_t sequence_number_;
 
   DISALLOW_COPY_AND_ASSIGN(BweTestFramework_DelayFilterTest);
 };
@@ -532,14 +532,14 @@ TEST(BweTestFramework_JitterFilterTest, Jitter1031) {
   TestJitterFilter(1031);
 }
 
-static void TestReorderFilter(uint32_t reorder_percent, uint32_t near_value) {
-  const uint32_t kPacketCount = 10000;
+static void TestReorderFilter(uint16_t reorder_percent, uint16_t near_value) {
+  const uint16_t kPacketCount = 10000;
 
   // Generate packets with 10 ms interval.
   Packets packets;
   int64_t now_ms = 0;
-  uint32_t sequence_number = 1;
-  for (uint32_t i = 0; i < kPacketCount; ++i, now_ms += 10) {
+  uint16_t sequence_number = 1;
+  for (uint16_t i = 0; i < kPacketCount; ++i, now_ms += 10) {
     packets.push_back(new MediaPacket(now_ms * 1000, sequence_number++));
   }
   ASSERT_TRUE(IsTimeSorted(packets));
@@ -553,11 +553,11 @@ static void TestReorderFilter(uint32_t reorder_percent, uint32_t near_value) {
 
   // We measure the amount of reordering by summing the distance by which out-
   // of-order packets have been moved in the stream.
-  uint32_t distance = 0;
-  uint32_t last_sequence_number = 0;
+  uint16_t distance = 0;
+  uint16_t last_sequence_number = 0;
   for (auto* packet : packets) {
     const MediaPacket* media_packet = static_cast<const MediaPacket*>(packet);
-    uint32_t sequence_number = media_packet->header().sequenceNumber;
+    uint16_t sequence_number = media_packet->header().sequenceNumber;
     if (sequence_number < last_sequence_number) {
       distance += last_sequence_number - sequence_number;
     }
diff --git a/webrtc/modules/remote_bitrate_estimator/test/packet.h b/webrtc/modules/remote_bitrate_estimator/test/packet.h
index 4edad8fdae..9be894da5f 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/packet.h
+++ b/webrtc/modules/remote_bitrate_estimator/test/packet.h
@@ -69,7 +69,7 @@ class MediaPacket : public Packet {
               int64_t send_time_us,
               size_t payload_size,
               const RTPHeader& header);
-  MediaPacket(int64_t send_time_us, uint32_t sequence_number);
+  MediaPacket(int64_t send_time_us, uint16_t sequence_number);
 
   virtual ~MediaPacket() {}