Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(207)

Unified Diff: webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc

Issue 2080553003: Style updates for ForwardErrorCorrection and related classes (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Re-add explicit constructors. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..62185224b7ffa6220f1d3b66b5c160ae0c87a652 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();
+ ++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) {
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) {
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()) {
+ 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()) {
+ 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++;

Powered by Google App Engine
This is Rietveld 408576698