Style updates for ForwardErrorCorrection and related classes

webrtc/modules/rtp_rtcp/source/fec_receiver_impl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/modules/rtp_rtcp/source/fec_receiver_impl.h"
 
-#include <assert.h>
-
 #include <memory>
 
+#include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h"
 
 // RFC 5109
 namespace webrtc {
 
 FecReceiver* FecReceiver::Create(RtpData* callback) {
   return new FecReceiverImpl(callback);
 }
@@ skipping 55 matching lines @@
 
   if (payload_data_length == 0) {
     LOG(LS_WARNING) << "Corrupt/truncated FEC packet.";
     return -1;
   }
 
   // Add to list without RED header, aka a virtual RTP packet
   // we remove the RED header
 
   std::unique_ptr<ForwardErrorCorrection::ReceivedPacket> received_packet(
-      new ForwardErrorCorrection::ReceivedPacket);
-  received_packet->pkt = new ForwardErrorCorrection::Packet;
+      new ForwardErrorCorrection::ReceivedPacket());
+  received_packet->pkt = new ForwardErrorCorrection::Packet();
 
   // get payload type from RED header
   uint8_t payload_type =
       incoming_rtp_packet[header.headerLength] & 0x7f;
 
   received_packet->is_fec = payload_type == ulpfec_payload_type;
   received_packet->seq_num = header.sequenceNumber;
 
   uint16_t blockLength = 0;
   if (incoming_rtp_packet[header.headerLength] & 0x80) {
@@ skipping 48 matching lines @@
         payload_type;                       // set the media payload type
 
     // copy the payload data
     memcpy(
         received_packet->pkt->data + header.headerLength,
         incoming_rtp_packet + header.headerLength + REDHeaderLength,
         blockLength);
 
     received_packet->pkt->length = blockLength;
 
-    second_received_packet.reset(new ForwardErrorCorrection::ReceivedPacket);
-    second_received_packet->pkt = new ForwardErrorCorrection::Packet;
+    second_received_packet.reset(new ForwardErrorCorrection::ReceivedPacket());
+    second_received_packet->pkt = new ForwardErrorCorrection::Packet();
 
     second_received_packet->is_fec = true;
     second_received_packet->seq_num = header.sequenceNumber;
     ++packet_counter_.num_fec_packets;
 
     // copy the FEC payload data
     memcpy(second_received_packet->pkt->data,
            incoming_rtp_packet + header.headerLength +
                REDHeaderLength + blockLength,
            payload_data_length - REDHeaderLength - blockLength);
@@ skipping 50 matching lines @@
     if (!received_packet_list_.front()->is_fec) {
       ForwardErrorCorrection::Packet* packet =
           received_packet_list_.front()->pkt;
       crit_sect_.Leave();
       if (!recovered_packet_callback_->OnRecoveredPacket(packet->data,
                                                          packet->length)) {
         return -1;
       }
       crit_sect_.Enter();
     }
-    if (fec_->DecodeFEC(&received_packet_list_, &recovered_packet_list_) != 0) {
+    if (fec_->DecodeFec(&received_packet_list_, &recovered_packet_list_) != 0) {
       crit_sect_.Leave();
       return -1;
     }
-    assert(received_packet_list_.empty());
+    RTC_DCHECK(received_packet_list_.empty());
   }
   // Send any recovered media packets to VCM.
-  ForwardErrorCorrection::RecoveredPacketList::iterator it =
-      recovered_packet_list_.begin();
-  for (; it != recovered_packet_list_.end(); ++it) {
-    if ((*it)->returned)  // Already sent to the VCM and the jitter buffer.
+  for(auto* recovered_packet : recovered_packet_list_) {
+    if (recovered_packet->returned) {
+      // Already sent to the VCM and the jitter buffer.
       continue;
-    ForwardErrorCorrection::Packet* packet = (*it)->pkt;
+    }
+    ForwardErrorCorrection::Packet* packet = recovered_packet->pkt;
     ++packet_counter_.num_recovered_packets;
     crit_sect_.Leave();
     if (!recovered_packet_callback_->OnRecoveredPacket(packet->data,
                                                        packet->length)) {
       return -1;
     }
     crit_sect_.Enter();
-    (*it)->returned = true;
+    recovered_packet->returned = true;
   }
   crit_sect_.Leave();
   return 0;
 }
 
 }  // namespace webrtc