Style updates for ForwardErrorCorrection and related classes

webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc

Index: webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc
index 228c19fe4c6334ca6325fc00f016faa19574e343..67c6a2a345b40e360bf0817faea2eb02d52de3bc 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc
@@ -604,8 +604,8 @@ TEST_F(RtpFecTest, FecRecoveryNonConsecutivePackets) {
   // This list should have every other packet removed.
   PacketList protected_media_packets;
   int i = 0;
-  for (PacketList::iterator it = media_packet_list_.begin();
-       it != media_packet_list_.end(); ++it, ++i) {
+  for (auto it = media_packet_list_.begin(); it != media_packet_list_.end();

[stefan-webrtc, 2016/06/29 16:14:03]

Should be able to change this to a range-based loop and increment inside the
body instead

[brandtr, 2016/06/30 13:37:43]

See "1b" CL.

+       ++it, ++i) {
     if (i % 2 == 0) protected_media_packets.push_back(*it);
   }
 
@@ -668,8 +668,8 @@ TEST_F(RtpFecTest, FecRecoveryNonConsecutivePacketsExtension) {
   // This list should have every other packet removed.
   PacketList protected_media_packets;
   int i = 0;
-  for (PacketList::iterator it = media_packet_list_.begin();
-       it != media_packet_list_.end(); ++it, ++i) {
+  for (auto it = media_packet_list_.begin(); it != media_packet_list_.end();
+       ++it, ++i) {

[stefan-webrtc, 2016/06/29 16:14:03]

Same here

[brandtr, 2016/06/30 13:37:43]

See "1b" CL.

     if (i % 2 == 0) protected_media_packets.push_back(*it);
   }
 
@@ -739,8 +739,8 @@ TEST_F(RtpFecTest, FecRecoveryNonConsecutivePacketsWrap) {
   // This list should have every other packet removed.
   PacketList protected_media_packets;
   int i = 0;
-  for (PacketList::iterator it = media_packet_list_.begin();
-       it != media_packet_list_.end(); ++it, ++i) {
+  for (auto it = media_packet_list_.begin(); it != media_packet_list_.end();
+       ++it, ++i) {

[stefan-webrtc, 2016/06/29 16:14:03]

And here

[brandtr, 2016/06/30 13:37:43]

See "1b" CL.

     if (i % 2 == 0) protected_media_packets.push_back(*it);
   }
 
@@ -821,15 +821,14 @@ bool RtpFecTest::IsRecoveryComplete() {
 
   bool recovery = true;
 
-  PacketList::iterator media_packet_list_item = media_packet_list_.begin();
-  RecoveredPacketList::iterator recovered_packet_list_item =
-      recovered_packet_list_.begin();
-  while (media_packet_list_item != media_packet_list_.end()) {
-    if (recovered_packet_list_item == recovered_packet_list_.end()) {
+  auto media_packet_list_it = media_packet_list_.cbegin();
+  auto recovered_packet_list_it = recovered_packet_list_.cbegin();
+  while (media_packet_list_it != media_packet_list_.end()) {

[stefan-webrtc, 2016/06/29 16:14:03]

Make this a range-based loop

[brandtr, 2016/06/30 13:37:43]

Rewrote using std::equal and custom predicate instead.

+    if (recovered_packet_list_it == recovered_packet_list_.end()) {
       return false;
     }
-    media_packet = *media_packet_list_item;
-    recovered_packet = *recovered_packet_list_item;
+    media_packet = *media_packet_list_it;
+    recovered_packet = *recovered_packet_list_it;
     if (recovered_packet->pkt->length != media_packet->length) {
       return false;
     }
@@ -837,8 +836,8 @@ bool RtpFecTest::IsRecoveryComplete() {
                media_packet->length) != 0) {
       return false;
     }
-    media_packet_list_item++;
-    recovered_packet_list_item++;
+    media_packet_list_it++;
+    recovered_packet_list_it++;
   }
   return recovery;
 }
@@ -856,10 +855,9 @@ void RtpFecTest::ReceivedPackets(const PacketList& packet_list, int* loss_mask,
   int seq_num = fec_seq_num_;
   int packet_idx = 0;
 
-  PacketList::const_iterator packet_list_item = packet_list.begin();
-
-  while (packet_list_item != packet_list.end()) {
-    packet = *packet_list_item;
+  auto packet_list_it = packet_list.cbegin();
+  while (packet_list_it != packet_list.end()) {

[stefan-webrtc, 2016/06/29 16:14:03]

and this, I think?

[brandtr, 2016/06/30 13:37:43]

Done.

+    packet = *packet_list_it;
     if (loss_mask[packet_idx] == 0) {
       received_packet = new ForwardErrorCorrection::ReceivedPacket;
       received_packet->pkt = new ForwardErrorCorrection::Packet;
@@ -884,7 +882,7 @@ void RtpFecTest::ReceivedPackets(const PacketList& packet_list, int* loss_mask,
       }
     }
     packet_idx++;
-    packet_list_item++;
+    packet_list_it++;
     // Sequence number of FEC packets are defined as increment by 1 from
     // last media packet in frame.
     if (is_fec) seq_num++;
@@ -893,7 +891,7 @@ void RtpFecTest::ReceivedPackets(const PacketList& packet_list, int* loss_mask,
 
 int RtpFecTest::ConstructMediaPacketsSeqNum(int num_media_packets,
                                             int start_seq_num) {
-  assert(num_media_packets > 0);
+  RTC_DCHECK_GT(num_media_packets, 0);
   ForwardErrorCorrection::Packet* media_packet = NULL;
   int sequence_number = start_seq_num;
   int time_stamp = random_.Rand<int>();
@@ -937,7 +935,7 @@ int RtpFecTest::ConstructMediaPacketsSeqNum(int num_media_packets,
     sequence_number++;
   }
   // Last packet, set marker bit.
-  assert(media_packet != NULL);
+  RTC_DCHECK(media_packet);
   media_packet->data[1] |= 0x80;
   return sequence_number;
 }